completion of shortcomings

This commit is contained in:
Беляев Даниил 2022-02-01 21:49:54 +03:00
parent a95b864da0
commit bc53f03e57
13 changed files with 4388 additions and 5130 deletions

Binary file not shown.

View File

@ -15,6 +15,10 @@ public class EquipmentInfo : MonoBehaviour
[SerializeField] private GameObject parentForCard; [SerializeField] private GameObject parentForCard;
private List<GameObject> linkList = new List<GameObject>(); private List<GameObject> linkList = new List<GameObject>();
[SerializeField] private float distX = 200;
[SerializeField] private float cardScale = 0.6f;
[SerializeField] private float startCardShift = 50f;
private void Awake() private void Awake()
{ {
if (main != null && main != this) if (main != null && main != this)
@ -61,9 +65,9 @@ public class EquipmentInfo : MonoBehaviour
float _x; float _x;
if (_localList.Count % 2 == 0) if (_localList.Count % 2 == 0)
_x = -(50f + 50f * (_localList.Count / 2)); _x = -(startCardShift + startCardShift * (_localList.Count / 2));
else else
_x = -(50 * Mathf.Ceil(_localList.Count / 2)); _x = -(startCardShift * Mathf.Ceil(_localList.Count / 2));
print(_x); print(_x);
@ -72,8 +76,8 @@ public class EquipmentInfo : MonoBehaviour
GameObject link = Instantiate(_localList[i], parentForCard.transform); GameObject link = Instantiate(_localList[i], parentForCard.transform);
linkList.Add(link); linkList.Add(link);
link.transform.localPosition = new Vector3(_x, 0, 0); link.transform.localPosition = new Vector3(_x, 0, 0);
link.transform.localScale = new Vector3(0.6f, 0.6f, 0.6f); link.transform.localScale = new Vector3(cardScale, cardScale, cardScale);
_x += 200f; _x += distX;
} }
} }
} }

Binary file not shown.

View File

@ -21,7 +21,7 @@ MonoBehaviour:
m_ShowMode: 4 m_ShowMode: 4
m_Title: Game m_Title: Game
m_RootView: {fileID: 6} m_RootView: {fileID: 6}
m_MinSize: {x: 875, y: 542} m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1 m_Maximized: 1
--- !u!114 &2 --- !u!114 &2
@ -45,10 +45,10 @@ MonoBehaviour:
y: 30 y: 30
width: 1920 width: 1920
height: 947 height: 947
m_MinSize: {x: 678, y: 492} m_MinSize: {x: 679, y: 492}
m_MaxSize: {x: 14001, y: 14042} m_MaxSize: {x: 14002, y: 14042}
vertical: 0 vertical: 0
controlID: 19 controlID: 89
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -68,8 +68,8 @@ MonoBehaviour:
y: 0 y: 0
width: 389 width: 389
height: 947 height: 947
m_MinSize: {x: 275, y: 50} m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 14} m_ActualView: {fileID: 14}
m_Panes: m_Panes:
- {fileID: 14} - {fileID: 14}
@ -226,7 +226,7 @@ MonoBehaviour:
m_MinSize: {x: 403, y: 492} m_MinSize: {x: 403, y: 492}
m_MaxSize: {x: 10001, y: 14042} m_MaxSize: {x: 10001, y: 14042}
vertical: 1 vertical: 1
controlID: 20 controlID: 90
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -251,7 +251,7 @@ MonoBehaviour:
m_MinSize: {x: 403, y: 221} m_MinSize: {x: 403, y: 221}
m_MaxSize: {x: 8003, y: 4021} m_MaxSize: {x: 8003, y: 4021}
vertical: 0 vertical: 0
controlID: 21 controlID: 91
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -271,8 +271,8 @@ MonoBehaviour:
y: 0 y: 0
width: 1152 width: 1152
height: 589 height: 589
m_MinSize: {x: 202, y: 221} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4002, y: 4021} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 17} m_ActualView: {fileID: 17}
m_Panes: m_Panes:
- {fileID: 16} - {fileID: 16}
@ -343,22 +343,22 @@ MonoBehaviour:
m_SkipHidden: 0 m_SkipHidden: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Prefabs - Assets/Inventory
m_Globs: [] m_Globs: []
m_OriginalText: m_OriginalText:
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Prefabs - Assets/Inventory
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: "E:\\Projects \u0441#\\Unity\\omega" m_LastProjectPath: "E:\\Projects \u0441#\\Unity\\omega"
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 35} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 10470000 m_SelectedIDs: 0c470000
m_LastClickedID: 18192 m_LastClickedID: 18188
m_ExpandedIDs: 00000000044700001047000014470000ea4f000000ca9a3b m_ExpandedIDs: 000000000647000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -386,7 +386,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 0000000004470000 m_ExpandedIDs: 0000000006470000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -506,10 +506,10 @@ MonoBehaviour:
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 38} scrollPos: {x: 0, y: 0}
m_SelectedIDs: bcbc0000 m_SelectedIDs: a6150000
m_LastClickedID: 48316 m_LastClickedID: 0
m_ExpandedIDs: 9abafdffa6bafdffacbb0000c0bb0000c4bb0000e4bb000000bc000004bc000008bc00001cbc00002ebc000038bc000044bc000058bc000084bc000086bc0000 m_ExpandedIDs:
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -561,17 +561,17 @@ MonoBehaviour:
m_ShowContextualTools: 0 m_ShowContextualTools: 0
m_WindowGUID: 3ef1e1e8478a5bf46bae8e1fc58f7e8b m_WindowGUID: 3ef1e1e8478a5bf46bae8e1fc58f7e8b
m_Gizmos: 1 m_Gizmos: 1
m_OverrideSceneCullingMask: 0 m_OverrideSceneCullingMask: 6917529027641081856
m_SceneIsLit: 0 m_SceneIsLit: 1
m_SceneLighting: 1 m_SceneLighting: 1
m_2DMode: 1 m_2DMode: 1
m_isRotationLocked: 0 m_isRotationLocked: 0
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: 1832.7976, y: 242.9706, z: -81.38406} m_Target: {x: 1365.3108, y: 472.03812, z: -904.9367}
speed: 2 speed: 2
m_Value: {x: 1832.7976, y: 242.9706, z: -81.38406} m_Value: {x: 1365.3108, y: 472.03812, z: -904.9367}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
@ -583,7 +583,7 @@ MonoBehaviour:
m_SceneViewState: m_SceneViewState:
m_AlwaysRefresh: 0 m_AlwaysRefresh: 0
showFog: 1 showFog: 1
showSkybox: 0 showSkybox: 1
showFlares: 1 showFlares: 1
showImageEffects: 1 showImageEffects: 1
showParticleSystems: 1 showParticleSystems: 1
@ -622,9 +622,9 @@ MonoBehaviour:
speed: 2 speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1} m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size: m_Size:
m_Target: 830.07434 m_Target: 885.31714
speed: 2 speed: 2
m_Value: 830.07434 m_Value: 885.31714
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
@ -707,7 +707,7 @@ MonoBehaviour:
m_HSlider: 0 m_HSlider: 0
m_VSlider: 0 m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0 m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 0 m_EnableMouseInput: 1
m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0 m_EnableSliderZoomVertical: 0
m_UniformScale: 1 m_UniformScale: 1

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

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