zaletovfyodor
/
PO
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Raw version

This commit is contained in:
Беляев Даниил 2022-02-11 20:15:57 +03:00
parent 000271132a
commit efc1780110
21 changed files with 3376 additions and 2402 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/omega/v16/.suo
View File

Binary file not shown.

8
Assets/Graphics/Effects.meta Normal file
View File

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

BIN
Assets/Graphics/Effects/poison.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

96
Assets/Graphics/Effects/poison.png.meta Normal file
View File

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

193
Assets/Prefabs/Effect.prefab Normal file
View File

@ -0,0 +1,193 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &370573514217496528
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6251857675539644312}
- component: {fileID: 109837387070460922}
- component: {fileID: 5265416081529346178}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6251857675539644312
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 370573514217496528}
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: 4933173603962467258}
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: -117.750244, y: 116.80835}
m_SizeDelta: {x: 335.5006, y: 333.6166}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &109837387070460922
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 370573514217496528}
m_CullTransparentMesh: 1
--- !u!114 &5265416081529346178
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 370573514217496528}
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: aaede90ffe96b2940b8e63f884f5e7d4, 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 &7988754422979339376
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1615705655415755388}
- component: {fileID: 3780427103887971505}
- component: {fileID: 1515112323745727695}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1615705655415755388
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7988754422979339376}
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: 4933173603962467258}
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: 0}
m_SizeDelta: {x: 164.1519, y: 68.6638}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3780427103887971505
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7988754422979339376}
m_CullTransparentMesh: 1
--- !u!114 &1515112323745727695
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7988754422979339376}
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: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 0
--- !u!1 &8365349782809087845
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4933173603962467258}
m_Layer: 5
m_Name: Effect
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4933173603962467258
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8365349782809087845}
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: 6251857675539644312}
- {fileID: 1615705655415755388}
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}

7
Assets/Prefabs/Effect.prefab.meta Normal file
View File

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

4
Assets/Scenes/DataHolder.unity
View File

@ -304,3 +304,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 28a7b70cce701c64c8157922e23b706c, type: 3}
m_Name:
m_EditorClassIdentifier:
effectPrefab: {fileID: 8365349782809087845, guid: 68a81a1d82a983543b7f52b5dd9a9190, type: 3}
effectIcons:
- name: poison
icon: {fileID: 21300000, guid: aaede90ffe96b2940b8e63f884f5e7d4, type: 3}

8
Assets/Scripts/Enemy/Enemy.cs
View File

