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

监视面板功能初步实现

This commit is contained in:
Victor_Wang 2024-08-19 13:39:25 +08:00
parent 0f1d865053
commit 4f22cb6455
13 changed files with 494 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/ArtRes/RenderTexture/PlayerRenderTexture.renderTexture
View File

@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
m_Width: 256
m_Height: 256
m_Width: 255
m_Height: 489
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 94

15
Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/CheckMyselfItem.prefab → Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/UI_CheckMyselfItem.prefab
View File

@ -147,8 +147,9 @@ GameObject:
- component: {fileID: 8078226639558209602}
- component: {fileID: 3944633717089808067}
- component: {fileID: 8050215455937781931}
- component: {fileID: 7488210369510801467}
m_Layer: 5
m_Name: CheckMyselfItem
m_Name: UI_CheckMyselfItem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -258,6 +259,18 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &7488210369510801467
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7984153428917771150}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9db7b09607301694982a934007b3516b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8746938320234467046
GameObject:
m_ObjectHideFlags: 0

0
Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/CheckMyselfItem.prefab.meta → Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/UI_CheckMyselfItem.prefab.meta
View File

4
Assets/Resources/UI/UI_Panel/UI_ToolAndMaterialPanel.prefab
View File

@ -1437,7 +1437,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
@ -1727,7 +1727,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1263243931714669586
RectTransform:
m_ObjectHideFlags: 0

370
Assets/Scenes/04_ToolMaterialScene.unity
View File

