Merge pull request '수정 사항 적용(UI 제외)' (#136) from dev/jym/250822_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/136
This commit was merged in pull request #136.
This commit is contained in:
Binary file not shown.
|
Before Width: | Height: | Size: 3.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.1 KiB |
@@ -1,117 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1513251e4980d644096eaeb1e92806a1
|
||||
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:
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 7.0 KiB |
BIN
Assets/Images/UI/MachineKPI/UI 클릭 전 (3).png
Normal file
BIN
Assets/Images/UI/MachineKPI/UI 클릭 전 (3).png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b52c4d661dc79e9428c98ae5abb0f014
|
||||
guid: f0a755c9500ff0840b9d9fdaf8a77541
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
@@ -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: []
|
||||
BIN
Assets/Images/UI/MachineKPI/UI 클릭 전 (5).png
Normal file
BIN
Assets/Images/UI/MachineKPI/UI 클릭 전 (5).png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.3 KiB |
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bdc635b0d7483494aba645da0311e7d1
|
||||
guid: 7843312caa7581b4a991f55824af2f13
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
@@ -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: []
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.2 KiB |
@@ -1,117 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bfe87db4b859ff640806fc73a835437d
|
||||
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:
|
||||
@@ -239968,11 +239968,11 @@ PrefabInstance:
|
||||
- target: {fileID: 8975415868823054384, guid: 0829ea87d1abe994da27220a1313853e, type: 3}
|
||||
propertyPath: 'm_Materials.Array.data[0]'
|
||||
value:
|
||||
objectReference: {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
|
||||
objectReference: {fileID: 2100000, guid: b7c050bfab415b74483af72c2ac93c6c, type: 2}
|
||||
- target: {fileID: 8975415868823054384, guid: 0829ea87d1abe994da27220a1313853e, type: 3}
|
||||
propertyPath: 'm_Materials.Array.data[1]'
|
||||
value:
|
||||
objectReference: {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
|
||||
objectReference: {fileID: 2100000, guid: b7c050bfab415b74483af72c2ac93c6c, type: 2}
|
||||
- target: {fileID: 9033008607938114458, guid: 0829ea87d1abe994da27220a1313853e, type: 3}
|
||||
propertyPath: m_CastShadows
|
||||
value: 0
|
||||
|
||||
@@ -760,8 +760,8 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: bfe87db4b859ff640806fc73a835437d, type: 3}
|
||||
m_Type: 0
|
||||
m_Sprite: {fileID: 21300000, guid: f0a755c9500ff0840b9d9fdaf8a77541, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
@@ -769,7 +769,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 4
|
||||
--- !u!1 &3027565186066632977
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1966,8 +1966,8 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: b52c4d661dc79e9428c98ae5abb0f014, type: 3}
|
||||
m_Type: 0
|
||||
m_Sprite: {fileID: 21300000, guid: 7843312caa7581b4a991f55824af2f13, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
@@ -1975,7 +1975,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 4
|
||||
--- !u!1 &4810463050529713554
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2382,8 +2382,8 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: bfe87db4b859ff640806fc73a835437d, type: 3}
|
||||
m_Type: 0
|
||||
m_Sprite: {fileID: 21300000, guid: f0a755c9500ff0840b9d9fdaf8a77541, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
@@ -2391,7 +2391,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 4
|
||||
--- !u!114 &4522406185885843115
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2508,8 +2508,8 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: b52c4d661dc79e9428c98ae5abb0f014, type: 3}
|
||||
m_Type: 0
|
||||
m_Sprite: {fileID: 21300000, guid: 7843312caa7581b4a991f55824af2f13, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
@@ -2517,7 +2517,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_PixelsPerUnitMultiplier: 4
|
||||
--- !u!1 &6885738305695775437
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -182670,7 +182670,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: ControlValue
|
||||
m_text: "\uAE08\uD615 \uC628\uB3C4 \uC81C\uC5B4"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
|
||||
m_sharedMaterial: {fileID: 2250789165734441016, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
|
||||
@@ -320552,6 +320552,10 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 180
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 722632695981224637, guid: 202f262a2ad9c544cb8e2a03c6924316, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 811942398204697296, guid: 202f262a2ad9c544cb8e2a03c6924316, type: 3}
|
||||
propertyPath: 'm_Materials.Array.data[0]'
|
||||
value:
|
||||
@@ -320604,6 +320608,10 @@ PrefabInstance:
|
||||
propertyPath: 'm_Materials.Array.data[0]'
|
||||
value:
|
||||
objectReference: {fileID: -6885106255041415758, guid: cb5d1cc05e8caf24b81852712483a212, type: 3}
|
||||
- target: {fileID: 5674990851857068161, guid: 202f262a2ad9c544cb8e2a03c6924316, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5680555921348186368, guid: 202f262a2ad9c544cb8e2a03c6924316, type: 3}
|
||||
propertyPath: 'm_Materials.Array.data[0]'
|
||||
value:
|
||||
@@ -459966,7 +459974,7 @@ PrefabInstance:
|
||||
- target: {fileID: 5095972798413141991, guid: 4d3ac298208c93e48bfea2c950e81b1b, type: 3}
|
||||
propertyPath: previewImage
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: 16f37f1d23b6d934f80a8a04a1d33a88, type: 3}
|
||||
objectReference: {fileID: 21300000, guid: 06d40999b71de9047888b8ecd802cb1a, type: 3}
|
||||
- target: {fileID: 5095972798413141991, guid: 4d3ac298208c93e48bfea2c950e81b1b, type: 3}
|
||||
propertyPath: focusDistance
|
||||
value: 10
|
||||
@@ -504644,7 +504652,7 @@ Transform:
|
||||
m_GameObject: {fileID: 8222434460383832939}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.5000001, y: 0.50000006, z: -0.49999994, w: -0.49999994}
|
||||
m_LocalPosition: {x: -9.553569, y: 0.55398756, z: 5.9772024}
|
||||
m_LocalPosition: {x: -9.54, y: 0.554, z: 5.9772024}
|
||||
m_LocalScale: {x: 0.0017432225, y: 0.0017432225, z: 0.0017432225}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@@ -549876,7 +549884,7 @@ Transform:
|
||||
m_GameObject: {fileID: 7794370760464104758}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.5000001, y: 0.50000006, z: -0.49999994, w: -0.49999994}
|
||||
m_LocalPosition: {x: -5.4379015, y: 0.5538646, z: 5.979137}
|
||||
m_LocalPosition: {x: -5.4547, y: 0.5539, z: 5.979137}
|
||||
m_LocalScale: {x: 0.0017432225, y: 0.0017432225, z: 0.0017432225}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@@ -574308,7 +574316,7 @@ Transform:
|
||||
m_GameObject: {fileID: 7199420682407843159}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.5000001, y: 0.50000006, z: -0.49999994, w: -0.49999994}
|
||||
m_LocalPosition: {x: -5.423429, y: 0.55398756, z: 5.977201}
|
||||
m_LocalPosition: {x: -5.4402, y: 0.554, z: 5.977201}
|
||||
m_LocalScale: {x: 0.0017432225, y: 0.0017432225, z: 0.0017432225}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@@ -585113,7 +585121,7 @@ Transform:
|
||||
m_GameObject: {fileID: 7679484663328234570}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.5000001, y: 0.50000006, z: -0.49999994, w: -0.49999994}
|
||||
m_LocalPosition: {x: -9.568041, y: 0.5538647, z: 5.979139}
|
||||
m_LocalPosition: {x: -9.5545, y: 0.5539, z: 5.979139}
|
||||
m_LocalScale: {x: 0.0017432225, y: 0.0017432225, z: 0.0017432225}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
||||
@@ -108,11 +108,17 @@ namespace CHN
|
||||
{
|
||||
var startDateData = Convert.ToDateTime(targetText.text);
|
||||
startDate = startDateData.ToString("yyyyMMdd");
|
||||
|
||||
var endDateData = Convert.ToDateTime(Text_EndDay.text);
|
||||
endDate = endDateData.ToString("yyyyMMdd");
|
||||
}
|
||||
else if(targetText == Text_EndDay)
|
||||
{
|
||||
var endDateData = Convert.ToDateTime(targetText.text);
|
||||
endDate = endDateData.ToString("yyyyMMdd");
|
||||
|
||||
var startDateData = Convert.ToDateTime(Text_StartDay.text);
|
||||
startDate = startDateData.ToString("yyyyMMdd");
|
||||
}
|
||||
|
||||
if (!startDate.Equals(string.Empty) && !endDate.Equals(string.Empty))
|
||||
|
||||
@@ -100,11 +100,17 @@ namespace CHN
|
||||
{
|
||||
var startDateData = Convert.ToDateTime(targetText.text);
|
||||
startDate = startDateData.ToString("yyyyMMdd");
|
||||
|
||||
var endDateData = Convert.ToDateTime(Text_EndDay.text);
|
||||
endDate = endDateData.ToString("yyyyMMdd");
|
||||
}
|
||||
else if (targetText == Text_EndDay)
|
||||
{
|
||||
var endDateData = Convert.ToDateTime(targetText.text);
|
||||
endDate = endDateData.ToString("yyyyMMdd");
|
||||
|
||||
var startDateData = Convert.ToDateTime(Text_StartDay.text);
|
||||
startDate = startDateData.ToString("yyyyMMdd");
|
||||
}
|
||||
|
||||
if (!startDate.Equals(string.Empty) && !endDate.Equals(string.Empty))
|
||||
|
||||
@@ -23,6 +23,7 @@ public class Panel_ThermostatControl : PanelBase
|
||||
}
|
||||
public void Close()
|
||||
{
|
||||
InputField_ControlValue.SetTextWithoutNotify("");
|
||||
gameObject.SetActive(false);
|
||||
}
|
||||
private void OnClickControlButton()
|
||||
@@ -35,7 +36,6 @@ public class Panel_ThermostatControl : PanelBase
|
||||
}
|
||||
private void OnClickCancelButton()
|
||||
{
|
||||
InputField_ControlValue.SetTextWithoutNotify("");
|
||||
Close();
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -38,19 +38,3 @@ CAP-P,CAP FILL O-Ring & Printing,조립,
|
||||
GC,X76 GORE CAP,조립,
|
||||
CAP-W,GF6 CAP FILL,조립,
|
||||
WASHE,GF6 WASHER,조립,
|
||||
GP-1,최종검사-01,기타,
|
||||
GP-2,최종검사-02,기타,
|
||||
GP-3,최종검사-03,기타,
|
||||
GP-4,최종검사-04,기타,
|
||||
GP-6,최종검사-06,기타,
|
||||
GP-7,최종검사-07,기타,
|
||||
GP-8,최종검사-08,기타,
|
||||
GP-9,최종검사-09,기타,
|
||||
GP-11,최종검사-11,기타,
|
||||
GP-12,최종검사-12,기타,
|
||||
GP-13,최종검사-13,기타,
|
||||
WA-3,PUMP COVER,기타,
|
||||
MN-01,가공반-1,기타,
|
||||
MN-02,가공반-2,기타,
|
||||
MN-03,가공반-3,기타,
|
||||
MN-04,가공반-4,기타,
|
||||
|
||||
|
@@ -29161,6 +29161,11 @@
|
||||
Called when the Unity application's foreground state changed.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Best.HTTP.Shared.HTTPUpdateDelegator.ResetSetup">
|
||||
<summary>
|
||||
Called after scene loaded to support Configurable Enter Play Mode (https://docs.unity3d.com/2019.3/Documentation/Manual/ConfigurableEnterPlayMode.html)
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Best.HTTP.Shared.HTTPUpdateDelegator.CheckInstance">
|
||||
<summary>
|
||||
Will create the HTTPUpdateDelegator instance and set it up.
|
||||
|
||||
Reference in New Issue
Block a user