WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://git.umayle.com/WangWeiZhi/YanCheng_Metrology

This commit is contained in:
liuyu 2024-09-02 15:18:37 +08:00
parent b31f0f125d c412b1cd99
commit b00a57c15a
15 changed files with 395 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/ArtRes/Sprite/Temp/重新练习-悬浮@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

159
Assets/ArtRes/Sprite/Temp/重新练习-悬浮@2x.png.meta Normal file
View File

@ -0,0 +1,159 @@
fileFormatVersion: 2
guid: e5833786c4c54374c9ccc0441cde8f2d
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
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
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 2
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
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
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 8192
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: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/ArtRes/Sprite/Temp/重新练习-默认@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

159
Assets/ArtRes/Sprite/Temp/重新练习-默认@2x.png.meta Normal file
View File

@ -0,0 +1,159 @@
fileFormatVersion: 2
guid: 75c41c3c4c6245b4c835992941592114
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
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
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 2
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
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
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 8192
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: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

91
Assets/Resources/UI/UI_Item/UI_SelectDevicePanel/deviceItemBtn.prefab
View File

@ -1,81 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4170357601739698860
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1728984890007447347}
- component: {fileID: 8575163737800612770}
- component: {fileID: 7044640413962384597}
m_Layer: 5
m_Name: Bg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1728984890007447347
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4170357601739698860}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 771806173659001502}
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: 7.593704, y: 0}
m_SizeDelta: {x: -15.187, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8575163737800612770
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4170357601739698860}
m_CullTransparentMesh: 1
--- !u!114 &7044640413962384597
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4170357601739698860}
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: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 29f36a4ea7a8f834790a0455a1b9ca58, 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 &5268434527328650183
GameObject:
m_ObjectHideFlags: 0
@ -88,7 +12,7 @@ GameObject:
- component: {fileID: 1203145776376208031}
- component: {fileID: 4570010695021958386}
- component: {fileID: 2576342188210821588}
- component: {fileID: 4374445411415707542}
- component: {fileID: 7203119007215407391}
m_Layer: 5
m_Name: deviceItemBtn
m_TagString: Untagged
@ -108,7 +32,6 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1728984890007447347}
- {fileID: 2134925957530674845}
m_Father: {fileID: 0}
m_RootOrder: 0
@ -139,14 +62,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 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: 0}
m_Sprite: {fileID: 21300000, guid: 29f36a4ea7a8f834790a0455a1b9ca58, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -186,7 +109,7 @@ MonoBehaviour:
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 21300000, guid: 606f2a731815df94fb3d13a890a1072f, type: 3}
m_PressedSprite: {fileID: 21300000, guid: 606f2a731815df94fb3d13a890a1072f, type: 3}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
@ -196,11 +119,11 @@ MonoBehaviour:
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 7044640413962384597}
m_TargetGraphic: {fileID: 4570010695021958386}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &4374445411415707542
--- !u!114 &7203119007215407391
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -244,7 +167,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 771806173659001502}
m_RootOrder: 1
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}

2
Assets/Resources/UI/UI_Panel/UI_SelectDevicePanel.prefab
View File

@ -178,7 +178,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Padding:
m_Left: 7
m_Right: 10
m_Right: -25
m_Top: 26
m_Bottom: 10
m_ChildAlignment: 1

8
Assets/Resources/UI/UI_Panel/UI_TaskListPanel.prefab
View File

@ -106,7 +106,7 @@ MonoBehaviour:
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_HighlightedSprite: {fileID: 21300000, guid: 4fbab97bec78c1c40998ad19c53c393e, type: 3}
m_PressedSprite: {fileID: 21300000, guid: 4fbab97bec78c1c40998ad19c53c393e, type: 3}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
@ -781,7 +781,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: d7de17f617f397a4b88ee5e911877a3e, type: 3}
m_Sprite: {fileID: 21300000, guid: 75c41c3c4c6245b4c835992941592114, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -820,8 +820,8 @@ MonoBehaviour:
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 21300000, guid: 4fbab97bec78c1c40998ad19c53c393e, type: 3}
m_HighlightedSprite: {fileID: 21300000, guid: e5833786c4c54374c9ccc0441cde8f2d, type: 3}
m_PressedSprite: {fileID: 21300000, guid: e5833786c4c54374c9ccc0441cde8f2d, type: 3}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:

6
Assets/Resources/UI/UI_Panel/UI_TipsForPracticePanel.prefab
View File

