修改康养仿真Bug

This commit is contained in:
lujiajian 2025-02-20 16:43:55 +08:00
parent d3dc77220e
commit bc19181667
10 changed files with 5268 additions and 134 deletions

View File

@ -10,9 +10,10 @@ Material:
m_Name: "\u8840\u538B\u8BA1"
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords:
- _EMISSION
- _NORMALMAP
m_InvalidKeywords: []
m_LightmapFlags: 4
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1

View File

@ -62,7 +62,7 @@ ModelImporter:
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: f04030706def14240a9405d94b68507c
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 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: 169, y: 0, z: 164, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 1537655665
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: 58b22366a3a067f47b8fcab3cb812d67
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 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: 64, y: 0, z: 10, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 1537655665
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -253981,7 +253981,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1319237884
RectTransform:
m_ObjectHideFlags: 0

View File

@ -4,7 +4,6 @@ using UnityEngine.UI;
using UnityEngine.Playables;
using HighlightPlus;
using System.Collections.Generic;
using static UnityEditor.PlayerSettings;
/// <summary>
/// 开始选择界面
@ -35,7 +34,7 @@ public class ClickKangYangdevice : MonoBehaviour
public HighlightEffect StartBtn_highlight;
public KangYangDevice kangYangDevice = KangYangDevice.None;
public SkinnedMeshRenderer XueYaYiSMR;//血压计动画
public GameObject XYPXObj;//Ѫѹ¼ÆÆÁÄ»ÏÔʾ
public List<GameObject> XYPXObj;//血压计屏幕显示
public RawImage ShuaiDaoIamge;//紧急呼叫
public Animator OldManAni;//NPC动画
public PlayableDirector playableDirector;//timeline动画
@ -57,15 +56,42 @@ public class ClickKangYangdevice : MonoBehaviour
public Button YWGLBtn;//药物管理按钮
public Button JKJCBtn;//健康检测按钮
public Button MNJKGLBtn;//模拟健康管理
public Button AddWatch;//保存填写信息的手环按钮
public List<Transform> Point;//场景中的点位
public List<Transform> LightsModel = new List<Transform>();//所有灯模型
public GameObject treadmillmaterial;
bool isFirstAddWatch = false;//是否已经添加了手环
int changeindex = 0;
public GameObject EditPanel;//添加手环页面
public GameObject WatchPanel;//手环页面
private void Awake()
{
Instance = this;
}
/// <summary>
/// 显示手环页面还是添加手环页面
/// </summary>
public void ShowEditorWatch()
{
if (isFirstAddWatch)
{
WatchPanel.SetActive(true);
}
else
{
EditPanel.SetActive(true);
}
}
/// <summary>
/// 呼叫护工
/// </summary>
public void CallPeoPle()
{
ImageTips.instance.Tips.text = "已呼叫护工。";
ImageTips.instance.Tips.color= Color.green;
StartCoroutine(ImageTips.instance.WaitHide());
}
/// <summary>
/// 初始化
/// </summary>
@ -77,6 +103,10 @@ public class ClickKangYangdevice : MonoBehaviour
playableDirector.Pause();
YWGLBtn.gameObject.SetActive(false);
JKJCBtn.gameObject.SetActive(false);
AddWatch.onClick.AddListener(() =>
{
isFirstAddWatch = true;
});
Open.onClick.AddListener(() =>
{
Is_Open = !Is_Open;
@ -108,7 +138,15 @@ public class ClickKangYangdevice : MonoBehaviour
{
Init();
}
/// <summary>
/// 设置完成药物提示
/// </summary>
public void Setupmedicationprompts()
{
ImageTips.instance.Tips.text = "设置药物提醒成功!";
ImageTips.instance.Tips.color = Color.green;
StartCoroutine(ImageTips.instance.WaitHide());
}
// Update is called once per frame
void Update()
{
@ -138,7 +176,22 @@ public class ClickKangYangdevice : MonoBehaviour
if (hit.collider.gameObject.name == "血压仪开始/停止按钮")
{
StartBtn_highlight.highlighted = false;//血压计开关按钮
XYPXObj.gameObject.SetActive(true);
XYPXObj[0].gameObject.SetActive(true);
}
if (hit.collider.gameObject.name == "血压仪切换按钮")
{
XYPXObj[changeindex].gameObject.SetActive(false);
changeindex++;
if (changeindex <= 2)
{
StartBtn_highlight.highlighted = false;//血压计开关按钮
XYPXObj[changeindex].gameObject.SetActive(true);
}
else
{
changeindex = 0;
XYPXObj[changeindex].gameObject.SetActive(true);
}
}
}
break;

View File

@ -29,7 +29,7 @@ public class KangYangMangner : MonoBehaviour
RehabilitationAndAuxiliary.onClick.AddListener(() =>
{
kangYangregion = kangYangRegion.;
ClickKangYangdevice.Instance.MNJKGLBtn.gameObject.SetActive(true);
//ClickKangYangdevice.Instance.MNJKGLBtn.gameObject.SetActive(true);
ClickKangYangdevice.Instance.PlayerTrans.position = ClickKangYangdevice.Instance.Point[1].position;
gameObject.SetActive(false);
});