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

1

This commit is contained in:
Victor_Wang 2024-08-08 13:53:20 +08:00
parent 6dc9c3a8ef fd73eacc89
commit 0eaddabba7
19 changed files with 651 additions and 477 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/ArtRes/Excel/Config.xlsx
View File

Binary file not shown.

230
Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold SDF.asset
View File

File diff suppressed because one or more lines are too long

310
Assets/ArtRes/Fonts/SourceHanSansCN-Bold SDF.asset
View File

File diff suppressed because one or more lines are too long

7
Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: f597f19f656ba56eae4f6a3a7cc528f4
timeCreated: 1488828285
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

7
Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 48e08dc33330d11e9d4a1b246c52e4f6
timeCreated: 1488828285
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

7
Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: ed09910c0094cb27be8f3ca264680da3
timeCreated: 1488828285
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

7
Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: cc355dd4cf1e6173beaeb22c2858cbe1
timeCreated: 1488828285
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Addressables.data.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Addressables.data.meta
guid: d92d0eb8b980c6d44b5f0e64a620355b
guid: b7efdabd500378f4a861d221bd9cdda6
========
guid: 825efef6ba8a5744aa342459759569a0
>>>>>>>> 8f2b841f2cdbb028247b83d3caed38a79a85739f:Assets/Scenes/05_office.unity.meta

31
Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab
View File

@ -107,7 +107,7 @@ MonoBehaviour:
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 21300000, guid: 5822bea872f4f1546a24a105c01e34fa, type: 3}
m_PressedSprite: {fileID: 0}
m_PressedSprite: {fileID: 21300000, guid: 463ca7c5d18142c4f80719da96c9be93, type: 3}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
@ -161,8 +161,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, y: 0}
m_SizeDelta: {x: 110, y: 412}
m_AnchoredPosition: {x: 0, y: 11.8584}
m_SizeDelta: {x: 110, y: 388.283}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1795308582085270901
MonoBehaviour:
@ -182,7 +182,7 @@ MonoBehaviour:
m_Top: 32
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 36
m_Spacing: 39
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
@ -296,8 +296,8 @@ MonoBehaviour:
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 21300000, guid: 4de6613cad66a9c40805f7e5c67e007d, type: 3}
m_PressedSprite: {fileID: 21300000, guid: 9f25969f01848e64c814734d819804ee, type: 3}
m_HighlightedSprite: {fileID: 21300000, guid: a0a9648ef074adc41897ceba4cd1661e, type: 3}
m_PressedSprite: {fileID: 21300000, guid: 17b37276bebefc94f865585e7894772c, type: 3}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
@ -337,7 +337,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4158635166661152314}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
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
@ -402,7 +402,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 545e1bf40c968b94d94dbd234fe1e530, type: 3}
m_Name:
m_EditorClassIdentifier:
ClickSprite: {fileID: 0}
ClickSprite: {fileID: 21300000, guid: 79f9b1d682f470f40ab600dade2c369d, type: 3}
OnClickSprite: {fileID: 21300000, guid: 352fb2f67e1311f42a17d4be24bd51b6, type: 3}
--- !u!1 &4240480582127588975
GameObject:
m_ObjectHideFlags: 0
@ -510,7 +511,7 @@ MonoBehaviour:
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 21300000, guid: 768b23756a5e8424085dc30dfc1c927f, type: 3}
m_PressedSprite: {fileID: 0}
m_PressedSprite: {fileID: 21300000, guid: 681a4d2a15341dc4da58090f91bb89f2, type: 3}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
@ -751,8 +752,8 @@ MonoBehaviour:
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 21300000, guid: 4de6613cad66a9c40805f7e5c67e007d, type: 3}
m_PressedSprite: {fileID: 21300000, guid: 9f25969f01848e64c814734d819804ee, type: 3}
m_HighlightedSprite: {fileID: 21300000, guid: acbe700801361de41b6dc8ed7ec04c9a, type: 3}
m_PressedSprite: {fileID: 21300000, guid: 719312c50038a4b4a87f4e2d18ff9f6f, type: 3}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
@ -872,8 +873,8 @@ MonoBehaviour:
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 21300000, guid: 4de6613cad66a9c40805f7e5c67e007d, type: 3}
m_PressedSprite: {fileID: 21300000, guid: 9f25969f01848e64c814734d819804ee, type: 3}
m_HighlightedSprite: {fileID: 21300000, guid: 8ef4e22707143a04e832828dfdc4bde4, type: 3}
m_PressedSprite: {fileID: 21300000, guid: a1f6f638b95a3a24ca0a6ab7f7dfa168, type: 3}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
@ -993,8 +994,8 @@ MonoBehaviour:
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 21300000, guid: acbe700801361de41b6dc8ed7ec04c9a, type: 3}
m_PressedSprite: {fileID: 21300000, guid: 719312c50038a4b4a87f4e2d18ff9f6f, type: 3}
m_HighlightedSprite: {fileID: 21300000, guid: 4de6613cad66a9c40805f7e5c67e007d, type: 3}
m_PressedSprite: {fileID: 21300000, guid: 9f25969f01848e64c814734d819804ee, type: 3}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:

115
Assets/Resources/UI/UI_Panel/UI_SessionPanel.prefab
View File

@ -36,7 +36,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 39, y: 78}
m_AnchoredPosition: {x: 66, y: 78}
m_SizeDelta: {x: 64, y: 28}
m_Pivot: {x: 0, y: 0}
--- !u!222 &6131423302129996610
@ -110,11 +110,11 @@ RectTransform:
m_Father: {fileID: 4152386550255537530}
m_RootOrder: 2
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, y: 0}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 132.09, y: 24}
m_SizeDelta: {x: 549, y: 54}
m_Pivot: {x: 0, y: 0}
--- !u!222 &3027844819438551633
CanvasRenderer:
m_ObjectHideFlags: 0
@ -212,6 +212,82 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &756040077007726745
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4356325546148524987}
- component: {fileID: 418720108211413624}
- component: {fileID: 6059488259152394469}
m_Layer: 5
m_Name: Operator
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4356325546148524987
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 756040077007726745}
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: 4152386550255537530}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -38, y: 48}
m_SizeDelta: {x: 140, y: 140}
m_Pivot: {x: 0, y: 1}
--- !u!222 &418720108211413624
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 756040077007726745}
m_CullTransparentMesh: 1
--- !u!114 &6059488259152394469
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 756040077007726745}
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: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 16c830209b0af6e42b877ee77e8c1174, type: 3}
m_Type: 1
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 &3874111377766617313
GameObject:
m_ObjectHideFlags: 0
@ -245,10 +321,10 @@ RectTransform:
m_Father: {fileID: 4796764881398963795}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: 72, y: 27}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1653482776957719851
CanvasRenderer:
@ -305,8 +381,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 16
m_fontSizeBase: 16
m_fontSize: 18
m_fontSizeBase: 18
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@ -384,7 +460,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -38, y: 17}
m_AnchoredPosition: {x: -40.28, y: 10}
m_SizeDelta: {x: 115.64, y: 30}
m_Pivot: {x: 1, y: 0}
--- !u!222 &5490340307791552845
@ -503,13 +579,14 @@ RectTransform:
- {fileID: 7641698276791844025}
- {fileID: 4796764881398963795}
- {fileID: 3652432503405785541}
- {fileID: 4356325546148524987}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 101, y: 0}
m_SizeDelta: {x: 700, y: 100}
m_AnchoredPosition: {x: 56, y: 0}
m_SizeDelta: {x: 740, y: 92}
m_Pivot: {x: 0, y: 0}
--- !u!222 &2838917684883612875
CanvasRenderer:
@ -539,7 +616,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8282166e6a040d1428cc9478f444a9cb, type: 3}
m_Sprite: {fileID: 21300000, guid: 994eed843ccd5f9489dd74cf3a071cdb, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -594,11 +671,11 @@ RectTransform:
m_Father: {fileID: 7641698276791844025}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
m_SizeDelta: {x: 32, y: 24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &799338202642619046
CanvasRenderer:
m_ObjectHideFlags: 0

303
Assets/SandBox/TestUIPanelScenes/UI_SessionPanel.unity
View File

@ -123,103 +123,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &50916076
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1563354055165581077, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2111864244296606961, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
propertyPath: m_Name
value: UI_SessionPanel
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6d37bf19b96c943489b7955d49b9f346, type: 3}
--- !u!1 &264435381
GameObject:
m_ObjectHideFlags: 0
@ -286,7 +189,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &751910591
GameObject:
@ -406,6 +309,210 @@ MonoBehaviour:
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
--- !u!1 &880400968
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 880400972}
- component: {fileID: 880400971}
- component: {fileID: 880400970}
- component: {fileID: 880400969}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &880400969
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 880400968}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 55
--- !u!114 &880400970
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 880400968}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!223 &880400971
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 880400968}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &880400972
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 880400968}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 979755048}
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1001 &979755047
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 880400972}
m_Modifications:
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_SizeDelta.x
value: 740
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_SizeDelta.y
value: 92
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_AnchoredPosition.x
value: 56
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8238609085220018438, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
propertyPath: m_Name
value: UI_SessionPanel
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
--- !u!224 &979755048 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4152386550255537530, guid: ca0f341d0b1b2cb479ab9f2ac2d115d3, type: 3}
m_PrefabInstance: {fileID: 979755047}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1743853459
GameObject:
m_ObjectHideFlags: 0