@ -1945,7 +1945,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8051032130050426903}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1473623387268313464
GameObject:
@ -2010,7 +2010,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8051032130050426903}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1539615176033297858
GameObject:
@ -2550,7 +2550,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8051032130050426903}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2376275863548444257
GameObject:
@ -2718,8 +2718,180 @@ Transform:
- {fileID: 1832613213297205180}
- {fileID: 2847304155845729040}
m_Father: {fileID: 8051032130050426903}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2599598515853593843
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8910816801949012652}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3}
m_Name:
m_EditorClassIdentifier:
profile: {fileID: 0}
profileSync: 0
camerasLayerMask:
serializedVersion: 2
m_Bits: 4294967295
effectGroup: 0
effectGroupLayer:
serializedVersion: 2
m_Bits: 4294967295
effectNameFilter:
combineMeshes: 0
alphaCutOff: 0
cullBackFaces: 1
ignoreObjectVisibility: 0
reflectionProbes: 0
GPUInstancing: 1
optimizeSkinnedMesh: 1
depthClip: 0
cameraDistanceFade: 0
cameraDistanceFadeNear: 0
cameraDistanceFadeFar: 1000
normalsOption: 0
ignore: 0
_highlighted: 0
fadeInDuration: 0
fadeOutDuration: 0
flipY: 0
constantWidth: 1
subMeshMask: -1
overlay: 0
overlayMode: 0
overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
overlayAnimationSpeed: 1
overlayMinIntensity: 0.5
overlayBlending: 1
overlayTexture: {fileID: 0}
overlayTextureUVSpace: 0
overlayTextureScale: 1
overlayVisibility: 0
outline: 1
outlineColor: {r: 0.8080046, g: 1.6417967, b: 0.36961916, a: 1}
outlineColorStyle: 0
outlineGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 1, g: 1, b: 1, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
outlineGradientInLocalSpace: 0
outlineWidth: 0.45
outlineBlurPasses: 2
outlineQuality: 3
outlineEdgeMode: 0
outlineEdgeThreshold: 0.995
outlineDownsampling: 2
outlineVisibility: 0
glowBlendMode: 0
outlineBlitDebug: 0
outlineIndependent: 0
outlineContourStyle: 0
glow: 0.48
glowWidth: 0.4
glowQuality: 3
glowBlurMethod: 0
glowDownsampling: 2
glowHQColor: {r: 0.64, g: 1, b: 0, a: 1}
glowDithering: 1
glowMagicNumber1: 0.75
glowMagicNumber2: 0.5
glowAnimationSpeed: 1
glowVisibility: 0
glowBlitDebug: 0
glowBlendPasses: 1
glowPasses:
- offset: 4
alpha: 0.1
color: {r: 0.64, g: 1, b: 0, a: 1}
- offset: 3
alpha: 0.2
color: {r: 0.64, g: 1, b: 0, a: 1}
- offset: 2
alpha: 0.3
color: {r: 0.64, g: 1, b: 0, a: 1}
- offset: 1
alpha: 0.4
color: {r: 0.64, g: 1, b: 0, a: 1}
glowIgnoreMask: 0
innerGlow: 0
innerGlowWidth: 1
innerGlowColor: {r: 1, g: 1, b: 1, a: 1}
innerGlowBlendMode: 0
innerGlowVisibility: 0
targetFX: 0
targetFXTexture: {fileID: 0}
targetFXColor: {r: 1, g: 1, b: 1, a: 1}
targetFXCenter: {fileID: 0}
targetFXRotationSpeed: 50
targetFXInitialScale: 4
targetFXEndScale: 1.5
targetFXScaleToRenderBounds: 1
targetFXAlignToGround: 0
targetFXFadePower: 32
targetFXGroundMaxDistance: 10
targetFXGroundLayerMask:
serializedVersion: 2
m_Bits: 4294967295
targetFXTransitionDuration: 0.5
targetFXStayDuration: 1.5
targetFXVisibility: 1
seeThrough: 2
seeThroughOccluderMask:
serializedVersion: 2
m_Bits: 4294967295
seeThroughOccluderThreshold: 0.3
seeThroughOccluderMaskAccurate: 0
seeThroughOccluderCheckInterval: 1
seeThroughOccluderCheckIndividualObjects: 0
seeThroughDepthOffset: 0
seeThroughMaxDepth: 0
seeThroughIntensity: 0.8
seeThroughTintAlpha: 0.5
seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1}
seeThroughNoise: 1
seeThroughBorder: 0
seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1}
seeThroughBorderOnly: 0
seeThroughBorderWidth: 0.45
seeThroughOrdered: 0
seeThroughTexture: {fileID: 0}
seeThroughTextureUVSpace: 0
seeThroughTextureScale: 1
rmsCount: 1
hitFxInitialIntensity: 0
hitFxMode: 0
hitFxFadeOutDuration: 0.25
hitFxColor: {r: 1, g: 1, b: 1, a: 1}
hitFxRadius: 0.5
--- !u!4 &2608535975108993318
Transform:
m_ObjectHideFlags: 0
@ -3447,7 +3619,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8051032130050426903}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &3880741410050737762
MeshRenderer:
@ -3726,7 +3898,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8051032130050426903}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4275353400212834571
GameObject:
@ -4310,7 +4482,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8051032130050426903}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &5127325017497177788
SkinnedMeshRenderer:
@ -4464,7 +4636,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8051032130050426903}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &5363521872979565790
MeshRenderer:
@ -4508,6 +4680,14 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &5443996817976699258
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8604405792569097317}
m_Mesh: {fileID: 224562653422427921, guid: 2b8b4bc7f816fb645abf507b67d18921, type: 3}
--- !u!4 &5450169758508161620
Transform:
m_ObjectHideFlags: 0
@ -5148,7 +5328,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8051032130050426903}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6754810234727759773
GameObject:
@ -5993,6 +6173,48 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!23 &7811494699487419824
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8604405792569097317}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5fe119f0e712adf4eb9cf5bf08c05fef, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!23 &7853834384120317940
MeshRenderer:
m_ObjectHideFlags: 0
@ -6114,6 +6336,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8910816801949012651}
- {fileID: 2588252417550706819}
- {fileID: 6649573466045744353}
- {fileID: 5089486171865533038}
@ -6202,7 +6425,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8051032130050426903}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8273280625189519447
GameObject:
@ -6319,6 +6542,8 @@ GameObject:
- component: {fileID: 2587898902532246539}
- component: {fileID: 3431219503311567819}
- component: {fileID: 2179944575117779976}
- component: {fileID: 8528856438170212504}
- component: {fileID: 8528856438170212505}
m_Layer: 0
m_Name: "\u68B3\u5986\u955C\u6846"
m_TagString: Untagged
@ -6326,6 +6551,31 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!65 &8528856438170212504
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8528856438170212503}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 2, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &8528856438170212505
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8528856438170212503}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b55109e3c95e48c4abfa08fb926dcc06, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!23 &8576450275586677302
MeshRenderer:
m_ObjectHideFlags: 0
@ -6368,6 +6618,24 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &8604405792569097317
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8945043683843286751}
- component: {fileID: 5443996817976699258}
- component: {fileID: 7811494699487419824}
m_Layer: 0
m_Name: "\u56FD\u7F51\u5B89\u5168\u5E3D (2)"
m_TagString: Tools
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1001 &8642374616143441851
PrefabInstance:
m_ObjectHideFlags: 0
@ -6548,6 +6816,88 @@ Transform:
m_Father: {fileID: 2893925690830103088}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &8910816801949012649
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8910816801949012652}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.25506398, y: 0.13441789, z: 0.19692218}
m_Center: {x: 0.0033127815, y: 0.0071352124, z: -0.00087684393}
--- !u!114 &8910816801949012650
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8910816801949012652}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
m_Name:
m_EditorClassIdentifier:
itemInfo:
toolId: 0
triggerID: 0
toolName:
toolOrDeviceOrMaterial: 1
selfObj: {fileID: 0}
_highlight: {fileID: 0}
--- !u!4 &8910816801949012651
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8910816801949012652}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0.015, y: 1.806, z: -0.029}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8945043683843286751}
m_Father: {fileID: 8051032130050426903}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!1 &8910816801949012652
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8910816801949012651}
- component: {fileID: 8910816801949012649}
- component: {fileID: 8910816801949012650}
- component: {fileID: 2599598515853593843}
m_Layer: 0
m_Name: "\u56FD\u7F51\u5B89\u5168\u5E3D"
m_TagString: Tools
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8945043683843286751
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8604405792569097317}
m_LocalRotation: {x: -0.47077966, y: -0.5276045, z: -0.47077966, w: 0.5276045}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8910816801949012651}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -96.515, y: 90, z: -180}
--- !u!4 &9032225572846669850
Transform:
m_ObjectHideFlags: 0

