Added maps to item description (visual)

This commit is contained in:
Беляев Даниил 2022-02-01 14:34:57 +03:00
parent c1636a3587
commit a95b864da0
17 changed files with 5070 additions and 2239 deletions

Binary file not shown.

View File

@ -12,6 +12,9 @@ public class EquipmentInfo : MonoBehaviour
[SerializeField] private Image icon;
[SerializeField] private Button AddButton;
[SerializeField] private GameObject parentForCard;
private List<GameObject> linkList = new List<GameObject>();
private void Awake()
{
if (main != null && main != this)
@ -37,5 +40,40 @@ public class EquipmentInfo : MonoBehaviour
AddButton.GetComponentInChildren<Text>().text = "UnEquip";
else
AddButton.GetComponentInChildren<Text>().text = "Equip";
InstantiateCard(_index);
}
public void InstantiateCard(int _num)
{
for (int i = 0; i < linkList.Count; i++)
{
Destroy(linkList[i]);
}
linkList.Clear();
List<GameObject> _localList = new List<GameObject>();
for (int i = 0; i < Inventory.main.allEquipment[_num].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.equipmentCards.Length; i++)
{
if (_localList.Contains(Inventory.main.allEquipment[_num].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.equipmentCards[i]) == false)
_localList.Add(Inventory.main.allEquipment[_num].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.equipmentCards[i]);
}
float _x;
if (_localList.Count % 2 == 0)
_x = -(50f + 50f * (_localList.Count / 2));
else
_x = -(50 * Mathf.Ceil(_localList.Count / 2));
print(_x);
for (int i = 0; i < _localList.Count; i++)
{
GameObject link = Instantiate(_localList[i], parentForCard.transform);
linkList.Add(link);
link.transform.localPosition = new Vector3(_x, 0, 0);
link.transform.localScale = new Vector3(0.6f, 0.6f, 0.6f);
_x += 200f;
}
}
}

View File

@ -222,8 +222,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: -1.2418, y: 3.3745}
m_SizeDelta: {x: 468.9182, y: 330.9774}
m_AnchoredPosition: {x: -1.2418, y: 97}
m_SizeDelta: {x: 468.9182, y: 188.1162}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &206430319105238953
CanvasRenderer:
@ -520,6 +520,7 @@ RectTransform:
- {fileID: 206430320884459161}
- {fileID: 206430319936843622}
- {fileID: 206430319105238951}
- {fileID: 9067015791265231710}
- {fileID: 206430320312750927}
m_Father: {fileID: 206430320161201523}
m_RootOrder: 3
@ -1085,8 +1086,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: -0.0010834, y: -0.00043488}
m_SizeDelta: {x: 532.08, y: 365.28}
m_AnchoredPosition: {x: -0.001083374, y: 95.08185}
m_SizeDelta: {x: 532.08, y: 207.6126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &206430319936843624
CanvasRenderer:
@ -1692,6 +1693,7 @@ MonoBehaviour:
desqription: {fileID: 206430319105238952}
icon: {fileID: 206430319185765537}
AddButton: {fileID: 206430320312750929}
parentForCard: {fileID: 6543256374814840070}
--- !u!114 &206430320227353282
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2129,7 +2131,7 @@ RectTransform:
m_Children:
- {fileID: 206430320933441884}
m_Father: {fileID: 206430319233418357}
m_RootOrder: 3
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}
@ -3026,8 +3028,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: -0.0021744, y: -0.00043488}
m_SizeDelta: {x: 532.08, y: 365.28}
m_AnchoredPosition: {x: -0.0021743774, y: 95.08185}
m_SizeDelta: {x: 532.08, y: 207.6126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &206430320884459163
CanvasRenderer:
@ -3146,3 +3148,38 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Add
--- !u!1 &6543256374814840070
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9067015791265231710}
m_Layer: 5
m_Name: CardParent
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &9067015791265231710
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6543256374814840070}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.08, y: 1.08, z: 1.08}
m_Children: []
m_Father: {fileID: 206430319233418357}
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: 16, y: -108}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}

Binary file not shown.

View File