2
Assets/Scenes/05_office.unity.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Addressables.data.meta
guid: b75a4ca39c83fa54d97134e54d032309
guid: 3ec490466c014ec4895602dbf73ae7e5
========
guid: 825efef6ba8a5744aa342459759569a0
>>>>>>>> 8f2b841f2cdbb028247b83d3caed38a79a85739f:Assets/Scenes/05_office.unity.meta

6
Assets/Scripts/Project/Enum/Enums.cs
View File

@ -92,7 +92,7 @@ public enum E_ModeType
/// <summary>
/// 工具材料
/// </summary>
public enum E_ToolOrMaterial
public enum E_ToolOrDevice
{
/// <summary>
/// 空
@ -103,11 +103,11 @@ public enum E_ToolOrMaterial
/// 工具
/// </summary>
Tool,
/// <summary>
/// 材质
/// </summary>
Material,
Device,
}
/// <summary>

23
Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrMaterial.cs
View File

@ -1,23 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
/// <summary>
/// 工具或者材料基类
/// </summary>
public abstract class BaseToolOrMaterial : MonoBehaviour
{
/// <summary>
/// 工具Id
/// </summary>
public int toolId;
/// <summary>
/// 工器具类型 工具/材料
/// </summary>
public E_ToolOrMaterial toolOrMaterial;
}

11
Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrMaterial.cs.meta
View File

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

2
Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_Electroprobe.cs
View File

@ -4,7 +4,7 @@ using UnityEngine;
/// <summary>
/// ΅η±Κ
/// </summary>
public class Tool_Electroprobe : BaseToolOrMaterial
public class Tool_Electroprobe : BaseToolOrDevice
{
}

2
Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_InsulatedScrewdriver.cs
View File

@ -4,7 +4,7 @@ using UnityEngine;
/// <summary>
/// 绝缘螺丝刀
/// </summary>
public class Tool_InsulatedScrewdriver : BaseToolOrMaterial
public class Tool_InsulatedScrewdriver : BaseToolOrDevice
{
}

36
Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs
View File

