Skip to content

GitLab

Commit 3218e710 authored by Sally552sally's avatar Sally552sally
Browse files

мелкие правки

parent 02243c51
Hide whitespace changes
Inline Side-by-side
Showing
with 59 additions and 77 deletions
+59 -77
Assets/DomiDo/AvvyLand/Prefabs/ARCanvases/CanvasAccessPanel.prefab
View file @ 3218e710
......@@ -4747,7 +4747,6 @@ GameObject:
- component: {fileID: 2943201295518583697}
- component: {fileID: 2943201295518583699}
- component: {fileID: 2943201295518583698}
- component: {fileID: 7752436585688054763}
m_Layer: 5
m_Name: QuickAccessPanel
m_TagString: Untagged
......@@ -4808,19 +4807,6 @@ MonoBehaviour:
m_Sprite: {fileID: 3286163911610860551, guid: d54a8d0b98423d44cb98123e4f1b6d8e,
type: 3}
m_PreserveAspect: 0
--- !u!114 &7752436585688054763
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2943201295518583696}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 44c97746d7ba7bb4f82139dae3f5b62a, type: 3}
m_Name:
m_EditorClassIdentifier:
toggleGroup: {fileID: 638291959}
--- !u!1 &2943201295705299821
GameObject:
m_ObjectHideFlags: 0
......@@ -5280,7 +5266,7 @@ GameObject:
- component: {fileID: 2943201296733259799}
- component: {fileID: 2943201296733259798}
- component: {fileID: 2943201296733259797}
- component: {fileID: 975029345}
- component: {fileID: 6606369497295307285}
m_Layer: 5
m_Name: CanvasAccessPanel
m_TagString: Untagged
......@@ -5387,7 +5373,7 @@ MonoBehaviour:
ScaleFactor: 3
- Height: 0
ScaleFactor: 4
--- !u!114 &975029345
--- !u!114 &6606369497295307285
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......
Assets/DomiDo/AvvyLand/Scenes/AR.unity
View file @ 3218e710
......@@ -205,6 +205,18 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &70490762 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6606369497295307285, guid: 5cf4c826f9a97d7428f1b7e521c08cd2,
type: 3}
m_PrefabInstance: {fileID: 638291954}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 44c97746d7ba7bb4f82139dae3f5b62a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &75991649
GameObject:
m_ObjectHideFlags: 0
......@@ -911,39 +923,6 @@ AudioListener:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 324300336}
m_Enabled: 1
--- !u!21 &422992827
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/Procedural UI Image
m_Shader: {fileID: 4800000, guid: 27d83044d20c5de4e9d57d35e4fda368, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!1 &435689549
GameObject:
m_ObjectHideFlags: 0
......@@ -3952,7 +3931,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 41f1c5417c9d7ab4b84e531f83f60a4b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 422992827}
m_Material: {fileID: 2120314676}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
......@@ -4658,18 +4637,6 @@ Transform:
m_Father: {fileID: 4398837987256693}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1997550514 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7752436585688054763, guid: 5cf4c826f9a97d7428f1b7e521c08cd2,
type: 3}
m_PrefabInstance: {fileID: 638291954}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 44c97746d7ba7bb4f82139dae3f5b62a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1999132363
GameObject:
m_ObjectHideFlags: 0
......@@ -4817,6 +4784,39 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 7269345230229358828}
m_PrefabAsset: {fileID: 0}
--- !u!21 &2120314676
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/Procedural UI Image
m_Shader: {fileID: 4800000, guid: 27d83044d20c5de4e9d57d35e4fda368, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!21 &2122810208
Material:
serializedVersion: 6
......@@ -5827,7 +5827,7 @@ PrefabInstance:
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1997550514}
objectReference: {fileID: 70490762}
- target: {fileID: 3247200185990821969, guid: 1c2dbfb9373c4de40bed8cb8bd92e2a4,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
......
Assets/DomiDo/AvvyLand/Scripts/QuickAccessToggleController.cs
View file @ 3218e710
......@@ -14,7 +14,7 @@ public class QuickAccessToggleController : MonoBehaviour
{
[SerializeField]
private ToggleGroup toggleGroup;
private QuickAccessToggle currentToggle;
private QuickAccessToggle lastActiveToggle;
private SaveAndLoadQuickAccessPanel saveAndLoadQuickAccess;
private ARUIStateMachine uiState;
......@@ -44,12 +44,13 @@ public class QuickAccessToggleController : MonoBehaviour
public void ReturnActiveToggle()
{
if (/*currentToggle != null &&*/ currentToggle.BlockInfo.Count > 0)
OnClickToggleAccessPanel(currentToggle);
if (lastActiveToggle != null && lastActiveToggle.BlockInfo.Count > 0)
OnClickToggleAccessPanel(lastActiveToggle);
else
FindAndActivateNextToggle();
}
//при получении инвентаря от сервера (выполняем только один раз) грузим инфу из сохренений PP и расставляем все в ячейки.
private void InventoryUpdated()
{
UpdateAccessButtonPanel();
......@@ -94,9 +95,8 @@ public class QuickAccessToggleController : MonoBehaviour
{
BlocksInventoryData.Instance.CurrentToggleBlock = currentBlock;
IsActivated = true;
Debug.Log(toggle == null);
currentToggle = toggle;
currentToggle.Toggle.isOn = true;
lastActiveToggle = toggle;
lastActiveToggle.Toggle.isOn = true;
}
}
}
......@@ -139,18 +139,17 @@ public class QuickAccessToggleController : MonoBehaviour
{
if (accessToggle.BlockInfo == null || accessToggle.BlockInfo.Count <= 0)
{
var block = currentToggle.BlockInfo;
var block = lastActiveToggle.BlockInfo;
if (block != null && block.Count > 0)
currentToggle.Toggle.isOn = true;
lastActiveToggle.Toggle.isOn = true;
else
toggleGroup.SetAllTogglesOff();
}
else
{
BlocksInventoryData.Instance.CurrentToggleBlock = accessToggle.BlockInfo;
Debug.Log(accessToggle == null);
currentToggle = accessToggle;
currentToggle.Toggle.isOn = true;
lastActiveToggle = accessToggle;
lastActiveToggle.Toggle.isOn = true;
}
}
......@@ -161,9 +160,6 @@ public class QuickAccessToggleController : MonoBehaviour
uiState.StructureState = ARBlockModeState.Idle;
}
private void OnDestroy()
{
SavePanel();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment