UVCXR/ChunilENG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '천일 수정 사항 적용' (#143) from dev/jym/251121_00 into main

Browse Source 
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/143
This commit was merged in pull request #143.
This commit is contained in:
jym
2025-11-21 13:09:33 +09:00
parent 10c781cffb 3cf54b5064
commit 1020e49781
62 changed files with 19280 additions and 29797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

349
Assets/Font/Pretendard-SemiBold SDF.asset
View File

File diff suppressed because one or more lines are too long

41
Assets/Font/PretendardVariable SDF.asset
View File

File diff suppressed because one or more lines are too long

4
Assets/Images/UI/MiniMap/IMG_MiniMap_bg.png.meta
View File

@@ -49,7 +49,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 30, y: 30, z: 30, w: 30}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@@ -101,7 +101,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []

4
Assets/Images/UI/Setting/IMG_Background.png.meta
View File

@@ -49,7 +49,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 40, y: 40, z: 40, w: 40}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@@ -101,7 +101,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []

4
Assets/Images/UI/ThermostatControl/IMG_CancelButton.png.meta
View File

@@ -49,7 +49,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 10, y: 10, z: 10, w: 10}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@@ -101,7 +101,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []

4
Assets/Images/UI/ToolBar/IMG_Background.png.meta
View File

@@ -49,7 +49,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 30, y: 85, z: 30, w: 20}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@@ -101,7 +101,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []

BIN
Assets/Images/UI/TopToolBar/g3iukkmho5lsc3nml7ob0dl3ud.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 134 KiB

117
Assets/Images/UI/TopToolBar/g3iukkmho5lsc3nml7ob0dl3ud.png.meta Normal file
View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 00872aa6ea716a6439ea1686dcedf6d1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Images/UI/icons8-편집-64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 833 B

117
Assets/Images/UI/icons8-편집-64.png.meta Normal file
View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 5370ca805ab70c94f915dcf0546f85ea
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

9671
Assets/Prefabs/Machines/GF9 SCOOP/GF9 SCOOP.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

2
Assets/Prefabs/Machines/GF9 SCOOP/PRF_GF9 SCOOP.prefab.meta → Assets/Prefabs/Machines/GF9 SCOOP/GF9 SCOOP.prefab.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e24bc79083f91fe48babea2c87de9b8d
guid: 87084a5face76f84fad9a012adaf1535
PrefabImporter:
externalObjects: {}
userData:

5550
Assets/Prefabs/Machines/GF9 SCOOP/PRF_GF9 SCOOP.prefab
View File

File diff suppressed because it is too large Load Diff

399
Assets/Resources/Prefabs/UI/PRF_UI_LibraryButton.prefab
View File

@@ -1,5 +1,126 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2072739577007492197
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8775933045553652269}
- component: {fileID: 3052006851234498245}
- component: {fileID: 3566960418664261773}
- component: {fileID: 6321689766975947077}
m_Layer: 5
m_Name: Button_Correction
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8775933045553652269
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2072739577007492197}
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:
- {fileID: 2244003139772903103}
m_Father: {fileID: 738589423136574948}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -39.5, y: -14.5}
m_SizeDelta: {x: 25, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3052006851234498245
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2072739577007492197}
m_CullTransparentMesh: 1
--- !u!114 &3566960418664261773
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2072739577007492197}
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: 0, g: 0, b: 0, a: 0.9019608}
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
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!114 &6321689766975947077
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2072739577007492197}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3566960418664261773}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &3355640104762963333
GameObject:
m_ObjectHideFlags: 0
@@ -35,6 +156,8 @@ RectTransform:
- {fileID: 3096273295327439277}
- {fileID: 6287083589834249665}
- {fileID: 670389445800135872}
- {fileID: 6466729476160640775}
- {fileID: 8775933045553652269}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -138,6 +261,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
machine: {fileID: 0}
PreviewImage: {fileID: 0}
Button_DeleteRegistration: {fileID: 0}
Button_Correction: {fileID: 0}
--- !u!1 &3462095727660781012
GameObject:
m_ObjectHideFlags: 0
@@ -213,6 +338,127 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5526336742776380529
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6466729476160640775}
- component: {fileID: 145131986625661792}
- component: {fileID: 8523993827596213400}
- component: {fileID: 9188963672337694941}
m_Layer: 5
m_Name: Button_DeleteRegistration
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6466729476160640775
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526336742776380529}
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:
- {fileID: 4603613147068649549}
m_Father: {fileID: 738589423136574948}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -14.5, y: -14.5}
m_SizeDelta: {x: 25, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &145131986625661792
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526336742776380529}
m_CullTransparentMesh: 1
--- !u!114 &8523993827596213400
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526336742776380529}
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: 0, g: 0, b: 0, a: 0.9019608}
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
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!114 &9188963672337694941
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526336742776380529}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 8523993827596213400}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &5883991012006492551
GameObject:
m_ObjectHideFlags: 0
@@ -288,6 +534,81 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &6808567384822722676
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2244003139772903103}
- component: {fileID: 6691314105522647493}
- component: {fileID: 3009042551293850704}
m_Layer: 5
m_Name: Icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2244003139772903103
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6808567384822722676}
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: 8775933045553652269}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -5, y: -5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6691314105522647493
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6808567384822722676}
m_CullTransparentMesh: 1
--- !u!114 &3009042551293850704
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6808567384822722676}
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: 5370ca805ab70c94f915dcf0546f85ea, 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 &6972789786170850959
GameObject:
m_ObjectHideFlags: 0
@@ -356,8 +677,7 @@ MonoBehaviour:
m_text: Machine Name
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9a2c7e704ad3e62438526dc8aecaeb56, type: 2}
m_sharedMaterial: {fileID: 682561501981441939, guid: 9a2c7e704ad3e62438526dc8aecaeb56,
type: 2}
m_sharedMaterial: {fileID: 682561501981441939, guid: 9a2c7e704ad3e62438526dc8aecaeb56, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@@ -425,3 +745,78 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &8878564736966927924
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4603613147068649549}
- component: {fileID: 7412591696140128950}
- component: {fileID: 7221898228940908767}
m_Layer: 5
m_Name: Icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4603613147068649549
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8878564736966927924}
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: 6466729476160640775}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -5, y: -5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7412591696140128950
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8878564736966927924}
m_CullTransparentMesh: 1
--- !u!114 &7221898228940908767
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8878564736966927924}
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: 8755fc7dc9343b94ebf20703d68fb843, 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

2
Assets/Resources/Prefabs/UI/PRF_UI_MachineKPI.prefab
View File

@@ -1688,6 +1688,7 @@ MonoBehaviour:
moldseq:
Default_KPI: {fileID: 0}
isExpand: 0
isInteractable: 1
--- !u!1 &4569137629306615260
GameObject:
m_ObjectHideFlags: 0
@@ -2438,6 +2439,7 @@ MonoBehaviour:
moldseq:
Default_KPI: {fileID: 0}
isExpand: 0
isInteractable: 0
--- !u!1 &5511446128656263399
GameObject:
m_ObjectHideFlags: 0

13722
Assets/Scenes/Main.unity
View File

File diff suppressed because it is too large Load Diff

40
Assets/Scripts/Building.cs
View File

@@ -47,11 +47,6 @@ namespace CHN
}
}
public void UnderCeilingControl(Vector3 value)
{
currentFloor.UnderCeilingControl(value);
}
public void SetTopFloor(int index)
{
for (int i = 0; i < floors.Count; ++i)
@@ -91,6 +86,41 @@ namespace CHN
currentFloor.TopSurfaces.SetActive(true);
}
public void ActiveBuliding()
{
foreach(var floor in floors)
{
floor.ActiveFloor();
}
}
public void DeactiveBuliding()
{
foreach (var floor in floors)
{
floor.DeactiveFloor();
}
}
public void SetActiveWalls(bool isOn)
{
foreach (var floor in floors)
{
floor.SetActiveWall(isOn);
}
}
public void SetActiveGrounds(bool isOn)
{
foreach (var floor in floors)
{
floor.SetActiveGround(isOn);
}
}
public void SetActiveDecos(bool isOn)
{
foreach (var floor in floors)
{
floor.SetActiveDeco(isOn);
}
}
}
}

48
Assets/Scripts/CHNRaycaster.cs
View File

@@ -17,7 +17,7 @@ namespace CHN
RaycastHit hit;
public event Action<Machine> onLeftClickMachine;
public event Action onClickThermostat;
public event Action onLeftClickArea;
public LayerMask floorLayers;
public int hitFloorIndex;
@@ -34,7 +34,7 @@ namespace CHN
private void Update()
{
//RaycastOnClickThermostat();
RaycastOnClickArea();
RaycastOnClickMachine();
}
@@ -78,36 +78,28 @@ namespace CHN
}
}
//private void RaycastOnClickThermostat()
//{
// bool leftClick = Input.GetMouseButtonDown(0);
private void RaycastOnClickArea()
{
bool leftClick = Input.GetMouseButtonDown(0);
// if (!leftClick)
// {
// return;
// }
if (controller.IsClickUI)
{
return;
}
// if (controller.IsClickUI)
// {
// return;
// }
LayerMask exceptionLayer = LayerMask.GetMask("Machine");
LayerMask layerMask = floorLayers & ~exceptionLayer;
// var layerMask = LayerMask.GetMask("Thermostat");
// var ray = controller.camera.ScreenPointToRay(Input.mousePosition);
// hitInfo = Physics.RaycastAll(ray, Mathf.Infinity, layerMask);
var ray = controller.camera.ScreenPointToRay(Input.mousePosition);
hitInfo = Physics.RaycastAll(ray, Mathf.Infinity, layerMask);
// if (hitInfo.Length == 0)
// return;
if (hitInfo.Length == 0)
return;
// Array.Sort(hitInfo, (hit1, hit2) => hit1.distance.CompareTo(hit2.distance));
// var hitColider = hitInfo[0].collider;
// var board = hitColider.GetComponent<Thermostat>();
// if (leftClick)
// {
// onClickThermostat?.Invoke();
// }
//}
if (leftClick)
{
onLeftClickArea?.Invoke();
}
}
}
}