@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 3186491756994606986}
- component: {fileID: 6022205943530221735}
m_Layer: 5
m_Name: Button (Legacy) (1)
m_Name: ResetStudy
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -414,7 +414,7 @@ GameObject:
- component: {fileID: 9186553699674210857}
- component: {fileID: 1149586307798198828}
m_Layer: 5
m_Name: Button (Legacy)
m_Name: StartPractice
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -535,7 +535,7 @@ GameObject:
- component: {fileID: 7044389489826003207}
- component: {fileID: 969337629717612101}
m_Layer: 5
m_Name: Button (Legacy) (2)
m_Name: BackBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

38
Assets/Scripts/Project/Manager/GameManager.cs
View File

@ -173,7 +173,7 @@ public class GameManager : SingletonAutoMono<GameManager>
{
if (isReset)
{
ResetUIPanelAndEvent();
ResetStateAndEvent();
}
UIMgr.ShowPanel<UI_BGPanel>(E_UI_Layer.Bot);
UIMgr.ShowPanel<UI_MainTitlePanel>(E_UI_Layer.Bot, (panel) => { panel.Init(); });
@ -187,32 +187,42 @@ public class GameManager : SingletonAutoMono<GameManager>
EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
});
}
/// <summary>
/// 重新学习
/// 练习
/// </summary>
public void ResetStudy()
public void Practice()
{
ResetUIPanelAndEvent();
ResetStateAndEvent();
RunModelMgr.ModeType = E_ModeType.Practice;
EventMgr.EventTrigger(Enum_EventType.SwitchMode);
ProcessMgr.Init(RunModelMgr.schemeID, RunModelMgr.ModeType);
UIMgr.ShowPanel<UI_LoadingPanel>(E_UI_Layer.System, (panel) =>
{
UIMgr.ShowPanel<UI_MainTitlePanel>(E_UI_Layer.Bot, (panel) =>
{
panel.Init();
});
panel.Init();
EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.1f);
ScenesMgr.LoadSceneAsyn("03_OfficeScene", () =>
{
EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
});
{
UIMgr.HidePanel<UI_SelectDevicePanel>();
UIMgr.HidePanel<UI_BGPanel>();
EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
});
});
}
public void StartPractice()
{
}
private void ResetUIPanelAndEvent()
/// <summary>
/// 清除一些动态
/// </summary>
private void ResetStateAndEvent()
{
UIMgr.HidePanel<UI_TopTipPanel>();
UIMgr.HidePanel<UI_TaskListPanel>();
UIMgr.HidePanel<UI_MenuBar>();
PacksackBagMgr.ClearAllData();
EventMgr.Clear();
}

21
Assets/Scripts/Project/Manager/OfficeManager.cs
View File