@ -34,6 +34,8 @@ public class Enemy : MonoBehaviour
public List<int> effectsTurns = new List<int>();
public List<int> effectsDamage = new List<int>();
[HideInInspector] public List<GameObject> effectsLink = new List<GameObject>();
private void Start()
{
NewInformation();
@ -125,6 +127,12 @@ public class Enemy : MonoBehaviour
{
for (int i = 0; i < effectsName.Count; i++)
{
for (int j = 0; j < effectsLink.Count; j++)
{
effectsLink.RemoveAt(j);
}
effectsLink.Clear();
if(effectsTurns[i] == 0)
{
effectsName.Remove(effectsName[i]);

24
Assets/Scripts/LibraryEffects.cs
View File

@ -1,11 +1,25 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class LibraryEffects : MonoBehaviour
{
public static LibraryEffects main;
public Dictionary<string, Sprite> effectsIcon = new Dictionary<string, Sprite>();
public GameObject effectPrefab;
[System.Serializable]
public class IconsEffects
{
public string name;
public Sprite icon;
}
public IconsEffects[] effectIcons;
public void Start()
{
main = this;
@ -13,6 +27,16 @@ public class LibraryEffects : MonoBehaviour
public void Poison(GameObject _enemy, int _damage)
{
for (int i = 0; i < effectIcons.Length; i++)
{
if(effectIcons[i].name == "poison")
{
effectPrefab.GetComponentInChildren<Image>().sprite = effectIcons[i].icon;
}
}
effectPrefab.GetComponentInChildren<Text>().text = _damage.ToString();
_enemy.GetComponent<Enemy>().ChangeHp(_damage);
GameObject link = Instantiate(effectPrefab, _enemy.transform);
_enemy.GetComponent<Enemy>().effectsLink.Add(link);
}
}

BIN
Library/ArtifactDB
View File

Binary file not shown.

60
Library/CurrentLayout-default.dwlt
View File

@ -45,10 +45,10 @@ MonoBehaviour:
y: 30
width: 1920
height: 947
m_MinSize: {x: 678, y: 492}
m_MinSize: {x: 677, y: 492}
m_MaxSize: {x: 14001, y: 14042}
vertical: 0
controlID: 37
controlID: 113
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
@ -95,8 +95,8 @@ MonoBehaviour:
y: 0
width: 379
height: 589
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 16}
@ -224,10 +224,10 @@ MonoBehaviour:
y: 0
width: 1531
height: 947
m_MinSize: {x: 403, y: 492}
m_MinSize: {x: 402, y: 492}
m_MaxSize: {x: 10001, y: 14042}
vertical: 1
controlID: 38
controlID: 16
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@ -249,10 +249,10 @@ MonoBehaviour:
y: 0
width: 1531
height: 589
m_MinSize: {x: 403, y: 221}
m_MaxSize: {x: 8003, y: 4021}
m_MinSize: {x: 402, y: 221}
m_MaxSize: {x: 8002, y: 4021}
vertical: 0
controlID: 39
controlID: 17
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@ -263,7 +263,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: GameView
m_Name: SceneView
m_EditorClassIdentifier:
m_Children: []
m_Position:
@ -272,15 +272,15 @@ MonoBehaviour:
y: 0
width: 1152
height: 589
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 18}
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 17}
m_Panes:
- {fileID: 17}
- {fileID: 18}
- {fileID: 13}
m_Selected: 1
m_LastSelected: 0
m_Selected: 0
m_LastSelected: 1
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
@ -369,22 +369,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/Scripts/Configs/CardConfigs
- Assets/Prefabs
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Scripts/Configs/CardConfigs
- Assets/Prefabs
m_LastFoldersGridSize: -1
m_LastProjectPath: "E:\\Projects \u0441#\\Unity\\omega"
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 00570000
m_LastClickedID: 22272
m_ExpandedIDs: 00000000084700001a4700001e47000000ca9a3b
scrollPos: {x: 0, y: 35}
m_SelectedIDs: 18470000
m_LastClickedID: 18200
m_ExpandedIDs: 000000000e470000124700001c4700002247000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -412,7 +412,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 0000000008470000
m_ExpandedIDs: 000000000e470000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -456,7 +456,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 5}
m_ClientGUIView: {fileID: 11}
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
m_InstanceID: 0
@ -533,9 +533,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 064e0000
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: d461ffff7e71ffffca85ffffc8a2ffffa8b3ffffacbdfffff0c2ffff10c8ffffe2c9ffffd6e7ffff1ef4ffff3efbffff40fbffffaa600000b2600000be600000d2600000fc6000000a6100003e64000052640000666400009e6400008c6a0000b46a0000de6a0000ec6a0000507100007c71000026730000387300004e730000527300004c7700005e77000078770000dc7a0000ee7a0000087b0000847e0000967e0000b07e0000e6820000f8820000128300007e86000090860000aa860000
m_ExpandedIDs: 46d7ffffbad7ffff60dbffff36e2ffffdce5ffffe2ecffff7ef9ffff3efbffff40fbffffa84300001044000016440000486500005a650000746500004e67000060670000766700007a670000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -595,9 +595,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 1365.3108, y: 472.03812, z: -904.9367}
m_Target: {x: 1502.8994, y: 1105.9774, z: -50.28237}
speed: 2
m_Value: {x: 1365.3108, y: 472.03812, z: -904.9367}
m_Value: {x: 723.1668, y: 737.3668, z: -39.373474}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@ -648,9 +648,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 885.31714
m_Target: 217.41884
speed: 2
m_Value: 885.31714
m_Value: 489.8413
m_Ortho:
m_Target: 1
speed: 2
@ -733,7 +733,7 @@ MonoBehaviour:
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 1
m_EnableMouseInput: 0
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1

BIN
Library/InspectorExpandedItems.asset
View File

Binary file not shown.

BIN
Library/SceneVisibilityState.asset
View File

Binary file not shown.

BIN
Library/ScriptAssemblies/Assembly-CSharp.dll
View File

Binary file not shown.

BIN
Library/ScriptAssemblies/Assembly-CSharp.pdb
View File

Binary file not shown.

BIN
Library/SourceAssetDB
View File

Binary file not shown.

2632
Logs/AssetImportWorker0-prev.log
View File

File diff suppressed because it is too large Load Diff

2740
Logs/AssetImportWorker0.log
View File

File diff suppressed because it is too large Load Diff

2
Logs/shadercompiler-UnityShaderCompiler.exe3.log
View File

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

2
Logs/shadercompiler-UnityShaderCompiler.exe4.log
View File

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

2
Logs/shadercompiler-UnityShaderCompiler.exe5.log
View File

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