17
Assets/Scripts/EventConnecter.cs
View File

@@ -42,6 +42,7 @@ namespace CHN
topCanvas.panel_toolbar.onClickMiniMap += popupCanvas.panel_minimap.SetActive;
topCanvas.panel_toolbar.onClickFloorControl += popupCanvas.panel_floorcontrol.SetActive;
topCanvas.panel_toolbar.onAlarm += popupCanvas.panel_toolbaralarm.ActiveAlarm;
topCanvas.panel_toolbar.onClickDeleteRegistration += popupCanvas.panel_buildingdeleteregistration.SetActive;
topCanvas.panel_toptoolbar.GetFloor = building.GetFloor;
topCanvas.panel_toptoolbar.onClickAlarms += popupCanvas.panel_completealramhistory.Open;
@@ -59,12 +60,19 @@ namespace CHN
popupCanvas.panel_floorcontrol.onValueChanged += building.SetTopFloor;
popupCanvas.panel_floorcontrol.onValueChanged += popupCanvas.panel_minimap.ChangeMiniMapFloor;
popupCanvas.panel_buildingdeleteregistration.onClickCorrectionButton += popupCanvas.panel_buildingcorrection.Open;
popupCanvas.panel_thermostatcontrol.onSetThermostat += datamanager.SetSelectedThermostatData;
popupCanvas.panel_thermostatcontrol.onClickControlButton += mqttManager.OnPublisherData;
popupCanvas.panel_library.onClickLabelButton += libraryManager.LibraryFiltering;
popupCanvas.panel_protocolsetting.onUpdateMachine += libraryManager.MatchingMachine;
popupCanvas.panel_library.onClickLibraryButton += popupCanvas.MachineDashBoardOpen;
popupCanvas.panel_library.onClickLibraryButton += highLightManager.ClickMachinToHighlight;
popupCanvas.panel_library.onClickLibraryButton += highLightManager.SetTargetPosToMachine;
popupCanvas.panel_library.onClickLibraryButton += popupCanvas.panel_productionstatus.SetProductionStatus;
popupCanvas.panel_library.onClickDeleteRegistration += popupCanvas.panel_machinedeleteregistration.SetData;
popupCanvas.panel_library.onClickCorrection += popupCanvas.panel_machinecorrection.SetData;
popupCanvas.simpleView += datamanager.SimpleFiledChange;
popupCanvas.onClickSimple += datamanager.GetSimpleCompleteData;
@@ -78,7 +86,7 @@ namespace CHN
popupCanvas.panel_completealramhistory.onClickAlram += completeTimeManager.MachineCorrespondingToAlarm;
//popupCanvas.panel_completealramhistory.onCheckAlarmData += completeTimeManager.CheckCompleteTimeAlarm;
popupCanvas.panel_completealramhistory.onCheckAlarm += topCanvas.panel_toptoolbar.SetAlarmCount;
//popupCanvas.panel_completealramhistory.onCheckAlarm += topCanvas.panel_toptoolbar.SetAlarmCount;
popupCanvas.panel_completealramhistory.onOpen += popupCanvas.CurrentDashoboardClose;
popupCanvas.panel_workconditionanalysis.onDateData += httpManager.GetConditionWorkOrderCodeData;
@@ -126,6 +134,8 @@ namespace CHN
datamanager.onCompleteInfo += popupCanvas.DetailView;
datamanager.onKPIInfo += machineKPIManager.SetMachineKPI;
datamanager.onKPIInfo += popupCanvas.panel_totalproduction.SetMachineEffectiveness;
datamanager.onSetThermostatData += popupCanvas.panel_thermostatcontrol.SetData;
mqttManager.onNotloadData += popupCanvas.panel_completealramhistory.ActiveLoadingImage;
mqttManager.onNotloadData += popupCanvas.panel_injectionproduction.ActiveLoadingImage;
mqttManager.onNotloadData += popupCanvas.panel_assemblyproduction.ActiveLoadingImage;
@@ -136,6 +146,7 @@ namespace CHN
mqttManager.onMachineData += productionStatusManager.SetFloorProductionStatus;
mqttManager.onWorkshopData += productionStatusManager.SetWorkProgressStatus;
mqttManager.onWorkshopData += popupCanvas.panel_totalproduction.SetWorkProgressStatus;
mqttManager.onThermostatData += datamanager.SetThermostatDataList;
completeTimeManager.onActiveHighLighter += popupCanvas.MachineDashBoardOpen;
completeTimeManager.onActiveHighLighter += highLightManager.ClickMachinToHighlight;
@@ -162,12 +173,14 @@ namespace CHN
workTimeManager.onSendChartData += popupCanvas.panel_worktimeanalysis.SetWorkTimeData;
thermostatIconManager.onClickThermostatIcon += popupCanvas.panel_thermostatcontrol.SetData;
thermostatIconManager.onClickThermostatIcon += popupCanvas.panel_thermostatcontrol.SettingThermostatData;
raycaster.onLeftClickMachine += popupCanvas.MachineDashBoardOpen;
raycaster.onLeftClickMachine += highLightManager.ClickMachinToHighlight;
raycaster.onLeftClickMachine += popupCanvas.panel_productionstatus.SetProductionStatus;
raycaster.onLeftClickArea += highLightManager.ClickArea;
optionManager.onCompletedLoadOption += popupCanvas.panel_controlsetting.InitOptionSetting;
optionManager.onCompletedLoadOption += popupCanvas.panel_protocolsetting.InitOptionSetting;
optionManager.LoadOption();

60
Assets/Scripts/Floor.cs
View File

@@ -13,12 +13,13 @@ namespace CHN
public bool isEmptyFloor;
public Transform StartPoint;
public GameObject Outer;
public GameObject Walls;
public GameObject Grounds;
public GameObject Decos;
public GameObject TopSurfaces;
public GameObject FloorGroundCollider;
public GameObject Ceiling;
public GameObject VisualizationAreas;
Transform CeilingQuad;
public float ceilingActiveRange = 0;
@@ -28,8 +29,15 @@ namespace CHN
{
switch(transform.GetChild(i).name)
{
case nameof(Outer):
Outer = transform.GetChild(i).gameObject;
case nameof(Walls):
Walls = transform.GetChild(i).gameObject;
TopSurfaces = Walls.transform.GetChild(4).gameObject;
break;
case nameof(Grounds):
Grounds = transform.GetChild(i).gameObject;
break;
case nameof(Decos):
Decos = transform.GetChild(i).gameObject;
break;
case nameof(FloorGroundCollider):
FloorGroundCollider = transform.GetChild(i).gameObject;
@@ -37,12 +45,6 @@ namespace CHN
case nameof(Ceiling):
Ceiling = transform.GetChild(i).gameObject;
break;
case nameof(VisualizationAreas):
VisualizationAreas = transform.GetChild(i).gameObject;
break;
case nameof(TopSurfaces):
TopSurfaces = transform.GetChild(i).gameObject;
break;
}
}
}
@@ -73,16 +75,38 @@ namespace CHN
Ceiling.SetActive(false);
}
public void UnderCeilingControl(Vector3 pos)
public void ActiveFloor()
{
//if (Ceiling == null)
// return;
SetActiveWall(true);
SetActiveGround(true);
SetActiveDeco(true);
}
public void DeactiveFloor()
{
SetActiveWall(false);
SetActiveGround(false);
SetActiveDeco(false);
}
public void SetActiveWall(bool isOn)
{
if (Walls == null)
return;
//float height = Ceiling.transform.position.y - ceilingActiveRange;
Walls.SetActive(isOn);
}
public void SetActiveGround(bool isOn)
{
if (Grounds == null)
return;
//bool isUnder = pos.y < height;
//Debug.Log(isUnder);
//Ceiling.SetActive(isUnder);
Grounds.SetActive(isOn);
}
public void SetActiveDeco(bool isOn)
{
if (Decos == null)
return;
Decos.SetActive(isOn);
}
}
}

79
Assets/Scripts/MQTT.cs
View File