@ -58,20 +58,17 @@ public class OfficeManager : SingletonMono<OfficeManager>
}
private void InitializationUI()
{
if (!GameManager.UIMgr.GetPanel<UI_TaskListPanel>())
{
GameManager.UIMgr.ShowPanel<UI_TaskListPanel>(E_UI_Layer.Bot, (panel) =>
{
panel.Init(GameManager.ProcessMgr.subProcessId);
});
}
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
{
if (!GameManager.UIMgr.GetPanel<UI_TaskListPanel>())
{
GameManager.UIMgr.ShowPanel<UI_TaskListPanel>(E_UI_Layer.Bot, (panel) =>
{
panel.Init(GameManager.ProcessMgr.subProcessId);
});
}
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
{
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, GameManager.ProcessMgr.subProcessId);
}
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, GameManager.ProcessMgr.subProcessId);
}
if (!GameManager.UIMgr.GetPanel<UI_MenuBar>())
{

5
Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs
View File

@ -38,7 +38,10 @@ public class UI_SubProcessItem : BaseItem
else
GetControl<Image>("learningTips").gameObject.SetActive(false);
}
public void OnResetClick()
{
OnClick("subProcessBtn");
}
protected override void OnClick(string btnName)
{
base.OnClick(btnName);

3
Assets/Scripts/Project/UI/UI_Panel/UI_InstallAndDismantleTicketPanel.cs
View File

@ -1,9 +1,6 @@
using System.Collections;
using System.Collections.Generic;
using System.Timers;
using TMPro;
using Unity.VisualScripting;
using UnityEditor.VersionControl;
using UnityEngine;
using UnityEngine.UI;

4
Assets/Scripts/Project/UI/UI_Panel/UI_SelectDevicePanel.cs
View File

@ -56,7 +56,6 @@ public class UI_SelectDevicePanel : BasePanel
GameManager.UIMgr.AddEventTriggerListener(deviceBtnAComponent, EventTriggerType.PointerEnter,
_ =>
{
//deviceBtnAComponent.transform.DOScale(1.3f, 0.2f);
this.GetControl<Image>("DeviceShowImg").sprite =
GameManager.ResourcesMgr.Load<Sprite>(Const.UI_SelectDevicePanel + mapName);
this.GetControl<Image>("DeviceShowImg").color = new Color(1, 1, 1, 1);
@ -64,13 +63,12 @@ public class UI_SelectDevicePanel : BasePanel
GameManager.UIMgr.AddEventTriggerListener(deviceBtnAComponent, EventTriggerType.PointerExit,
_ =>
{
//deviceBtnAComponent.transform.DOScale(1f, 0.2f);
this.GetControl<Image>("DeviceShowImg").color = new Color(1, 1, 1, 0);
});
deviceBtnAComponent.onClick.AddListener(() =>
{
GameManager.RunModelMgr.schemeID = int.Parse(deviceBtnAComponent.name);
GameManager.ProcessMgr.Init(GameManager.RunModelMgr.schemeID, E_ModeType.Study);
GameManager.ProcessMgr.Init(GameManager.RunModelMgr.schemeID, GameManager.RunModelMgr.ModeType);
GameManager.UIMgr.ShowPanel<UI_LoadingPanel>(E_UI_Layer.System, (panel) =>
{
GameManager.UIMgr.ShowPanel<UI_MainTitlePanel>(E_UI_Layer.Bot, (panel) =>

20
Assets/Scripts/Project/UI/UI_Panel/UI_TaskListPanel.cs
View File

@ -18,6 +18,7 @@ public class UI_TaskListPanel : BasePanel
rePractice.SetActive(GameManager.RunModelMgr.ModeType == E_ModeType.Practice);
reStudy.SetActive(GameManager.RunModelMgr.ModeType == E_ModeType.Study);
taskListScrollView.SetActive(GameManager.RunModelMgr.ModeType == E_ModeType.Study);
GetControl<Button>("BackBtn").gameObject.SetActive(GameManager.RunModelMgr.ModeType != E_ModeType.Exam);
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
{
GameManager.ResourcesMgr.LoadAsync<UI_ProcessItem>($"{Const.UI_Item}UI_TaskListPanel/processItem", (ptemp) =>
@ -44,6 +45,21 @@ public class UI_TaskListPanel : BasePanel
}
}
/// <summary>
/// µã»÷µÚÒ»¸ö
/// </summary>
public void ClickFirstSubProcessesItem()
{
if (_content.GetChild(0).GetComponent<UI_SubProcessItem>())
{
_content.GetChild(0).GetComponent<UI_SubProcessItem>().OnResetClick();
return;
}
if (_content.GetChild(1).GetComponent<UI_SubProcessItem>())
{
_content.GetChild(1).GetComponent<UI_SubProcessItem>().OnResetClick();
}
}
protected override void OnClick(string btnName)
{
@ -54,10 +70,10 @@ public class UI_TaskListPanel : BasePanel
GameManager.Instance.ShowUIPanelAndLoadScene(true);
break;
case "ReStartBtn":
GameManager.Instance.ResetStudy();
ClickFirstSubProcessesItem();
break;
case "RePracticeBtn":
GameManager.Instance.ResetStudy();
GameManager.Instance.Practice();
break;
default:
break;

9
Assets/Scripts/Project/UI/UI_Panel/UI_TipsForPracticePanel.cs
View File

@ -18,14 +18,16 @@ public class UI_TipsForPracticePanel : BasePanel
protected override void OnClick(string btnName)
{
switch (btnName)
{
case "StartPractice":
GameManager.Instance.Practice();
break;
case "ResetStudy":
GameManager.Instance.ResetStudy();
if (GameManager.UIMgr.GetPanel<UI_TaskListPanel>())
{
GameManager.UIMgr.GetPanel<UI_TaskListPanel>().ClickFirstSubProcessesItem();
}
break;
case "BackBtn":
GameManager.Instance.ShowUIPanelAndLoadScene(true);
@ -33,5 +35,6 @@ public class UI_TipsForPracticePanel : BasePanel
default:
break;
}
GameManager.UIMgr.HidePanel<UI_TipsForPracticePanel>();
}
}