Updated enemyPrefabs + player prefab + update enemy turns

This commit is contained in:
Залетов Федор 2022-01-15 10:29:16 +03:00
parent cffb612cc7
commit 728573371c
53 changed files with 7855 additions and 3226 deletions

Binary file not shown.

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

View File

@ -0,0 +1,96 @@
fileFormatVersion: 2
guid: 993fdba9d116dba4bacdee2d29d33f04
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: 11 KiB

View File

@ -0,0 +1,96 @@
fileFormatVersion: 2
guid: 9c3fd8d256ec8eb4181e171ceea55452
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:

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

@ -348,6 +348,7 @@ GameObject:
- component: {fileID: 6960669208474582201}
- component: {fileID: 6960669208474582200}
- component: {fileID: 6960669208474582198}
- component: {fileID: -4965846225258688483}
m_Layer: 5
m_Name: Enemy_1
m_TagString: Untagged
@ -437,16 +438,45 @@ MonoBehaviour:
allStepImageIcons:
- {fileID: 21300000, guid: dd98efe28d8ec124aa1125cdd7974e8f, type: 3}
- {fileID: 21300000, guid: e358c2b81c85b9e46a554b5c06625c27, type: 3}
- {fileID: 21300000, guid: 993fdba9d116dba4bacdee2d29d33f04, type: 3}
- {fileID: 21300000, guid: 9c3fd8d256ec8eb4181e171ceea55452, type: 3}
enemyConfig: {fileID: 0}
enemyName: {fileID: 6960669208474582200}
enemyMaxHp: {fileID: 6960669210171686449}
enemyHp: {fileID: 6960669209835327211}
enemyHealthbar: {fileID: 6960669209117571478}
marker: {fileID: 9183873704111392674}
buttonInEnemy: {fileID: 6960669209950784645}
hp: 0
enemyConfig: {fileID: 0}
enemyPosition: {fileID: 0}
phaseAttack: 0
attackLoop: []
attackLoop:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: -4965846225258688483}
m_TargetAssemblyTypeName:
m_MethodName:
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &-4965846225258688483
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6960669208474582202}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b3ffd201925e0e64b9acf27bad35844d, type: 3}
m_Name:
m_EditorClassIdentifier:
enemy: {fileID: 6960669208474582198}
--- !u!1 &6960669209117571480
GameObject:
m_ObjectHideFlags: 0
@ -728,8 +758,8 @@ RectTransform:
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: -45.589554, y: -1964.3818}
m_SizeDelta: {x: 311.36267, y: 489.27707}
m_AnchoredPosition: {x: -45.59, y: -1998}
m_SizeDelta: {x: 460.8752, y: 489.277}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6960669209950784643
CanvasRenderer:
@ -788,7 +818,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Transition: 0
m_Colors:
m_NormalColor: {r: 0, g: 0, b: 0, a: 0}
m_HighlightedColor: {r: 1, g: 1, b: 1, a: 0}

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