@ -19,7 +19,7 @@ MonoBehaviour:
width: 1920
height: 997
m_ShowMode: 4
m_Title: Inspector
m_Title: Game
m_RootView: {fileID: 6}
m_MinSize: {x: 875, y: 542}
m_MaxSize: {x: 10000, y: 10000}
@ -48,7 +48,7 @@ MonoBehaviour:
m_MinSize: {x: 678, y: 492}
m_MaxSize: {x: 14001, y: 14042}
vertical: 0
controlID: 77
controlID: 19
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
@ -226,7 +226,7 @@ MonoBehaviour:
m_MinSize: {x: 403, y: 492}
m_MaxSize: {x: 10001, y: 14042}
vertical: 1
controlID: 17
controlID: 20
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@ -251,7 +251,7 @@ MonoBehaviour:
m_MinSize: {x: 403, y: 221}
m_MaxSize: {x: 8003, y: 4021}
vertical: 0
controlID: 129
controlID: 21
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@ -262,7 +262,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: SceneView
m_Name: GameView
m_EditorClassIdentifier:
m_Children: []
m_Position:
@ -273,13 +273,13 @@ MonoBehaviour:
height: 589
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 16}
m_ActualView: {fileID: 17}
m_Panes:
- {fileID: 16}
- {fileID: 17}
- {fileID: 12}
m_Selected: 0
m_LastSelected: 1
m_Selected: 1
m_LastSelected: 0
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
@ -343,22 +343,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/Prefabs/Incidents
- Assets/Prefabs
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Prefabs/Incidents
- Assets/Prefabs
m_LastFoldersGridSize: -1
m_LastProjectPath: "E:\\Projects \u0441#\\Unity\\omega"
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 79}
m_SelectedIDs: 2c480000
m_LastClickedID: 18476
m_ExpandedIDs: 000000000447000010470000144700001a4700001c4700002c48000000ca9a3b
scrollPos: {x: 0, y: 35}
m_SelectedIDs: 10470000
m_LastClickedID: 18192
m_ExpandedIDs: 00000000044700001047000014470000ea4f000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -506,10 +506,10 @@ MonoBehaviour:
m_ViewDataDictionary: {fileID: 0}
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: de9c0000
m_LastClickedID: 40158
m_ExpandedIDs: ae08ffff2409ffff3009ffff920bffff101fffff3a51ffff4651ffffca52ffff7cacfffff2b1fffffeb1ffffd4b7ffffe4b7ffffa0b8ffffe6b9ffff50e8ffff80e8ffff90e8ffff20e9ffff34e9ffff4ce9ffff3efbffffa243000010440000e8560000105700004857000074570000e6670000ac7a0000107b000086930000cc980000de980000f4980000f8980000dc990000769c0000e49c0000de9d0000569e0000
scrollPos: {x: 0, y: 38}
m_SelectedIDs: bcbc0000
m_LastClickedID: 48316
m_ExpandedIDs: 9abafdffa6bafdffacbb0000c0bb0000c4bb0000e4bb000000bc000004bc000008bc00001cbc00002ebc000038bc000044bc000058bc000084bc000086bc0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -561,17 +561,17 @@ MonoBehaviour:
m_ShowContextualTools: 0
m_WindowGUID: 3ef1e1e8478a5bf46bae8e1fc58f7e8b
m_Gizmos: 1
m_OverrideSceneCullingMask: 6917529027641081856
m_SceneIsLit: 1
m_OverrideSceneCullingMask: 0
m_SceneIsLit: 0
m_SceneLighting: 1
m_2DMode: 1
m_isRotationLocked: 0
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 1195.1128, y: 502.19647, z: -890.6443}
m_Target: {x: 1832.7976, y: 242.9706, z: -81.38406}
speed: 2
m_Value: {x: 1815.1154, y: 723.3165, z: -46.856453}
m_Value: {x: 1832.7976, y: 242.9706, z: -81.38406}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@ -583,7 +583,7 @@ MonoBehaviour:
m_SceneViewState:
m_AlwaysRefresh: 0
showFog: 1
showSkybox: 1
showSkybox: 0
showFlares: 1
showImageEffects: 1
showParticleSystems: 1
@ -622,9 +622,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 742.39276
m_Target: 830.07434
speed: 2
m_Value: 948.5511
m_Value: 830.07434
m_Ortho:
m_Target: 1
speed: 2

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,16 +1,4 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler
Cmd: compileSnippet
insize=16577 file=Assets/DefaultResourcesExtra/Skybox/Procedural pass=<Unnamed Pass> cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR uKW=_SUNDISK_NONE dKW=_SUNDISK_SIMPLE _SUNDISK_HIGH_QUALITY UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=33 mask=6 start=20 ok=1 outsize=5414
Cmd: compileSnippet
insize=16577 file=Assets/DefaultResourcesExtra/Skybox/Procedural pass=<Unnamed Pass> cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR uKW=_SUNDISK_NONE dKW=_SUNDISK_SIMPLE _SUNDISK_HIGH_QUALITY UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=33 mask=6 start=20 ok=1 outsize=474
Cmd: compileSnippet
insize=16577 file=Assets/DefaultResourcesExtra/Skybox/Procedural pass=<Unnamed Pass> cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR uKW=_SUNDISK_SIMPLE dKW=_SUNDISK_NONE _SUNDISK_HIGH_QUALITY UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=33 mask=6 start=20 ok=1 outsize=5698
Cmd: compileSnippet
insize=16577 file=Assets/DefaultResourcesExtra/Skybox/Procedural pass=<Unnamed Pass> cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR uKW=_SUNDISK_SIMPLE dKW=_SUNDISK_NONE _SUNDISK_HIGH_QUALITY UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=33 mask=6 start=20 ok=1 outsize=934
Cmd: shutdown

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

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

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

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