@ -3,18 +3,19 @@ using UnityEngine;
using DG.Tweening;
using UnityEngine.UI;
using UnityEngine.SceneManagement;
using TMPro;
public class UI_MenuBar : BasePanel
{
[SerializeField]
private Sprite ClickSprite;
private Sprite ClickSprite, OnClickSprite;
//展开按钮，工具间，前往现场，办理工作票，任务单，返回办公室，拆装填写工单
private Button CloseDefaultBtn, TooLRoToolRoomBtnomBtn, SiteBtn, WorkOrderBtn, MissionBtn, OfficeBtn, DisassemblyAssemblyWorkOrderBtn;
//右侧弹窗
private Image MenuBarIamge;
//private Image MenuBarIamge;
public void Init()
{
MenuBarIamge = GetControl<Image>("MenuBar");
//MenuBarIamge = GetControl<Image>("MenuBar");
CloseDefaultBtn = GetControl<Button>("CloseDefaultBtn");
TooLRoToolRoomBtnomBtn = GetControl<Button>("TooLRoToolRoomBtnomBtn");
SiteBtn = GetControl<Button>("SiteBtn");
@ -22,6 +23,7 @@ public class UI_MenuBar : BasePanel
MissionBtn = GetControl<Button>("MissionBtn");
OfficeBtn = GetControl<Button>("OfficeBtn");
DisassemblyAssemblyWorkOrderBtn = GetControl<Button>("DisassemblyAssemblyWorkOrderBtn");
checkBtnBySceneName();
}
//public override void ShowMe()
//{
@ -41,31 +43,23 @@ public class UI_MenuBar : BasePanel
OfficeBtn.gameObject.SetActive(GlobalFlag.currentSceneName == "办公室" );
DisassemblyAssemblyWorkOrderBtn.gameObject.SetActive(GlobalFlag.currentSceneName == "办公室" );
}
private void OnMouseDown()
{
if (GetControl<Image>("UI_MenuBar").rectTransform.localPosition.x == 960)
{
GetControl<Image>("CloseDefaultBtn").sprite = OnClickSprite;
}
}
protected override void OnClick(string btnName)
{
switch (btnName)
{
case "CloseDefaultBtn":
//gameObject.transform.Find("CloseDefaultBtn").GetComponent<Image>().sprite = ClickSprite;
MenuBarIamge.rectTransform.DOLocalMoveX(960, 0.5f);
if (MenuBarIamge.rectTransform.localPosition.x == 960)
GetControl<Image>("UI_MenuBar").rectTransform.DOLocalMoveX(960, 0.5f);
if (GetControl<Image>("UI_MenuBar").rectTransform.localPosition.x == 960)
{
MenuBarIamge.rectTransform.DOLocalMoveX(1070, 0.5f);
//gameObject.transform.Find("CloseDefaultBtn").GetComponent<Image>().sprite = ClickSprite;
GetControl<Image>("UI_MenuBar").rectTransform.DOLocalMoveX(1070, 0.5f);
}
//switch (GlobalFlag.currentSceneName)
//{
// case "Office":
// break;
// case "TooLRoom":
// break;
// case "Site":
// break;
//}
break;
case "ToolRoomBtn":

27
Assets/Scripts/Project/UI/UI_Panel/UI_SessionPanel.cs
View File

@ -4,25 +4,26 @@ using UnityEngine.UI;
public class UI_SessionPanel : BasePanel
{
private Button ContinueBtn;
private TextMeshPro Text_DialogBoxTMP;
private void Start()
{
Debug.Log("1111111");
}
/// <summary>
/// 初始化
/// </summary>
public void Init()
public void Init(string content)
{
ContinueBtn = GetControl<Button>("ContinueBtn");
Text_DialogBoxTMP = GetControl<TextMeshPro>("Text_DialogBox");
GetControl<TextMeshProUGUI>("Text_DialogBox").text = content;//在开始时给content赋值
}
public override void ShowMe()
{
//public override void ShowMe()
//{
}
//}
public override void HideMe()
{
//public override void HideMe()
//{
}
//}
/// <summary>
/// 按钮点击
/// </summary>
@ -32,7 +33,9 @@ public class UI_SessionPanel : BasePanel
switch (btnName)
{
case "ContinueBtn":
GetControl<TextMeshPro>("Text_DialogBox").text = "你好，我是xx供电公司员工，这是我的工作证。现在我们要对贵户高压电能计量装置进行安装";
Debug.Log("点击继续按钮");
GetControl<TextMeshProUGUI>("Text_DialogBox").text = "你好，我是xx供电公司员工，这是我的工作证。现在我们要对贵户高压电能计量装置进行安装";
this.gameObject.SetActive(false);
break;
}
}