@@ -8,6 +8,7 @@ using System.Text;
using Newtonsoft.Json;
using UnityEngine;
using WI;
using System.Text.RegularExpressions;
public class MQTT : Protocol, ISingle, IOptionable
{
@@ -20,7 +21,9 @@ public class MQTT : Protocol, ISingle, IOptionable
[OptionKey]
string port="8901";
[OptionKey]
string topics= "MES/PDV/BOARD1,MES/PDV/BOARD2,MES/PDV/BOARD3";
string topics= "MES/PDV/BOARD1,MES/PDV/BOARD2,MES/PDV/BOARD3,DVI/HOT/+";
static readonly Regex ijRegex = new Regex(@"^IJ(\d{2})$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
private int portData;
private string[] subscriptionTopics;
@@ -28,6 +31,7 @@ public class MQTT : Protocol, ISingle, IOptionable
public event Action<List<CompleteInfo>> onMachineData;
public event Action<List<WorkShopInfo>> onWorkshopData;
public event Action<List<AlarmInfo>> onAlarmData;
public event Action<List<ThermostatData>> onThermostatData;
public void Awake()
{
onNotloadData?.Invoke(true);
@@ -46,6 +50,7 @@ public class MQTT : Protocol, ISingle, IOptionable
SubscriptionTopic(subscriptionTopics[0], onWorkshopData);
SubscriptionTopic(subscriptionTopics[1], onMachineData);
SubscriptionTopic(subscriptionTopics[2], onAlarmData);
SubscriptionTopic(subscriptionTopics[3], onThermostatData);
//SubscriptionTopic(subscriptionTopics[0], (data) => { });
Connect(host, portData.ToString(), topics);
}
@@ -93,14 +98,14 @@ public class MQTT : Protocol, ISingle, IOptionable
client.BeginConnect(ConnectPacketBuilderCallback);
}
public void OnPublisherData()
public void OnPublisherData(string workcd, string inputValue)
{
var data = new MqttData()
{
ifstatus = "N",
inputdt = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
workcd = "IJ01",
temp_value = 660
workcd = workcd,
temp_value = inputValue
};
string json = JsonConvert.SerializeObject(data);
@@ -122,6 +127,7 @@ public class MQTT : Protocol, ISingle, IOptionable
client.CreateSubscriptionBuilder(subscriptionTopics[i])
.WithMessageCallback(OnMessage)
.WithRetainAsPublished()
.WithAcknowledgementCallback(OnSubscriptionAcknowledged)
.WithMaximumQoS(QoSLevels.ExactlyOnceDelivery)
.BeginSubscribe();
@@ -144,7 +150,7 @@ public class MQTT : Protocol, ISingle, IOptionable
public string ifstatus;
public string inputdt;
public string workcd;
public int temp_value;
public string temp_value;
}
[Serializable]
@@ -207,15 +213,42 @@ public class MQTT : Protocol, ISingle, IOptionable
public string 호출상태명;
public string 호출일;
}
[Serializable]
public class ThermostatData
{
public string workcd;
public ThermostatInfo thermostatInfo;
}
[Serializable]
public class ThermostatInfo
{
public string C001;
public string C002;
public string C003;
public string C004;
public string C005;
public string C006;
public string C007;
public string C008;
public string C009;
public string C010;
public string C011;
public string C012;
public string C013;
public string C014;
public string C015;
public string C000;
}
public List<CompleteInfo> infos = new List<CompleteInfo>();
public List<WorkShopInfo> workShopInfo = new List<WorkShopInfo>();
public List<AlarmInfo> alarmInfo = new List<AlarmInfo>();
public Dictionary<string, ThermostatData> thermostatInfo = new();
public List<string> workerIds = new List<string>();
Dictionary<string, Action<List<CompleteInfo>>> topicSubscriptionTable = new();
Dictionary<string, Action<List<WorkShopInfo>>> workShopTopicTable = new();
Dictionary<string, Action<List<AlarmInfo>>> alarmTopicTable = new();
Dictionary<string, Action<List<ThermostatData>>> thermostatTopicTable = new();
private void OnMessage(MQTTClient client, SubscriptionTopic topic, string topicName, ApplicationMessage message)
{
// Convert the raw payload to a string
@@ -240,6 +273,34 @@ public class MQTT : Protocol, ISingle, IOptionable
alarmInfo = data;
alarmTopicTable[topicName]?.Invoke(alarmInfo);
}
else if (topicName != null && topicName.StartsWith("DVI/HOT/", StringComparison.OrdinalIgnoreCase))
{
var parts = topicName.Split('/');
if (parts.Length >= 3)
{
string last = parts[2]; // 예: "IJ06"
var m = ijRegex.Match(last);
if (m.Success)
{
int num;
if (int.TryParse(m.Groups[1].Value, out num))
{
if (num >= 1 && num <= 25)
{
var json = JsonConvert.DeserializeObject<ThermostatInfo>(payload);
var data = new ThermostatData
{
workcd = last,
thermostatInfo = json
};
thermostatInfo[topicName] = data;
}
}
}
}
var sendData = new List<ThermostatData>(thermostatInfo.Values);
thermostatTopicTable[subscriptionTopics[3]]?.Invoke(sendData);
}
}
StringBuilder sb = new StringBuilder();
void Print(List<string> target)
@@ -270,6 +331,12 @@ public class MQTT : Protocol, ISingle, IOptionable
alarmTopicTable.Add(topic, null);
alarmTopicTable[topic] += callback;
}
public void SubscriptionTopic(string topic, Action<List<ThermostatData>> callback)
{
if (!thermostatTopicTable.ContainsKey(topic))
thermostatTopicTable.Add(topic, null);
thermostatTopicTable[topic] += callback;
}
private void OnSubscriptionAcknowledged(MQTTClient client, SubscriptionTopic topic, SubscribeAckReasonCodes reasonCode)
{

2
Assets/Scripts/Machine.cs
View File

@@ -17,6 +17,7 @@ namespace CHN
public UI_MachineKPI machineKPI;
public Sprite previewImage;
public Vector3 centerPos;
public Vector3 originScale;
public Animator[] animators;
@@ -36,6 +37,7 @@ namespace CHN
animators = GetComponentsInChildren<Animator>();
highLighter = GetComponentInChildren<HighLighter>(true);
originScale = gameObject.transform.localScale;
}
public void SetAnimationSpeed()

4
Assets/Scripts/UI/Canvas_Popup.cs
View File

@@ -35,6 +35,10 @@ namespace CHN
public Panel_FloorControl panel_floorcontrol;
public Panel_ProductionStatus panel_productionstatus;
public Panel_MachineData panel_machinedata;
public Panel_MachineDeleteRegistration panel_machinedeleteregistration;
public Panel_MachineCorrection panel_machinecorrection;
public Panel_BuildingDeleteRegistration panel_buildingdeleteregistration;
public Panel_BuildingCorrection panel_buildingcorrection;
//public Panel_MachineDashBoard panel_machinedashboard;
public RectTransform dashboardPoint;

26
Assets/Scripts/UI/CustomTMPDropdown.cs
View File

@@ -9,18 +9,10 @@ using UnityEngine.UI;
public class CustomTMPDropdown : TMP_Dropdown
{
public string hideItemName;
public HashSet<string> deinteractableItems = new HashSet<string>();
public void SetHideAndDeinteractableItems(string hideItemName, HashSet<string> items)
public void SetHideAndDeinteractableItems(string hideItemName)
{
this.hideItemName = hideItemName;
deinteractableItems.Clear();
foreach(var item in items)
{
deinteractableItems.Add(item);
}
}
public override void OnPointerClick(UnityEngine.EventSystems.PointerEventData eventData)
{
@@ -43,21 +35,5 @@ public class CustomTMPDropdown : TMP_Dropdown
var hideItem = items.Find(item => item.name.Contains(hideItemName));
hideItem.gameObject.SetActive(false);
}
var deinteractableSet = new HashSet<string>(deinteractableItems);
foreach (var item in items)
{
string itemText = item.text.text.Trim();
if (deinteractableSet.Contains(itemText))
{
if (item.toggle != null)
{
item.toggle.interactable = false;
item.text.color = Color.gray;
}
}
}
}
}

12
Assets/Scripts/UI/Panel_CompleteAlramHistory.cs
View File

@@ -20,7 +20,7 @@ namespace CHN
public List<UI_CompleteTimeAlarmInfo> notCheckAlramList = new();
public Action<string> onClickAlram;
public Action<int> onCheckAlarm;
//public Action<int> onCheckAlarm;
//public Action<CompleteInfo, bool> onCheckAlarmData;
public Action onOpen;
@@ -72,7 +72,7 @@ namespace CHN
}
}
BlinkAlarmItems();
//BlinkAlarmItems();
}
private List<CompleteInfo> SetSortInfoData(List<CompleteInfo> infos)
{
@@ -94,10 +94,10 @@ namespace CHN
return sortedInfos;
}
private void BlinkAlarmItems()
{
onCheckAlarm?.Invoke(notCheckAlramList.Count);
}
//private void BlinkAlarmItems()
//{
// onCheckAlarm?.Invoke(notCheckAlramList.Count);
//}
private void CheckAlram(UI_CompleteTimeAlarmInfo completeTimeAlarmInfo)
{
onClickAlram?.Invoke(completeTimeAlarmInfo.completeInfo.workcd);

12
Assets/Scripts/UI/Panel_Library.cs
View File

@@ -30,6 +30,8 @@ namespace CHN
public Action<string> onClickLabelButton;
public Action<Machine> onClickLibraryButton;
public Action<Machine> onClickDeleteRegistration;
public Action<Machine> onClickCorrection;
public Vector2 originPos;
@@ -130,6 +132,8 @@ namespace CHN
var machineButton = Instantiate(prf_LibraryButton, ScrollView_MachineList.content);
machineButton.SettingButton(machine);
machineButton.onClickButton += OnClickLibraryButton;
machineButton.onClickDeleteRegistration += OnClickDeleteRegistrationButton;
machineButton.onClickCorrection += OnClickCorrectionButton;
}
}
public List<Machine> SortListByWorkcd(HashSet<Machine> machines)
@@ -150,6 +154,14 @@ namespace CHN
{
onClickLibraryButton?.Invoke(machineButton.machine);
}
private void OnClickDeleteRegistrationButton(UI_LibraryButton machineButton)
{
onClickDeleteRegistration?.Invoke(machineButton.machine);
}
private void OnClickCorrectionButton(UI_LibraryButton machineButton)
{
onClickCorrection?.Invoke(machineButton.machine);
}
IEnumerator MoveAnimation(Vector2 targetPos)
{

10
Assets/Scripts/UI/Panel_TopToolBar.cs
View File

@@ -140,11 +140,11 @@ namespace CHN
onClickExit?.Invoke();
}
public void SetAlarmCount(int count)
{
var text = Button_Alrams.GetComponentInChildren<TMP_Text>();
text.SetText(count.ToString());
}
//public void SetAlarmCount(int count)
//{
// var text = Button_Alrams.GetComponentInChildren<TMP_Text>();
// text.SetText(count.ToString());
//}
//private void OnClickCompleteTimeAlarm()
//{