10
Assets/Scripts/Project/Manager/PacksackBagMgr.cs
View File

@ -38,25 +38,25 @@ public class PacksackBagMgr : BaseManager<PacksackBagMgr>
public Dictionary<ItemInfo, List<ItemInfo>> GetItemsByE_TMDType(E_ToolOrDeviceOrMaterials tmdTpye)
{
Dictionary<ItemInfo, List<ItemInfo>> temp = new Dictionary<ItemInfo, List<ItemInfo>>();
Dictionary<ItemInfo, List<ItemInfo>> tempNew = new Dictionary<ItemInfo, List<ItemInfo>>();
var dicTemp = GetCurrentBagData();
foreach (var item in dicTemp.Keys)
{
if (item.toolOrDeviceOrMaterial == tmdTpye)
{
if (temp.ContainsKey(item))
if (tempNew.ContainsKey(item))
{
temp[item].Add(item);
tempNew[item].Add(item);
}
else
{
temp.Add(item, new List<ItemInfo>() { item });
tempNew.Add(item, new List<ItemInfo>() { item });
}
}
}
return temp;
return tempNew;
}
/// <summary>

10
Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs
View File

@ -1,5 +1,6 @@
using System.Collections;
using System.Collections.Generic;
using Sirenix.OdinInspector;
using UnityEngine;
public class Tool_SelectComponent : BaseToolOrDevice
@ -36,4 +37,13 @@ public class Tool_SelectComponent : BaseToolOrDevice
_highlight.highlighted = false;
GameManager.UIMgr.HidePanel<ItemTips>();//ÌáʾÃæ°å
}
[Button]
public void TestAddOne()
{
GameManager.PacksackBagMgr.AddOneToolOrMater(itemInfo);
_highlight.highlighted = false;
gameObject.SetActive(false);
GameManager.UIMgr.HidePanel<ItemTips>();//ÌáʾÃæ°å
}
}