@ -0,0 +1,827 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5565334653704318818
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5565334653704318821}
- component: {fileID: 5565334653704318822}
- component: {fileID: 5565334653704318823}
- component: {fileID: 5565334653704318820}
m_Layer: 5
m_Name: PlayerButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5565334653704318821
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334653704318818}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5565334654496439717}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.26001, y: -119.19}
m_SizeDelta: {x: 440.67, y: 556.23}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5565334653704318822
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334653704318818}
m_CullTransparentMesh: 0
--- !u!114 &5565334653704318823
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334653704318818}
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &5565334653704318820
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334653704318818}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0}
m_HighlightedColor: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 5565334653704318823}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: DeckManager, Assembly-CSharp
m_MethodName: ActionInPlayer
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &5565334653731361696
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5565334653731361699}
- component: {fileID: 5565334653731361701}
- component: {fileID: 5565334653731361698}
m_Layer: 5
m_Name: PlayerName
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5565334653731361699
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334653731361696}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.21057, y: 0.21057, z: 0.21057}
m_Children: []
m_Father: {fileID: 5565334654496439717}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 262}
m_SizeDelta: {x: 1713.5695, y: 338.06305}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5565334653731361701
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334653731361696}
m_CullTransparentMesh: 0
--- !u!114 &5565334653731361698
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334653731361696}
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: Name
--- !u!1 &5565334654129459632
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5565334654129459635}
- component: {fileID: 5565334654129459637}
- component: {fileID: 5565334654129459634}
m_Layer: 5
m_Name: MarkerPlayer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5565334654129459635
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334654129459632}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 6.803, y: 6.803, z: 6.803}
m_Children: []
m_Father: {fileID: 5565334654496439717}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.26000977, y: -355}
m_SizeDelta: {x: 64, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5565334654129459637
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334654129459632}
m_CullTransparentMesh: 1
--- !u!114 &5565334654129459634
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334654129459632}
m_Enabled: 0
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: -1390913289524463203, guid: 5f2cb20f1f8274c42a5d23c6d6237680, 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 &5565334654321077844
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5565334654321077847}
- component: {fileID: 5565334654321077833}
- component: {fileID: 5565334654321077846}
m_Layer: 5
m_Name: Fill
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5565334654321077847
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334654321077844}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5565334655056816615}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5565334654321077833
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334654321077844}
m_CullTransparentMesh: 0
--- !u!114 &5565334654321077846
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334654321077844}
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: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5565334654447534853
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5565334654447534852}
- component: {fileID: 5565334654447534854}
- component: {fileID: 5565334654447534855}
m_Layer: 5
m_Name: MaxHp
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5565334654447534852
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334654447534853}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.12692949, y: 0.12692949, z: 0.12692949}
m_Children: []
m_Father: {fileID: 5565334655056816615}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -96.95, y: -1.8}
m_SizeDelta: {x: 1394.0822, y: 338.06305}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5565334654447534854
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334654447534853}
m_CullTransparentMesh: 0
--- !u!114 &5565334654447534855
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334654447534853}
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: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: '100 '
--- !u!1 &5565334654466998443
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5565334654466998442}
- component: {fileID: 5565334654466998444}
- component: {fileID: 5565334654466998445}
m_Layer: 5
m_Name: Hp
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5565334654466998442
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334654466998443}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.12692949, y: 0.12692949, z: 0.12692949}
m_Children: []
m_Father: {fileID: 5565334655056816615}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 82.53, y: -1.7999878}
m_SizeDelta: {x: 1057.4633, y: 338.06305}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5565334654466998444
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334654466998443}
m_CullTransparentMesh: 0
--- !u!114 &5565334654466998445
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334654466998443}
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: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 100
--- !u!1 &5565334654496439714
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5565334654496439717}
- component: {fileID: 5565334654496439716}
m_Layer: 5
m_Name: Player
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5565334654496439717
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334654496439714}
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: 5565334653731361699}
- {fileID: 5565334655056816615}
- {fileID: 5565334653704318821}
- {fileID: 5565334654129459635}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5565334654496439716
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334654496439714}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a797a7d28ee3d2d4c85df06375b9a2c7, type: 3}
m_Name:
m_EditorClassIdentifier:
playerName: {fileID: 5565334653731361698}
playerMaxHp: {fileID: 5565334654447534855}
playerHp: {fileID: 5565334654466998445}
playerHealthbar: {fileID: 5565334655056816614}
marker: {fileID: 5565334654129459634}
buttonInPlayer: {fileID: 5565334653704318820}
playerConfig: {fileID: 0}
hp: 0
--- !u!1 &5565334654535783331
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5565334654535783330}
- component: {fileID: 5565334654535783332}
- component: {fileID: 5565334654535783333}
m_Layer: 5
m_Name: Border
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5565334654535783330
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334654535783331}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5565334655056816615}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.00012207031, y: -0.00018310547}
m_SizeDelta: {x: -0.02520752, y: 0.47857666}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5565334654535783332
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334654535783331}
m_CullTransparentMesh: 0
--- !u!114 &5565334654535783333
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334654535783331}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.26415092, g: 0.26415092, b: 0.26415092, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5565334655056816612
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5565334655056816615}
- component: {fileID: 5565334655056816614}
m_Layer: 5
m_Name: PlayerHealthbar
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5565334655056816615
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334655056816612}
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: 5565334654535783330}
- {fileID: 5565334654321077847}
- {fileID: 5565334654447534852}
- {fileID: 5565334655150630708}
- {fileID: 5565334654466998442}
m_Father: {fileID: 5565334654496439717}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 185.16}
m_SizeDelta: {x: 357.97516, y: 52.47888}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5565334655056816614
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334655056816612}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 0
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 0}
m_FillRect: {fileID: 5565334654321077847}
m_HandleRect: {fileID: 0}
m_Direction: 0
m_MinValue: 0
m_MaxValue: 1
m_WholeNumbers: 0
m_Value: 1
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!1 &5565334655150630709
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5565334655150630708}
- component: {fileID: 5565334655150630710}
- component: {fileID: 5565334655150630711}
m_Layer: 5
m_Name: /
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5565334655150630708
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334655150630709}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.12692949, y: 0.12692949, z: 0.12692949}
m_Children: []
m_Father: {fileID: 5565334655056816615}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 2.7, y: -1.8}
m_SizeDelta: {x: 162.36682, y: 338.06305}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5565334655150630710
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334655150630709}
m_CullTransparentMesh: 0
--- !u!114 &5565334655150630711
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5565334655150630709}
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: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: /

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -105,6 +105,7 @@ public class Card : MonoBehaviour
}
public void OnClick()
{
if (Session.main.waitingEndingRound || DeckManager.main.waitingEnemyTurn) return;
var _card = cardConfig.CardCharacteristics;
//ВАРНИНГ! НЕ РАБОТАЕТ С КАРТАМИ НА -ЗДОРОВЬЕ!!
int _stamina = DeckManager.main.stamina;

View File

@ -78,7 +78,7 @@ public class DeckManager : MonoBehaviour
}
public void EndTurn(bool enemyTurn)
{
if (waitingEnemyTurn) return;
if (waitingEnemyTurn || Session.main.waitingEndingRound) return;
currentCard = null;
MarkersRegulator();
for (int i = 0; i < 5; i++)

View File

@ -10,23 +10,23 @@ public class Enemy : MonoBehaviour
[SerializeField] private Text enemyStepIconText;
[SerializeField] private List<Sprite> allStepImageIcons = new List<Sprite>();
public EnemyConfig enemyConfig;
[SerializeField] private Text enemyName;
[SerializeField] private Text enemyMaxHp;
[SerializeField] private Text enemyHp;
[SerializeField] private Slider enemyHealthbar;
[SerializeField] private Image marker;
[SerializeField] private Button buttonInEnemy;
[Header("For checking. dont touch this")]
[SerializeField] private int hp;
public EnemyConfig enemyConfig;
public GameObject enemyPosition;
[SerializeField] int phaseAttack = 0;
public List<UnityEvent> attackLoop = new List<UnityEvent>();
private void Start()
{
NewInformation();
UpdateNextStepIconAndText();
}
@ -54,8 +54,9 @@ public class Enemy : MonoBehaviour
public void NewInformation()
{
SpriteRenderer _sprRend = enemyPosition.GetComponent<SpriteRenderer>();
_sprRend.sprite = enemyConfig.enemyCharacteristics.sprite;
Image _image = buttonInEnemy.image;
_image.sprite = enemyConfig.enemyCharacteristics.sprite;
var _character = enemyConfig.enemyCharacteristics;
enemyName.text = _character.name;
enemyMaxHp.text = _character.maxHp.ToString();
@ -68,34 +69,45 @@ public class Enemy : MonoBehaviour
public void Death()
{
SpriteRenderer _sprRend = enemyPosition.GetComponent<SpriteRenderer>();
_sprRend.sprite = null;
Session.main.EnemyDeath();
Destroy(gameObject);
Image _image = buttonInEnemy.image;
_image.sprite = null;
Session.main.EnemyDeath(gameObject);
}
public void UpdateNextStepIconAndText()
{
BaseEnemyTurn.basic.FindLoopForLocal(gameObject, phaseAttack);
int _phase = BaseEnemyTurn.basic.phase;
int _phase = phaseAttack % attackLoop.Count;
//Пока всего две фазы атаки пойдет, но надо переписать
enemyStepIcon.sprite = allStepImageIcons[_phase];
//А вот это тем более
if (_phase == 0)
switch(attackLoop[_phase].GetPersistentMethodName(0))
{
enemyStepIconText.text = enemyConfig.enemyCharacteristics.damage.ToString();
}
else
{
enemyStepIconText.text = enemyConfig.enemyCharacteristics.selfHealing.ToString();
case "Attack":
enemyStepIcon.sprite = allStepImageIcons[0];
enemyStepIconText.text = enemyConfig.enemyCharacteristics.damage.ToString();
break;
case "SelfHealing":
enemyStepIcon.sprite = allStepImageIcons[1];
enemyStepIconText.text = enemyConfig.enemyCharacteristics.selfHealing.ToString();
break;
case "AllyHealing":
enemyStepIcon.sprite = allStepImageIcons[2];
enemyStepIconText.text = enemyConfig.enemyCharacteristics.allyHealing.ToString();
break;
case "AllHealing":
enemyStepIcon.sprite = allStepImageIcons[3];
enemyStepIconText.text = enemyConfig.enemyCharacteristics.allHealing.ToString();
break;
}
}
public void Turn()
{
BaseEnemyTurn.basic.FindLoopTurn(this.gameObject, phaseAttack);
int _phase = phaseAttack % attackLoop.Count;
attackLoop[_phase]?.Invoke();
phaseAttack++;
print(gameObject.name + " Next step " + BaseEnemyTurn.basic.phase.ToString());
UpdateNextStepIconAndText();
}

View File

@ -6,12 +6,12 @@ using UnityEditor;
public class LibraryTurnMethods : MonoBehaviour
{
[SerializeField] Enemy enemy;
public void Attack()
{
Enemy _enemy = BaseEnemyTurn.basic.currentEnemy.GetComponent<Enemy>();
Player.main.ChangeHp(_enemy.enemyConfig.enemyCharacteristics.damage);
Player.main.ChangeHp(enemy.enemyConfig.enemyCharacteristics.damage);
}
@ -19,19 +19,17 @@ public class LibraryTurnMethods : MonoBehaviour
public void SelfHealing()
{
Enemy _enemy = BaseEnemyTurn.basic.currentEnemy.GetComponent<Enemy>();
int _selfHealing =
_enemy.enemyConfig.enemyCharacteristics.selfHealing;
int _selfHealing =
enemy.enemyConfig.enemyCharacteristics.selfHealing;
_enemy.ChangeHp(-_selfHealing);
enemy.ChangeHp(-_selfHealing);
}
public void AllyHealing()
{
Enemy _enemy = BaseEnemyTurn.basic.currentEnemy.GetComponent<Enemy>();
int _allyHealing =
_enemy.enemyConfig.enemyCharacteristics.allyHealing;
enemy.enemyConfig.enemyCharacteristics.allyHealing;
List<GameObject> _currentEnemies = Session.main.currentEnemies;
int _index = 0;
int _max = 0;
@ -58,7 +56,7 @@ public class LibraryTurnMethods : MonoBehaviour
else
{
_allyHealing =
_enemy.enemyConfig.enemyCharacteristics.selfHealing;
enemy.enemyConfig.enemyCharacteristics.selfHealing;
_currentEnemies[_index].GetComponent<Enemy>().ChangeHp(-_allyHealing);
}
}
@ -66,9 +64,9 @@ public class LibraryTurnMethods : MonoBehaviour
public void AllHealing()
{
Enemy _enemy = BaseEnemyTurn.basic.currentEnemy.GetComponent<Enemy>();
int _allHealing =
_enemy.enemyConfig.enemyCharacteristics.allHealing;
enemy.enemyConfig.enemyCharacteristics.allHealing;
List<GameObject> _currentEnemies = Session.main.currentEnemies;
for (int i = 0; i < _currentEnemies.Count; i++)
{
@ -80,7 +78,7 @@ public class LibraryTurnMethods : MonoBehaviour
else
{
_allHealing =
_enemy.enemyConfig.enemyCharacteristics.selfHealing;
enemy.enemyConfig.enemyCharacteristics.selfHealing;
_currentEnemies[i].GetComponent<Enemy>().ChangeHp(-_allHealing);
}
}

View File

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

View File

@ -11,11 +11,11 @@ public class Player : MonoBehaviour
[SerializeField] private Text playerHp;
[SerializeField] private Slider playerHealthbar;
[SerializeField] private Image marker;
[SerializeField] private Button buttonInPlayer;
[Header("dont touch this. standart preset, change session")]
public PlayerConfig playerConfig;
public Transform playerPosition;
[SerializeField] private int hp;
@ -32,9 +32,12 @@ public class Player : MonoBehaviour
}
public void NewInformation()
{
SpriteRenderer _sprRend = playerPosition.GetComponent<SpriteRenderer>();
var _character = playerConfig.characterCharacteristics;
_sprRend.sprite = _character.sprite;
Image _image = buttonInPlayer.image;
_image.sprite = playerConfig.characterCharacteristics.sprite;
playerName.text = _character.namePlayer;
playerMaxHp.text = _character.maxHp.ToString();
playerHp.text = playerMaxHp.text;

View File

@ -10,8 +10,6 @@ public class Session : MonoBehaviour
{
public static Session main;
[SerializeField] private PlayerConfig playerConfig;
[SerializeField] private BattleConfig battleConfig;
[SerializeField] private UnityEvent onVictory;
@ -21,21 +19,19 @@ public class Session : MonoBehaviour
[Header("Enemies")]
[Space]
[Header("BASE SETTINGS. Don't touch!")]
[Space]
[SerializeField] private List<GameObject> enemySpritePositions = new List<GameObject>();
[SerializeField] private List<Transform> enemyUIPositions = new List<Transform>();
[SerializeField] private GameObject enemyPrefab;
[SerializeField] private List<GameObject> enemyPrefabs;
[Header("Player")]
[SerializeField] private Transform playerPosition;
[SerializeField] private GameObject player;
[SerializeField] private Transform playerPosition;
[Space(3)]
[Header("For checking")]
public int numberPhase = 1;
public int quantityEnemies = 0;
public bool waitingEndingRound = false;
public List<GameObject> currentEnemies = new List<GameObject>();
@ -112,10 +108,17 @@ public class Session : MonoBehaviour
{
onDefeat?.Invoke();
}
public void EnemyDeath()
public void EnemyDeath(GameObject _deadEnemy)
{
quantityEnemies--;
//currentEnemies[index] = null;
for(int i = 0; i < currentEnemies.Count; i++)
{
if(currentEnemies[i] == _deadEnemy)
{
Destroy(currentEnemies[i]);
currentEnemies.RemoveAt(i);
}
}
if (quantityEnemies == 0)
{
@ -125,6 +128,8 @@ public class Session : MonoBehaviour
IEnumerator ChekingCoroutine()
{
waitingEndingRound = true;
currentEnemies.Clear();
yield return new WaitForSeconds(0.5f);
if (numberPhase == 1 && battleConfig.battleCharacteristics.SecondPhase)
{
@ -140,6 +145,7 @@ public class Session : MonoBehaviour
{
Victory();
}
waitingEndingRound = false;
}
@ -179,19 +185,24 @@ public class Session : MonoBehaviour
public GameObject CreateEnemies(EnemyConfig _config, int _position)
{
GameObject _enemy = Instantiate(enemyPrefab, enemyUIPositions[_position]);
Enemy _enemyCode = _enemy.GetComponent<Enemy>();
_enemyCode.enemyPosition = enemySpritePositions[_position];
_enemyCode.enemyConfig = _config;
_enemyCode.NewInformation();
return (_enemy);
for (int i = 0; i < enemyPrefabs.Count; i++)
{
if (enemyPrefabs[i].GetComponent<Enemy>().enemyConfig == _config)
{
GameObject _enemy = Instantiate(enemyPrefabs[i], enemyUIPositions[_position]);
return (_enemy);
}
}
Debug.LogError("enemy prefab not found. Please, check battleConfig and enemyPrefabs");
return null;
}
public void CreatePlayer()
{
player.GetComponent<Player>().playerPosition = playerPosition;
player.GetComponent<Player>().playerConfig = playerConfig;
player.GetComponent<Player>().NewInformation();
Instantiate(player, playerPosition);
Player.main.playerConfig = playerConfig;
Player.main.NewInformation();
}

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

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

View File

@ -1 +1 @@
f5e98bd93cbb082bc13febd9deb805dc
41bc876834200554b9cdf46ac8dbc2f9

Binary file not shown.

Binary file not shown.

View File

@ -288,3 +288,93 @@ C# parse time : 161ms
candidates check time : 45ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 15.01.2022 8:19:16 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 767,2172ms
moved types parse time: 46ms
candidates parse time : 0ms
C# parse time : 216ms
candidates check time : 44ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 15.01.2022 8:19:39 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 74,8ms
moved types parse time: 43ms
candidates parse time : 0ms
C# parse time : 176ms
candidates check time : 43ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 15.01.2022 8:20:00 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 67,8222ms
moved types parse time: 42ms
candidates parse time : 1ms
C# parse time : 164ms
candidates check time : 44ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 15.01.2022 8:20:07 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 71,9086ms
moved types parse time: 42ms
candidates parse time : 0ms
C# parse time : 151ms
candidates check time : 47ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 15.01.2022 8:20:44 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 72,806ms
moved types parse time: 45ms
candidates parse time : 1ms
C# parse time : 161ms
candidates check time : 47ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 15.01.2022 9:21:00 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 150,7791ms
moved types parse time: 51ms
candidates parse time : 1ms
C# parse time : 324ms
candidates check time : 51ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 15.01.2022 9:23:51 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 68,1688ms
moved types parse time: 42ms
candidates parse time : 1ms
C# parse time : 167ms
candidates check time : 48ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 15.01.2022 9:23:55 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 66,5477ms
moved types parse time: 43ms
candidates parse time : 0ms
C# parse time : 171ms
candidates check time : 50ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 15.01.2022 9:25:27 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 66,1218ms
moved types parse time: 41ms
candidates parse time : 0ms
C# parse time : 173ms
candidates check time : 60ms
console write time : 0ms

File diff suppressed because it is too large Load Diff

View File

@ -1,396 +0,0 @@
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 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:
C:\Program Files\Unity\Hub\Editor\2020.3.19f1\Editor\Unity.exe
-adb2
-batchMode
-noUpm
-name
AssetImportWorker0
-projectPath
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 E:/Projects с#/Unity/omega/Assets
GfxDevice: creating device client; threaded=0
Direct3D:
Version: Direct3D 11.0 [level 11.0]
Renderer: NVIDIA GeForce GT 730 (ID=0x1287)
Vendor:
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/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
Native extension for WindowsStandalone target not found
Native extension for OSXStandalone target not found
Native extension for WebGL target not found
Refreshing native plugins compatible for Editor in 35.71 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
- Completed reload, in 2.863 seconds
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)
SetupTypeCache (137ms)
ReleaseScriptCaches (0ms)
RebuildScriptCaches (25ms)
SetupLoadedEditorAssemblies (146ms)
=======
EndReloadAssembly (274ms)
LoadAssemblies (34ms)
RebuildTransferFunctionScriptingTraits (0ms)
SetupTypeCache (92ms)
ReleaseScriptCaches (0ms)
RebuildScriptCaches (19ms)
SetupLoadedEditorAssemblies (114ms)
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a
LogAssemblyErrors (0ms)
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 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.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
- Completed reload, in 0.996 seconds
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 (3ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
<<<<<<< HEAD
CreateAndSetChildDomain (15ms)
EndReloadAssembly (821ms)
LoadAssemblies (111ms)
RebuildTransferFunctionScriptingTraits (0ms)
SetupTypeCache (252ms)
ReleaseScriptCaches (0ms)
RebuildScriptCaches (40ms)
SetupLoadedEditorAssemblies (297ms)
LogAssemblyErrors (0ms)
InitializePlatformSupportModulesInManaged (7ms)
SetLoadedEditorAssemblies (0ms)
RefreshPlugins (38ms)
BeforeProcessingInitializeOnLoad (68ms)
ProcessInitializeOnLoadAttributes (169ms)
ProcessInitializeOnLoadMethodAttributes (10ms)
AfterProcessingInitializeOnLoad (5ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
AwakeInstancesAfterBackupRestoration (6ms)
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):
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.
path: Assets/Prefabs/Cards/SmallHealing.prefab
artifactKey: Guid(4a71400765e99464aa6e72caa20d2a07) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Cards/SmallHealing.prefab using Guid(4a71400765e99464aa6e72caa20d2a07) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '3ed34858da52c9f85551a972b4c78b17') in 0.062814 seconds
Import took 0.069312 seconds .
========================================================================
Received Import Request.
Time since last request: 0.000230 seconds.
path: Assets/Prefabs
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)
Start importing Assets/Scenes using Guid(fb67c500aacab5e4e9d173bfe45e441f) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '9c97edb7ac439b27978cf6a95748b211') in 0.010802 seconds
Import took 0.018376 seconds .
========================================================================
Received Import Request.
Time since last request: 0.000283 seconds.
path: Assets/Prefabs/Cards/AddStamina.prefab
artifactKey: Guid(cef8186f91858aa43ac1d7dd281ecaec) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Cards/AddStamina.prefab using Guid(cef8186f91858aa43ac1d7dd281ecaec) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '658d86f51f102e672638f0be0476b3b4') in 0.017417 seconds
Import took 0.021984 seconds .
========================================================================
Received Import Request.
Time since last request: 441.583720 seconds.
path: Assets/Scripts/Configs/CardConfigs/MeleeSmallDamage.asset
artifactKey: Guid(a116d916027f0084c95f421e6398e3a1) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/CardConfigs/MeleeSmallDamage.asset using Guid(a116d916027f0084c95f421e6398e3a1) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '67e1e8060f84a2db2570ed60ec1490e7') in 0.010413 seconds
Import took 0.014779 seconds .
========================================================================
Received Import Request.
Time since last request: 0.000338 seconds.
path: Assets/Scripts/Configs/CardConfigs/SmallHealing.asset
artifactKey: Guid(60dce809256fdb34a91732594e0d5a34) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/CardConfigs/SmallHealing.asset using Guid(60dce809256fdb34a91732594e0d5a34) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'e01b85b19f1b877a94aee6b7df0d19d9') in 0.002705 seconds
Import took 0.006473 seconds .
========================================================================
Received Import Request.
Time since last request: 454.137103 seconds.
path: Assets/Scripts/Configs/CardConfigs/NewConfig.asset
artifactKey: Guid(42f8ccad16eb5e046828bbe96c64f513) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/CardConfigs/NewConfig.asset using Guid(42f8ccad16eb5e046828bbe96c64f513) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'ad58b0d9ea7989429f3f23956befca1b') in 0.008587 seconds
Import took 0.014378 seconds .
========================================================================
Received Import Request.
Time since last request: 3434.311365 seconds.
path: Assets/Prefabs/Cards/NewCard.prefab
artifactKey: Guid(06690fabc7ba41d4c866ae039eb65ffd) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Cards/NewCard.prefab using Guid(06690fabc7ba41d4c866ae039eb65ffd) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'f6763f4193cfe7f8849d484ba7411347') in 0.021303 seconds
Import took 0.028941 seconds .
========================================================================
Received Import Request.
Time since last request: 1175.921442 seconds.
path: Assets/Scripts/Configs/PlayerConfigs
artifactKey: Guid(94e94f1664dbb89438aa007b964597d5) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/PlayerConfigs using Guid(94e94f1664dbb89438aa007b964597d5) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'f31944e20625b3ea0e3bba690f99badb') in 0.015798 seconds
Import took 0.025336 seconds .
========================================================================
Received Import Request.
Time since last request: 0.030531 seconds.
path: Assets/Scripts/Configs/PlayerConfigs/FirstPlayer.asset
artifactKey: Guid(579cce6536370d24c85894c163bf61d2) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/PlayerConfigs/FirstPlayer.asset using Guid(579cce6536370d24c85894c163bf61d2) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '6e5a92469ebfa56016b89e7d3777eb49') in 0.024003 seconds
Import took 0.032657 seconds .
========================================================================
Received Import Request.
Time since last request: 0.000559 seconds.
path: Assets/Scripts/Configs/PlayerConfigs/One.asset
artifactKey: Guid(97caade20631e134b8c91a0b8e0302e0) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/PlayerConfigs/One.asset using Guid(97caade20631e134b8c91a0b8e0302e0) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '16c761a734eea5758803770f574b366f') in 0.011340 seconds
Import took 0.021690 seconds .
========================================================================
Received Import Request.
Time since last request: 340.757282 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: '3f386cd2d8e2daaa5c3540cf6c9cc776') in 0.019103 seconds
Import took 0.026745 seconds .
========================================================================
Received Import Request.
Time since last request: 10.761555 seconds.
path: Assets/Scripts/Configs/EnemyConfigs/NewEnemy.asset
artifactKey: Guid(d7ccafa8c85bae54bba2394a1ce83552) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/EnemyConfigs/NewEnemy.asset using Guid(d7ccafa8c85bae54bba2394a1ce83552) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '1f5a75b0e33fc8ccff1fe4fb7fee8cc9') in 0.013649 seconds
Import took 0.021085 seconds .
========================================================================
Received Import Request.
Time since last request: 1078.603078 seconds.
path: Assets/Scripts/Configs/BattleConfigs/NewBattle.asset
artifactKey: Guid(711d5926747ac284c8527d868967bef9) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/BattleConfigs/NewBattle.asset using Guid(711d5926747ac284c8527d868967bef9) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '0fdb89dfd12572f95bf0b41e278e551b') in 0.035565 seconds
Import took 0.044916 seconds .
========================================================================
Received Import Request.
Time since last request: 27909.593308 seconds.
path: Assets/Scripts/Enemy
artifactKey: Guid(f1dc807a1231259428b7050d80cd4621) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
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

View File

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

View File

@ -2,3 +2,5 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins
Cmd: initializeCompiler
Cmd: shutdown
Quitting shader compiler process

View File

@ -2,3 +2,5 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins
Cmd: initializeCompiler
Cmd: shutdown
Quitting shader compiler process

View File

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

View File

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

View File

@ -2,3 +2,5 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins
Cmd: initializeCompiler
Cmd: shutdown
Quitting shader compiler process

View File

@ -1,9 +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
<<<<<<< HEAD
=======
Cmd: shutdown
Quitting shader compiler process
>>>>>>> e432fe75ad14da1f8bbff409619110f2f4a2225a

View File

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

View File

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