28
Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs
View File

@@ -11,6 +11,13 @@ using System.Linq;
namespace CHN
{
[Serializable]
public class GraphChartColor
{
public string graphName;
public Material fillMaterial;
public Material lineMaterial;
}
public class PreviousWorkConditionData
{
public string startDate;
@@ -31,6 +38,7 @@ namespace CHN
public class Panel_WorkConditionAnalysis : PanelBase, ISingle
{
public Dictionary<string, PreviousWorkConditionData> workConditionDatas = new Dictionary<string, PreviousWorkConditionData>();
public List<GraphChartColor> graphChartColors = new();
private Button Button_StartDay;
private Button Button_EndDay;
@@ -179,19 +187,17 @@ namespace CHN
Dropdown_WorkOrderNumber.ClearOptions();
List<string> data = new List<string>();
HashSet<string> deintercatableWorkno = new HashSet<string>();
//HashSet<string> deintercatableWorkno = new HashSet<string>();
foreach (var workOrderNumber in this.itemCodeData.data)
{
data.Add(workOrderNumber.wordno);
if (!workOrderNumber.isActive)
if (workOrderNumber.isActive)
{
deintercatableWorkno.Add(workOrderNumber.wordno);
data.Add(workOrderNumber.wordno);
}
}
data.Add("-- 작업 지시 번호를 선택하세요 --");
Dropdown_WorkOrderNumber.SetHideAndDeinteractableItems(data[data.Count - 1], deintercatableWorkno);
Dropdown_WorkOrderNumber.SetHideAndDeinteractableItems(data[data.Count - 1]);
List<TMP_Dropdown.OptionData> optionList = new List<TMP_Dropdown.OptionData>();
foreach (string str in data)
@@ -258,7 +264,10 @@ namespace CHN
var value = Dropdown_DataColumn.value;
var optionName = Dropdown_DataColumn.options[value].text;
this.mainChart.SetChartData(optionName, mainChart[optionName]);
var lineColor = graphChartColors.Find(x => x.graphName == optionName).lineMaterial;
var fillColor = graphChartColors.Find(x => x.graphName == optionName).fillMaterial;
this.mainChart.SetChartData(optionName, mainChart[optionName], lineColor, fillColor);
}
public void SetSubChartDatas(Dictionary<string, GraphChartData> subCharts)
{
@@ -277,7 +286,10 @@ namespace CHN
for (int i = 0; i < subCharts.Count; i++)
{
this.subCharts[i].SetChartData(subChartNames[i], subCharts[subChartNames[i]]);
var lineColor = graphChartColors.Find(x => x.graphName == subChartNames[i]).lineMaterial;
var fillColor = graphChartColors.Find(x => x.graphName == subChartNames[i]).fillMaterial;
this.subCharts[i].SetChartData(subChartNames[i], subCharts[subChartNames[i]], lineColor, fillColor);
this.subCharts[i].onClickChart += OnClickChart;
}
}

10
Assets/Scripts/UI/Panel_WorkTimeAnalysis.cs
View File

@@ -167,19 +167,17 @@ namespace CHN
Dropdown_WorkOrderNumber.ClearOptions();
List<string> data = new List<string>();
HashSet<string> deintercatableWorkno = new HashSet<string>();
//HashSet<string> deintercatableWorkno = new HashSet<string>();
foreach (var workOrderNumber in this.itemCodeData.data)
{
data.Add(workOrderNumber.wordno);
if (!workOrderNumber.isActive)
if (workOrderNumber.isActive)
{
deintercatableWorkno.Add(workOrderNumber.wordno);
data.Add(workOrderNumber.wordno);
}
}
data.Add("-- 작업 지시 번호를 선택하세요 --");
Dropdown_WorkOrderNumber.SetHideAndDeinteractableItems(data[data.Count - 1], deintercatableWorkno);
Dropdown_WorkOrderNumber.SetHideAndDeinteractableItems(data[data.Count - 1]);
List<TMP_Dropdown.OptionData> optionList = new List<TMP_Dropdown.OptionData>();
foreach (string str in data)

18
Assets/Scripts/UI/UI_LibraryButton.cs
View File

@@ -10,8 +10,14 @@ using WI;
public class UI_LibraryButton : UIBase
{
public Machine machine;
public event Action<UI_LibraryButton> onClickButton;
public Image PreviewImage;
public Button Button_DeleteRegistration;
public Button Button_Correction;
public event Action<UI_LibraryButton> onClickButton;
public Action<UI_LibraryButton> onClickDeleteRegistration;
public Action<UI_LibraryButton> onClickCorrection;
public void SettingButton(Machine machine)
{
@@ -23,9 +29,19 @@ public class UI_LibraryButton : UIBase
button.onClick.AddListener(OnButtonClick);
PreviewImage.sprite = machine.previewImage;
Button_DeleteRegistration.onClick.AddListener(OnClickDeleteRegistrationButton);
Button_Correction.onClick.AddListener(OnClickCorrectionButton);
}
private void OnButtonClick()
{
onClickButton?.Invoke(this);
}
private void OnClickDeleteRegistrationButton()
{
onClickDeleteRegistration?.Invoke(this);
}
private void OnClickCorrectionButton()
{
onClickCorrection?.Invoke(this);
}
}

48
Assets/UniversalRenderPipelineGlobalSettings.asset
View File

@@ -33,28 +33,28 @@ MonoBehaviour:
m_Settings:
m_SettingsList:
m_List:
- rid: 5637594796066865152
- rid: 5637594796066865153
- rid: 3815703627022467148
- rid: 3815703627022467149
- rid: 8001919616418054146
- rid: 5637594796066865154
- rid: 3815703627022467150
- rid: 8001919616418054148
- rid: 5637594796066865155
- rid: 3815703627022467151
- rid: 8001919616418054150
- rid: 8001919616418054151
- rid: 8001919616418054152
- rid: 8001919616418054153
- rid: 5637594796066865156
- rid: 3815703627022467152
- rid: 8001919616418054155
- rid: 5637594796066865157
- rid: 3815703627022467153
- rid: 8001919616418054157
- rid: 5637594796066865158
- rid: 5637594796066865159
- rid: 5637594796066865160
- rid: 3815703627022467154
- rid: 3815703627022467155
- rid: 3815703627022467156
- rid: 8001919616418054161
- rid: 5637594796066865161
- rid: 5637594796066865162
- rid: 3815703627022467157
- rid: 3815703627022467158
- rid: 8001919616418054164
- rid: 5637594796066865163
- rid: 3815703627022467159
m_RuntimeSettings:
m_List:
- rid: 8001919616418054146
@@ -90,7 +90,7 @@ MonoBehaviour:
references:
version: 2
RefIds:
- rid: 5637594796066865152
- rid: 3815703627022467148
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
@@ -99,7 +99,7 @@ MonoBehaviour:
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- rid: 5637594796066865153
- rid: 3815703627022467149
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
@@ -111,7 +111,7 @@ MonoBehaviour:
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
- rid: 5637594796066865154
- rid: 3815703627022467150
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
@@ -126,18 +126,18 @@ MonoBehaviour:
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
- rid: 5637594796066865155
- rid: 3815703627022467151
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
- rid: 5637594796066865156
- rid: 3815703627022467152
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1
- rid: 5637594796066865157
- rid: 3815703627022467153
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
m_Version: 0
@@ -150,21 +150,21 @@ MonoBehaviour:
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
- rid: 5637594796066865158
- rid: 3815703627022467154
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3}
probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3}
probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3}
- rid: 5637594796066865159
- rid: 3815703627022467155
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0
m_LabelToInclude:
- rid: 5637594796066865160
- rid: 3815703627022467156
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
@@ -177,7 +177,7 @@ MonoBehaviour:
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
- rid: 5637594796066865161
- rid: 3815703627022467157
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
@@ -187,12 +187,12 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 5637594796066865162
- rid: 3815703627022467158
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0
- rid: 5637594796066865163
- rid: 3815703627022467159
type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}

7
Assets/WorkSpace/Personal/JYM/HighLighterManager.cs
View File