42
Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs Normal file
View File

@ -0,0 +1,42 @@
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
public class UI_CheckMyselfItem : BaseItem
{
private string[] validToolNames = { "国网安全帽", "绝缘手套", "绝缘靴", "工作服" };
private ItemInfo itemInfo;
public void Init(ItemInfo _itemInfo, int count)
{
itemInfo = _itemInfo;
GetControl<TextMeshProUGUI>("CountText").text = count.ToString();
}
protected override void OnClick(string btnName)
{
base.OnClick(btnName);
switch (btnName)
{
case "ItemCloseBtn":
if (GameManager.RunModelMgr.ModeType != E_ModeType.Study)
{
int count = 0;
if (!GameManager.PacksackBagMgr.RemoveOneToolOrMater(itemInfo, ref count))
{
itemInfo.selfObj.SetActive(true);
Destroy(gameObject);
}
else
{
GetControl<TextMeshProUGUI>("CountText").text = count.ToString();
}
}
break;
case "UI_CheckMyselfItem":
//TODO something
break;
}
}
}

11
Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 9db7b09607301694982a934007b3516b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

20
Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs
View File

@ -1,5 +1,6 @@
using System.Collections;
using System.Collections.Generic;
using Sirenix.OdinInspector;
using TMPro;
using UnityEngine;
@ -39,4 +40,23 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem
break;
}
}
[Button]
public void TestRemoveOne()
{
if (GameManager.RunModelMgr.ModeType != E_ModeType.Study)
{
int count = 0;
if (!GameManager.PacksackBagMgr.RemoveOneToolOrMater(itemInfo, ref count))
{
itemInfo.selfObj.SetActive(true);
Destroy(gameObject);
}
else
{
GetControl<TextMeshProUGUI>("CountText").text = count.ToString();
}
}
}
}

19
Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs
View File

@ -1,13 +1,30 @@
using System.Linq;
using UnityEngine;
using UnityEngine.UI;
public class UI_CheckMyselfPanel : BasePanel
{
private string[] validToolNames = { "国网安全帽", "绝缘手套", "绝缘靴", "工作服" };
public void Init()
{
}
public override void ShowMe()
{
var currentBagDataForTool = GameManager.PacksackBagMgr.GetItemsByE_TMDType(E_ToolOrDeviceOrMaterials.Tool);
var _content = GetControl<ScrollRect>("itemScrollView").content;
foreach (var item in currentBagDataForTool.Keys)
{
if (validToolNames.Contains(item.toolName))
{
var uiItem =
GameManager.ResourcesMgr.Load<GameObject>(Const.UI_Item + "UI_CheckMyselfPanel/UI_CheckMyselfItem");
uiItem.transform.parent = _content;
uiItem.GetComponent<UI_CheckMyselfItem>().Init(item,currentBagDataForTool[item].Count);
}
}
}
public override void HideMe()
@ -19,7 +36,7 @@ public class UI_CheckMyselfPanel : BasePanel
switch (btnName)
{
case "closeBtn":
UIManager.Instance.HidePanel<UI_CheckMyselfPanel>();
UIManager.Instance.HidePanel<UI_CheckMyselfPanel>();
//GameManager.UIMgr.HidePanel<UI_CheckMyselfPanel>();
break;
default:

2
Assets/Scripts/ProjectBase/UIManager/BasePanel.cs
View File

@ -10,7 +10,7 @@ using UnityEngine.UI;
public class BasePanel : MonoBehaviour
{
/// <summary>
/// ??????????§α??
/// ??????????????
/// </summary>
private readonly Dictionary<string,List<UIBehaviour>> controlDic = new Dictionary<string, List<UIBehaviour>>();

9
Packages/packages-lock.json
View File

@ -1,5 +1,14 @@
{
"dependencies": {
"com.singularitygroup.hotreload": {
"version": "file:com.singularitygroup.hotreload",
"depth": 0,
"source": "embedded",
"dependencies": {
"com.unity.ugui": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0"
}
},
"com.unity.2d.sprite": {
"version": "1.0.0",
"depth": 0,