@@ -18,6 +18,13 @@ public class HighLighterManager : MonoBehaviour, ISingle
{
ActiveHighLighter(highLightMachine);
}
public void ClickArea()
{
if (currentMachine == null)
return;
currentMachine.DeactiveHighLighter();
}
public void ActiveHighLighter(Machine highLightMachine)
{
foreach (var machine in machines)

48
Assets/WorkSpace/Personal/JYM/Panel_BuildingCorrection.cs Normal file
View File

@@ -0,0 +1,48 @@
using CHN;
using UnityEngine;
using UnityEngine.UI;
using WI;
public class Panel_BuildingCorrection : PanelBase, IPopupPanel
{
private Building building;
public Toggle Toggle_Wall;
public Toggle Toggle_Ground;
public Toggle Toggle_Deco;
public Button Button_Close;
public override void AfterAwake()
{
building = FindAnyObjectByType<Building>();
Toggle_Wall.onValueChanged.AddListener(OnValueChangedWallToggle);
Toggle_Ground.onValueChanged.AddListener(OnValueChangedGroundToggle);
Toggle_Deco.onValueChanged.AddListener(OnValueChangedDecoToggle);
Button_Close.onClick.AddListener(Close);
}
private void OnValueChangedWallToggle(bool isOn)
{
building.SetActiveWalls(isOn);
}
private void OnValueChangedGroundToggle(bool isOn)
{
building.SetActiveGrounds(isOn);
}
private void OnValueChangedDecoToggle(bool isOn)
{
building.SetActiveDecos(isOn);
}
public void Open()
{
gameObject.SetActive(true);
}
public void Close()
{
gameObject.SetActive(false);
}
}

2
Assets/WorkSpace/Personal/JYM/Panel_BuildingCorrection.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 53b49367a49d8874ca3d70f4439c7dae

55
Assets/WorkSpace/Personal/JYM/Panel_BuildingDeleteRegistration.cs Normal file
View File

@@ -0,0 +1,55 @@
using CHN;
using System;
using UnityEngine;
using UnityEngine.UI;
using WI;
public class Panel_BuildingDeleteRegistration : PanelBase, IPopupPanel
{
private Building building;
public Button Button_Registration;
public Button Button_Delete;
public Button Button_Correction;
public Action onClickCorrectionButton;
public override void AfterAwake()
{
building = FindAnyObjectByType<Building>();
Button_Registration.onClick.AddListener(OnClickRegistartionButton);
Button_Delete.onClick.AddListener(OnClickDeleteButton);
Button_Correction.onClick.AddListener(OnClickCorrectionButton);
}
public void SetActive()
{
var isActive = gameObject.activeSelf;
var active = isActive ? false : true;
gameObject.SetActive(active);
}
public void Open()
{
gameObject.SetActive(true);
}
public void Close()
{
gameObject.SetActive(false);
}
private void OnClickRegistartionButton()
{
building.ActiveBuliding();
Close();
}
private void OnClickDeleteButton()
{
building.DeactiveBuliding();
Close();
}
private void OnClickCorrectionButton()
{
onClickCorrectionButton?.Invoke();
}
}

2
Assets/WorkSpace/Personal/JYM/Panel_BuildingDeleteRegistration.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 0ce6fac648e40a247a756544bc181979

86
Assets/WorkSpace/Personal/JYM/Panel_MachineCorrection.cs Normal file
View File

@@ -0,0 +1,86 @@
using UnityEngine;
using WI;
using TMPro;
using UnityEngine.UI;
using System;
using CHN;
public class Panel_MachineCorrection : PanelBase, IPopupPanel
{
private Machine machine;
public TextMeshProUGUI Text_MachineName;
public TMP_InputField InputField_Width;
public TMP_InputField InputField_Height;
public TMP_InputField InputField_Depth;
public Button Button_Correction;
public Button Button_Reset;
public Button Button_Close;
public Action<Vector3> onChangedSize;
public override void AfterAwake()
{
Button_Correction.onClick.AddListener(OnClickCorrectionButton);
Button_Reset.onClick.AddListener(OnClickResetButton);
Button_Close.onClick.AddListener(Close);
InputField_Width.onEndEdit.AddListener((value)=> OnEndEdit(InputField_Width));
InputField_Height.onEndEdit.AddListener((value) => OnEndEdit(InputField_Height));
InputField_Depth.onEndEdit.AddListener((value) => OnEndEdit(InputField_Depth));
}
public void SetData(Machine machine)
{
this.machine = machine;
InputField_Width.text = machine.transform.localScale.x.ToString();
InputField_Height.text = machine.transform.localScale.y.ToString();
InputField_Depth.text = machine.transform.localScale.z.ToString();
Text_MachineName.SetText(machine.machineName);
Open();
}
public void Open()
{
gameObject.SetActive(true);
}
public void Close()
{
gameObject.SetActive(false);
}
private void OnClickCorrectionButton()
{
var witdh = SetValue(InputField_Width.text);
var height = SetValue(InputField_Height.text);
var depth = SetValue(InputField_Depth.text);
var newSize = new Vector3(witdh, height, depth);
machine.transform.localScale = newSize;
Close();
}
private void OnClickResetButton()
{
machine.transform.localScale = machine.originScale;
Close();
}
private float SetValue(string text)
{
if (text == string.Empty || text == "0")
return 0f;
float.TryParse(text, out var value);
return value;
}
private void OnEndEdit(TMP_InputField inputField)
{
if (inputField.text == string.Empty)
{
inputField.text = "0";
}
}
}

2
Assets/WorkSpace/Personal/JYM/Panel_MachineCorrection.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 94fdebc44e012384e9d4ab44f6f51c1b

54
Assets/WorkSpace/Personal/JYM/Panel_MachineDeleteRegistration.cs Normal file
View File

@@ -0,0 +1,54 @@
using CHN;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
using WI;
public class Panel_MachineDeleteRegistration : PanelBase, IPopupPanel
{
private Machine machine;
public TextMeshProUGUI Text_MachineName;
public Button Button_Registration;
public Button Button_Delete;
public Button Button_Close;
public override void AfterAwake()
{
Button_Registration.onClick.AddListener(OnClickRegistartionButton);
Button_Delete.onClick.AddListener(OnClickDeleteButton);
Button_Close.onClick.AddListener(Close);
}
public void Open()
{
gameObject.SetActive(true);
}
public void SetData(Machine machine)
{
this.machine = machine;
Text_MachineName.SetText(machine.machineName);
Open();
}
public void Close()
{
gameObject.SetActive(false);
}
private void OnClickRegistartionButton()
{
machine.gameObject.SetActive(true);
machine.machineKPI.isInteractable = true;
machine.machineKPI.SetActive(true);
Close();
}
private void OnClickDeleteButton()
{
machine.gameObject.SetActive(false);
machine.machineKPI.isInteractable = false;
machine.machineKPI.SetActive(false);
Close();
}
}

2
Assets/WorkSpace/Personal/JYM/Panel_MachineDeleteRegistration.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: afeed1b602d08ac479b4a6ded5ad6099

42
Assets/WorkSpace/Personal/JYM/Panel_ThermostatControl.cs
View File

@@ -4,9 +4,11 @@ using UnityEngine.UI;
using WI;
using System;
using System.Collections.Generic;
using static MQTT;
public class Panel_ThermostatControl : PanelBase, IPopupPanel
{
private string machineCode;
private Dictionary<string, string> thermostatValues = new();
public TextMeshProUGUI Title;
@@ -16,28 +18,36 @@ public class Panel_ThermostatControl : PanelBase, IPopupPanel
public Button Button_Control;
public Button Button_Cancel;
public Action<float> onClickControlButton;
public Action<Thermostat> onSetThermostat;
public Action<string, string> onClickControlButton;
public override void AfterAwake()
{
Button_Control.onClick.AddListener(OnClickControlButton);
Button_Cancel.onClick.AddListener(OnClickCancelButton);
}
public void SetData(Thermostat thermostat)
public void SettingThermostatData(Thermostat thermostat)
{
Open();
machineCode = thermostat.machineCode;
Title.SetText($"¿ÂÀ¯±â/¿Â¼ö±â Á¦¾î {thermostat.thermostatName}");
if (thermostatValues.ContainsKey(Title.text))
onSetThermostat?.Invoke(thermostat);
transform.SetAsLastSibling();
}
public void SetData(ThermostatData data)
{
if (data == null)
{
SettingValue.SetText(thermostatValues[Title.text]);
RealValue.SetText("-");
SettingValue.SetText("-");
}
else
{
SettingValue.SetText("0");
RealValue.SetText(ChangedValueData(data.thermostatInfo.C009));
SettingValue.SetText(ChangedValueData(data.thermostatInfo.C011));
}
transform.SetAsLastSibling();
}
public void Open()
{
@@ -51,24 +61,20 @@ public class Panel_ThermostatControl : PanelBase, IPopupPanel
private void OnClickControlButton()
{
var inputValue = InputField_ControlValue.text;
if (!thermostatValues.ContainsKey(Title.text))
{
thermostatValues.Add(Title.text, inputValue);
}
else
{
thermostatValues[Title.text] = inputValue;
}
SettingValue.SetText(inputValue);
float.TryParse(inputValue, out var controlValue);
var sendValue = controlValue * 10f;
onClickControlButton?.Invoke(controlValue);
onClickControlButton?.Invoke(machineCode, sendValue.ToString());
Close();
}
private void OnClickCancelButton()
{
Close();
}
private string ChangedValueData(string value)
{
float.TryParse(value, out var floatValue);
return floatValue.ToString("F1");
}
}

9
Assets/WorkSpace/Personal/JYM/Panel_ToolBar.cs
View File

@@ -20,9 +20,9 @@ public class Panel_ToolBar : PanelBase
private Button Button_Minimap;
private Button Button_Record;
private Button Button_Capture;
private Button Button_DeleteRegistration;
private Button Button_FloorControl;
private Image Image_DashboardActive;
private Image Image_Record_Play;
private Image Image_MiniMapActive;
private Image Image_FloorControlActive;
@@ -35,6 +35,7 @@ public class Panel_ToolBar : PanelBase
public Action<int> onClickCustomView;
public Action onClickMiniMap;
public Action onClickFloorControl;
public Action onClickDeleteRegistration;
public Action<Vector2, string, bool> onAlarm;
public override void AfterAwake()
@@ -46,6 +47,7 @@ public class Panel_ToolBar : PanelBase
Button_Minimap.onClick.AddListener(OnClickMinimap);
Button_Record.onClick.AddListener(OnClickRecord);
Button_Capture.onClick.AddListener(OnClickCapture);
Button_DeleteRegistration.onClick.AddListener(OnClickDeleteRegistration);
Button_FloorControl.onClick.AddListener(OnClickFloorControl);
viewButtons.Add(ViewMode.TopView, Button_TopView);
@@ -56,6 +58,11 @@ public class Panel_ToolBar : PanelBase
CaptureSetting();
}
private void OnClickDeleteRegistration()
{
onClickDeleteRegistration?.Invoke();
}
private void RecordSetting()
{
var filePath = Path.GetFullPath(Environment.GetFolderPath(Environment.SpecialFolder.MyVideos));

1
Assets/WorkSpace/Personal/JYM/Thermostat.cs
View File

@@ -4,6 +4,7 @@ using WI;
public class Thermostat : MonoBehaviour
{
public string machineCode;
public string thermostatName;
public UI_ThermostatIcon thermostatIcon;
public Vector3 centerPos;

9
Assets/WorkSpace/Personal/JYM/UI_GraphChart.cs
View File

@@ -9,6 +9,8 @@ using WI;
using TMPro;
using static ChartAndGraph.GraphChartBase;
public class UI_GraphChart : UIBase, IPointerClickHandler
{
public GraphChart Graph;
@@ -69,7 +71,7 @@ public class UI_GraphChart : UIBase, IPointerClickHandler
{
chartDetailData.SetData(graphName, graphChartData[args.Index], graphDateTimeData[args.Index], args.Position);
}
public void SetChartData(string graphName, GraphChartData graphData)
public void SetChartData(string graphName, GraphChartData graphData, Material lineColor, Material fillColor)
{
this.graphName = graphName;
@@ -81,7 +83,7 @@ public class UI_GraphChart : UIBase, IPointerClickHandler
Graph.DataSource.VerticalViewSize = max * 2f;
Graph.DataSource.ClearCategory("WorkConditionsData");
Graph.DataSource.StartBatch();
for (int i = 0; i < graphData.chartData.Count; i++)
{
Graph.DataSource.AddPointToCategory("WorkConditionsData", i, graphData.chartData[i]);
@@ -90,6 +92,9 @@ public class UI_GraphChart : UIBase, IPointerClickHandler
}
Graph.DataSource.EndBatch();
Graph.DataSource.SetCategoryFill("WorkConditionsData", fillColor, true);
Graph.DataSource.SetCategoryLine("WorkConditionsData", lineColor, 5f, new MaterialTiling(true, 100f));
if (isMainChart)
{
Graph.OnRedraw.AddListener(SetChartLabels);

7
Assets/WorkSpace/Personal/JYM/UI_MachineKPI.cs
View File

@@ -31,6 +31,7 @@ public class UI_MachineKPI : UIBase, IPointerClickHandler, IPointerEnterHandler,
private TextMeshProUGUI wordno;
public bool isExpand;
public bool isInteractable;
public Action<UI_MachineKPI> onClickKPI;
@@ -124,10 +125,16 @@ public class UI_MachineKPI : UIBase, IPointerClickHandler, IPointerEnterHandler,
public void Active()
{
if (!isInteractable)
return;
gameObject.SetActive(true);
}
public void Deactive()
{
if (!isInteractable)
return;
isExpand = false;
gameObject.SetActive(false);

8
Assets/WorkSpace/Personal/RJH/TestMat.meta
View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 2853b3e059ac3b94393c89bc42019bef
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4355
Assets/WorkSpace/Personal/RJH/TestMat/Dissolve.shadergraph
View File

File diff suppressed because it is too large Load Diff

10
Assets/WorkSpace/Personal/RJH/TestMat/Dissolve.shadergraph.meta
View File

@@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: aaa71d0c2ab83cf4d8f08d31a2f59217
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

303
Assets/WorkSpace/Personal/RJH/TestMat/Mat_AreaVisualization.mat
View File

@@ -1,303 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Mat_AreaVisualization
m_Shader: {fileID: -6465566751694194690, guid: be6e2dd8328a35b4e90bc1b64832bbf6,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHATEST_ON
- _AXIS_X
- _DISABLE_SSR_TRANSPARENT
- _ENABLE_FOG_ON_TRANSPARENT
- _SURFACE_TYPE_TRANSPARENT
- _TRIPLANAR_SPACE_OBJECT
- _USE_DISSOLVE
- _USE_TRIPLANAR_UVS
m_InvalidKeywords: []
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
MotionVector: User
RenderType: Transparent
disabledShaderPasses:
- MOTIONVECTORS
- TransparentDepthPostpass
- TransparentBackface
- RayTracingPrepass
- TransparentDepthPrepass
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _Additional_Edge_Pattern:
m_Texture: {fileID: 2800000, guid: 6e66367a7f365104bbe3a4f6c710bf12, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 2800000, guid: 0d54d38a86511bc4cbb5be03a7ee4136, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _GuideTexture:
m_Texture: {fileID: 2800000, guid: 595d797e495fca541b378b16766cb8a4, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Guide_Noise:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: f424d1795e107b348bebec8a4dc8143e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Main_Edge_Pattern:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Noise:
m_Texture: {fileID: 2800000, guid: 76be6db943b1b9147b8d0ad22d1707f3, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Texture2DAsset_014105038cec48ceb5b17df63d9f15ef_Out_0:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- INVERT_DIRECTION: 0
- _2_SIDED_ADDITIONAL_EDGE: 0
- _2_sided_Additional_Edge: 1
- _2_sided_Additional_Edge_VD: 0
- _AXIS: 0
- _AddPrecomputedVelocity: 0
- _Additional_Edge: 0.94
- _Additional_Edge_Pattern_TIlling: 58.3
- _Additional_Edge_Pattern_Tiling: 12
- _Additional_Edge_Strength: 0
- _AlphaClip: 1
- _AlphaCutoffEnable: 1
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
- _BOOLEAN: 0
- _Blend: 0
- _BlendMode: 0
- _Boolean: 0
- _BumpScale: 1
- _Burn_Hardness: 0
- _Burn_Offset: 1.087
- _Burn_Width: 0.127
- _CastShadows: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _ConservativeDepthOffsetEnable: 0
- _Cull: 2
- _CullMode: 2
- _CullModeForward: 2
- _Cutoff: 0.04
- _DepthOffsetEnable: 0
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DissolveAmount: 0
- _Dissolve_Amount: 0
- _DoubleSidedEnable: 0
- _DoubleSidedGIMode: 0
- _DoubleSidedNormalMode: 2
- _DstBlend: 10
- _EdgeWidth: 0.0051
- _Ember_Hardness: 0
- _Ember_Offset: 1
- _Ember_Width: 3
- _Emission_Strength: 11111
- _EnableBlendModePreserveSpecularLighting: 1
- _EnableFogOnTransparent: 1
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _GuideAdjuster: 2.91
- _GuideStrength: 12
- _GuideTilling: 1
- _Guide_Affects_Edges: 1
- _Guide_Affects_Edges_VD: 0
- _Guide_Strength: 1
- _Guide_Tilling: 0.1
- _Guide_Tilling_Speed: 0
- _Hardness: 0.176
- _Hardness_VD: 0
- _Main_Edge: 0
- _Main_Edge_Pattern_TIlling: 16.7
- _Main_Edge_Pattern_Tiling: 0
- _Main_Edge_Strength: 0
- _MaxValue: 0
- _Max_Value: 18.45
- _Metallic: 0
- _MinValue: -45
- _Min_Value: 0.2
- _Noise_Offset_Speed: 0
- _Noise_Scroll_Speed: 0
- _Noise_Tiling: 1
- _Noise_Tilling: 3
- _OcclusionStrength: 1
- _Offset: 0
- _OpaqueCullMode: 2
- _Parallax: 0.005
- _QueueControl: 0
- _QueueOffset: 0
- _RayTracing: 0
- _ReceiveShadows: 1
- _ReceivesSSR: 1
- _ReceivesSSRTransparent: 0
- _RefractionModel: 0
- _RenderQueueType: 4
- _RequireSplitLighting: 0
- _Rotation: 114
- _Rotation_Impact: 0
- _Scroll_Speed: 0.3
- _Smoothness: 1
- _SmoothnessTextureChannel: 0
- _Smoothness_1: 2
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StencilRef: 0
- _StencilRefDepth: 0
- _StencilRefDistortionVec: 4
- _StencilRefGBuffer: 2
- _StencilRefMV: 32
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskDistortionVec: 4
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _Strength: 0
- _SupportDecals: 1
- _Surface: 0
- _SurfaceType: 1
- _TRIPLANAR_SPACE: 1
- _TransparentBackfaceEnable: 0
- _TransparentCullMode: 2
- _TransparentDepthPostpassEnable: 0
- _TransparentDepthPrepassEnable: 0
- _TransparentSortPriority: 0
- _TransparentWritingMotionVec: 0
- _TransparentZWrite: 0
- _USE_BACK_COLOR: 1
- _USE_DISSOLVE: 1
- _USE_TRIPLANAR_UVS: 1
- _USE_VERTEX_DISPLACEMENT: 0
- _UV_CHANNEL: 0
- _UseShadowThreshold: 0
- _Use_Metallic_Texture: 1
- _Width: 2
- _WorkflowMode: 1
- _ZTest: 4
- _ZTestDepthEqualForOpaque: 4
- _ZTestGBuffer: 3
- _ZTestTransparent: 4
- _ZWrite: 0
- _ZWriteControl: 0
m_Colors:
- _Additional_Edge_Color_1: {r: 96.37647, g: 766.9961, b: 0, a: 0}
- _Additional_Edge_Color_2: {r: 0, g: 0, b: 0, a: 0.2901961}
- _Back_Color: {r: 0, g: 36.94643, b: 75.05762, a: 1}
- _BaseColor: {r: 2.6082377, g: 2.3370485, b: 0.40647855, a: 0.11372549}
- _Burn_Color: {r: 7.307888, g: 32.383606, b: 0, a: 0}
- _Color: {r: 2.6082377, g: 2.3370485, b: 0.40647855, a: 0.11372549}
- _DissolveColor: {r: 9.858462, g: 2.2862422, b: 0.5161497, a: 1}
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
- _Ember_Color: {r: 0.025, g: 0.05, b: 0, a: 0}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
- _Emission_Back_Color: {r: 0, g: 0, b: 0, a: 0}
- _Emission_Color: {r: 0.9528302, g: 0.004494493, b: 0.004494493, a: 1}
- _Main_Edge_Color_1: {r: 0, g: 0, b: 0, a: 0}
- _Main_Edge_Color_2: {r: 0, g: 0, b: 0, a: 0}
- _Rotation_Vector: {r: 2.89, g: 5.74, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
--- !u!114 &1434149026734732389
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
--- !u!114 &4730635943472814392
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 13
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:

8
Assets/WorkSpace/Personal/RJH/TestMat/Mat_AreaVisualization.mat.meta
View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 2030cbcf922121a47a06f38116a9bc38
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

332
Assets/WorkSpace/Personal/RJH/TestMat/New Material.mat
View File

@@ -1,332 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New Material
m_Shader: {fileID: -6465566751694194690, guid: b280da6944b03b548b109d3f9385ce0b,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- _ALPHATEST_ON
- _NORMALMAP_TANGENT_SPACE
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2475
stringTagMap:
MotionVector: User
RenderType: TransparentCutout
disabledShaderPasses:
- MOTIONVECTORS
- TransparentDepthPostpass
- TransparentBackface
- RayTracingPrepass
- TransparentDepthPrepass
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AnisotropyMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BentNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BentNormalMapOS:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _CoatMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissiveColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _HeightMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _IridescenceMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _IridescenceThicknessMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTexture:
m_Texture: {fileID: 2800000, guid: fcbe181bdb4ba17478bc6ab5b64cde0f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalMapOS:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalTexture:
m_Texture: {fileID: 2800000, guid: 48200786c58d7094a8808daf36d0a5aa, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_2179c19e774242b28694cc5d70d16409_Texture_1_Texture2D:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_5df0f9becaf545a0aadc90ddc5426ce5_Texture_1_Texture2D:
m_Texture: {fileID: 2800000, guid: 572688b0484091f47954a8642d1e961f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_ca9c069373234f8e9f23f613893d9791_Texture_1_Texture2D:
m_Texture: {fileID: 2800000, guid: 12c92c959fc43b141bfe23ed22e9e414, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_ff3891c064d642bca0048221872ac815_Texture_1_Texture2D:
m_Texture: {fileID: 2800000, guid: 66f4fdb3cad340840b34cc672fb0b5e5, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecularColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SubsurfaceMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TangentMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TangentMapOS:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Texture:
m_Texture: {fileID: 2800000, guid: 326cc832d7c86b747852e1e36b6913ab, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ThicknessMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmissionMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmittanceColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
- _ATDistance: 1
- _AddPrecomputedVelocity: 0
- _AlbedoAffectEmissive: 0
- _Alpha: 0
- _AlphaCutoff: 0.5
- _AlphaCutoffEnable: 1
- _AlphaCutoffPostpass: 0.5
- _AlphaCutoffPrepass: 0.5
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaRemapMax: 1
- _AlphaRemapMin: 0
- _AlphaSrcBlend: 1
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
- _ConservativeDepthOffsetEnable: 0
- _CullMode: 2
- _CullModeForward: 2
- _Cut: 1.34
- _Cutoff: -0.61
- _DepthOffsetEnable: 0
- _DetailAlbedoScale: 1
- _DetailNormalScale: 1
- _DetailSmoothnessScale: 1
- _DiffusionProfile: 0
- _DiffusionProfileHash: 0
- _DisplacementLockObjectScale: 1
- _DisplacementLockTilingScale: 1
- _DisplacementMode: 0
- _DoubleSidedEnable: 0
- _DoubleSidedGIMode: 0
- _DoubleSidedNormalMode: 1
- _DstBlend: 0
- _EdgeWidth: 2
- _EmissiveColorMode: 1
- _EmissiveExposureWeight: 1
- _EmissiveIntensity: 1
- _EmissiveIntensityUnit: 0
- _EnableBlendModePreserveSpecularLighting: 1
- _EnableFogOnTransparent: 1
- _EnableGeometricSpecularAA: 0
- _EnergyConservingSpecularColor: 1
- _Float: 0
- _Hegiht: 1
- _Height: 0.143
- _HeightAmplitude: 0.02
- _HeightCenter: 0.5
- _HeightMapParametrization: 0
- _HeightMax: 1
- _HeightMin: -1
- _HeightOffset: 0
- _HeightPoMAmplitude: 2
- _HeightTessAmplitude: 2
- _HeightTessCenter: 0.5
- _InvTilingScale: 1
- _Ior: 1.5
- _IridescenceMask: 1
- _IridescenceThickness: 1
- _LinkDetailsWithBase: 1
- _MaterialID: 1
- _Metallic: 0
- _MetallicRemapMax: 1
- _MetallicRemapMin: 0
- _NoiseStrength: 1
- _NormalMapSpace: 0
- _NormalScale: 1
- _NormalStrength: 1
- _ObjectSpaceUVMapping: 0
- _ObjectSpaceUVMappingEmissive: 0
- _OpaqueCullMode: 2
- _PPDLodThreshold: 5
- _PPDMaxSamples: 15
- _PPDMinSamples: 5
- _PPDPrimitiveLength: 1
- _PPDPrimitiveWidth: 1
- _RayTracing: 0
- _ReceivesSSR: 1
- _ReceivesSSRTransparent: 1
- _RefractionModel: 0
- _RenderQueueType: 1
- _RequireSplitLighting: 0
- _Size: 0.2
- _Smoothness: 0.5
- _SmoothnessRemapMax: 4
- _SmoothnessRemapMin: 0
- _SpecularAAScreenSpaceVariance: 0.1
- _SpecularAAThreshold: 0.2
- _SpecularOcclusionMode: 1
- _Speed: 0.8
- _SrcBlend: 1
- _StencilRef: 0
- _StencilRefDepth: 8
- _StencilRefDistortionVec: 4
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskDistortionVec: 4
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
- _TESTr: 100
- _Test: 1.1
- _TexWorldScale: 1
- _TexWorldScaleEmissive: 1
- _Thickness: 1
- _TransmissionEnable: 1
- _TransmissionMask: 1
- _TransparentBackfaceEnable: 0
- _TransparentCullMode: 1
- _TransparentDepthPostpassEnable: 0
- _TransparentDepthPrepassEnable: 0
- _TransparentSortPriority: 0
- _TransparentWritingMotionVec: 0
- _TransparentZWrite: 0
- _UVBase: 0
- _UVDetail: 0
- _UVEmissive: 0
- _UseEmissiveIntensity: 0
- _UseShadowThreshold: 0
- _ZTestDepthEqualForOpaque: 3
- _ZTestGBuffer: 3
- _ZTestTransparent: 4
- _ZWrite: 1
- _hide: 0
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 0}
- _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 0.98833704, g: 0.8429933, b: 0, a: 0}
- _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
- _DissolveColor: {r: 8, g: 0, b: 0, a: 1}
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
- _EdgeColor: {r: 1.9461865, g: 0, b: 0.16623332, a: 1}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1}
- _ForcalPoint: {r: 0.5, g: 0.5, b: 0, a: 0}
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
- _MainColor: {r: 2.828427, g: 2.7286005, b: 0, a: 0}
- _OffColor: {r: 1, g: 0.41981128, b: 0.41981128, a: 1}
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
- _Te: {r: 0.5, g: 0.5, b: 0, a: 0}
- _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
- _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
- _Vector3: {r: 1, g: 1, b: 1, a: 0}
m_BuildTextureStacks: []
--- !u!114 &3738913931305908042
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 13
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:

8
Assets/WorkSpace/Personal/RJH/TestMat/New Material.mat.meta
View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 79ae9571e35df6547a66637725067168
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

68
Assets/WorkSpace/Personal/RJH/TestMat/Test.cs
View File

@@ -1,68 +0,0 @@
using CHN;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Test : MonoBehaviour
{
private Building building;
private Floor curFloor;
public override void AfterAwake()
{
building = FindSingle<Building>();
}
private void Update()
{
//if (curFloor == null)
// return;
if(Input.GetKeyDown(KeyCode.LeftAlt))
{
StartVisual();
}
if(Input.GetKeyUp(KeyCode.LeftAlt))
{
var areas = curFloor.VisualizationAreas;
var renderers = areas.GetComponentsInChildren<Renderer>();
foreach (var renderer in renderers)
{
var propertyBlock = new MaterialPropertyBlock();
renderer.GetPropertyBlock(propertyBlock);
propertyBlock.SetFloat("_DissolveAmount", 1);
renderer.SetPropertyBlock(propertyBlock);
}
areas.SetActive(false);
}
}
private void StartVisual()
{
StopAllCoroutines();
curFloor = building.currentFloor;
StartCoroutine(IsAnimationPlay());
}
IEnumerator IsAnimationPlay()
{
float timer = 0f;
float percent = 0f;
var areas = curFloor.VisualizationAreas;
areas.SetActive(true);
var renderers = curFloor.VisualizationAreas.GetComponentsInChildren<Renderer>();
while (percent<1)
{
timer += Time.deltaTime;
percent = timer / 0.5f;
foreach (var renderer in renderers)
{
var propertyBlock = new MaterialPropertyBlock();
renderer.GetPropertyBlock(propertyBlock);
propertyBlock.SetFloat("_DissolveAmount", 1f-percent);
renderer.SetPropertyBlock(propertyBlock);
}
yield return null;
}
}
}

11
Assets/WorkSpace/Personal/RJH/TestMat/Test.cs.meta
View File

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

289
Assets/WorkSpace/Personal/RJH/TestMat/Test.mat
View File

@@ -1,289 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-3021533371704018160
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 13
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Test
m_Shader: {fileID: -6465566751694194690, guid: 097e5324c683a6b409dec7cf59d6a7ac, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- _DISABLE_SSR_TRANSPARENT
- _NORMALMAP_TANGENT_SPACE
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- TransparentDepthPrepass
- TransparentDepthPostpass
- TransparentBackface
- RayTracingPrepass
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AnisotropyMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BentNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BentNormalMapOS:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _CoatMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissiveColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _HeightMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _IridescenceMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _IridescenceThicknessMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalMapOS:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecularColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SubsurfaceMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TangentMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TangentMapOS:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Texture:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ThicknessMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmissionMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmittanceColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
- _ATDistance: 1
- _AddPrecomputedVelocity: 0
- _AlbedoAffectEmissive: 0
- _Alpha: 0.1
- _AlphaCutoff: 0.5
- _AlphaCutoffEnable: 0
- _AlphaCutoffPostpass: 0.5
- _AlphaCutoffPrepass: 0.5
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaRemapMax: 1
- _AlphaRemapMin: 0
- _AlphaSrcBlend: 1
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
- _CullMode: 2
- _CullModeForward: 2
- _Cutoff: 0.5
- _DepthOffsetEnable: 0
- _DetailAlbedoScale: 1
- _DetailNormalScale: 1
- _DetailSmoothnessScale: 1
- _DiffusionProfile: 0
- _DiffusionProfileHash: 0
- _DisplacementLockObjectScale: 1
- _DisplacementLockTilingScale: 1
- _DisplacementMode: 0
- _DoubleSidedEnable: 0
- _DoubleSidedGIMode: 0
- _DoubleSidedNormalMode: 1
- _DstBlend: 0
- _EmissiveColorMode: 1
- _EmissiveExposureWeight: 1
- _EmissiveIntensity: 1
- _EmissiveIntensityUnit: 0
- _EnableBlendModePreserveSpecularLighting: 1
- _EnableFogOnTransparent: 1
- _EnableGeometricSpecularAA: 0
- _EnergyConservingSpecularColor: 1
- _Float: 0
- _Height: 1.2
- _HeightAmplitude: 0.02
- _HeightCenter: 0.5
- _HeightMapParametrization: 0
- _HeightMax: 1
- _HeightMin: -1
- _HeightOffset: 0
- _HeightPoMAmplitude: 2
- _HeightTessAmplitude: 2
- _HeightTessCenter: 0.5
- _InvTilingScale: 1
- _Ior: 1.5
- _IridescenceMask: 1
- _IridescenceThickness: 1
- _LinkDetailsWithBase: 1
- _MaterialID: 1
- _Metallic: 0
- _MetallicRemapMax: 1
- _MetallicRemapMin: 0
- _NormalMapSpace: 0
- _NormalScale: 1
- _ObjectSpaceUVMapping: 0
- _ObjectSpaceUVMappingEmissive: 0
- _OpaqueCullMode: 2
- _PPDLodThreshold: 5
- _PPDMaxSamples: 15
- _PPDMinSamples: 5
- _PPDPrimitiveLength: 1
- _PPDPrimitiveWidth: 1
- _RayTracing: 0
- _ReceivesSSR: 1
- _ReceivesSSRTransparent: 0
- _RefractionModel: 0
- _Size: 0.2
- _Smoothness: 0.5
- _SmoothnessRemapMax: 1
- _SmoothnessRemapMin: 0
- _SpecularAAScreenSpaceVariance: 0.1
- _SpecularAAThreshold: 0.2
- _SpecularOcclusionMode: 1
- _Speed: 2
- _SrcBlend: 1
- _StencilRef: 0
- _StencilRefDepth: 8
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
- _TexWorldScale: 1
- _TexWorldScaleEmissive: 1
- _Thickness: 1
- _TransmissionEnable: 1
- _TransmissionMask: 1
- _TransparentBackfaceEnable: 0
- _TransparentCullMode: 2
- _TransparentDepthPostpassEnable: 0
- _TransparentDepthPrepassEnable: 0
- _TransparentSortPriority: 0
- _TransparentWritingMotionVec: 0
- _TransparentZWrite: 0
- _UVBase: 0
- _UVDetail: 0
- _UVEmissive: 0
- _UseEmissiveIntensity: 0
- _UseShadowThreshold: 0
- _ZTestDepthEqualForOpaque: 3
- _ZTestGBuffer: 4
- _ZTestTransparent: 4
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1}
- _ForcalPoint: {r: 0.5, g: 0.5, b: 0, a: 0}
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
- _MainColor: {r: 1, g: 0.752198, b: 0.1839623, a: 1}
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
- _Te: {r: 0.5, g: 0.5, b: 0, a: 0}
- _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
- _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1

8
Assets/WorkSpace/Personal/RJH/TestMat/Test.mat.meta
View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 722a35beb4a65454282d9b768043a726
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

10843
Assets/WorkSpace/Personal/RJH/TestMat/TestShader.shadergraph
View File

File diff suppressed because it is too large Load Diff

10
Assets/WorkSpace/Personal/RJH/TestMat/TestShader.shadergraph.meta
View File

@@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: 097e5324c683a6b409dec7cf59d6a7ac
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

2065
Assets/WorkSpace/Personal/RJH/TestMat/WallShader.shadergraph
View File

File diff suppressed because it is too large Load Diff

10
Assets/WorkSpace/Personal/RJH/TestMat/WallShader.shadergraph.meta
View File

@@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: b280da6944b03b548b109d3f9385ce0b
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

21
Assets/WorkSpace/Review/DataManager.cs
View File

@@ -14,6 +14,10 @@ namespace CHN
{
private Machine[] machines;
private List<ThermostatData> thermostatDatas = new();
private Thermostat currentThermostat;
public Action<ThermostatData> onSetThermostatData;
public Action<Machine, SimpleField> onCompleteInfo;
public Action<Machine, SimpleField> onSimpleInfo;
public Action<List<SimpleField>> onKPIInfo;
@@ -229,6 +233,23 @@ namespace CHN
.OrderBy(field => orderMap[field.machineName])
.ToList();
}
public void SetThermostatDataList(List<ThermostatData> thermostatDatas)
{
this.thermostatDatas = thermostatDatas;
UpdateShowThermostatData();
}
public void SetSelectedThermostatData(Thermostat thermostat)
{
currentThermostat = thermostat;
UpdateShowThermostatData();
}
public void UpdateShowThermostatData()
{
if (currentThermostat == null || currentThermostat.machineCode == null)
return;
onSetThermostatData(thermostatDatas.Find(x => x.workcd == currentThermostat.machineCode));
}
}
[Serializable]
public class SimpleField

2
Option.ini
View File

@@ -1,7 +1,7 @@
[mqttClientSetting]
host=106.247.236.204
port=8901
topics=MES/PDV/BOARD1,MES/PDV/BOARD2,MES/PDV/BOARD3
topics=MES/PDV/BOARD1,MES/PDV/BOARD2,MES/PDV/BOARD3,DVI/HOT/+
[controllerOption]
MoveSpeed=2