修复bug
This commit is contained in:
parent
c4a5785092
commit
a65986c775
Binary file not shown.
|
After Width: | Height: | Size: 125 KiB |
|
|
@ -0,0 +1,135 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 767da5122977df543b7d4eb4e2eb74d4
|
||||||
|
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: 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
|
||||||
|
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: WebGL
|
||||||
|
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: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 113 KiB |
|
|
@ -0,0 +1,135 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 4ba7b3d4f70a09b4fb5401f33bc75da5
|
||||||
|
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: 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
|
||||||
|
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: WebGL
|
||||||
|
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: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -77,25 +77,28 @@ public class LineManager : SerializedMonoBehaviour
|
||||||
/// <param name="ExperimentNumber">实验序号</param>
|
/// <param name="ExperimentNumber">实验序号</param>
|
||||||
private void Initialization(int ExperimentNumber = 0)
|
private void Initialization(int ExperimentNumber = 0)
|
||||||
{
|
{
|
||||||
if (PlayerPrefs.GetString("LineData") != "")
|
lineData = new LineData();
|
||||||
{
|
#region 弃用保存连线方法
|
||||||
lineData = JsonConvert.DeserializeObject<LineData>(PlayerPrefs.GetString("LineData"));
|
//if (PlayerPrefs.GetString("LineData") != "")
|
||||||
|
//{
|
||||||
|
// lineData = JsonConvert.DeserializeObject<LineData>(PlayerPrefs.GetString("LineData"));
|
||||||
|
|
||||||
for (int i = 0; i < lineData.Modelname.Count; i++)
|
// for (int i = 0; i < lineData.Modelname.Count; i++)
|
||||||
{
|
// {
|
||||||
for (int j = 0; j < Models.Count; j++)
|
// for (int j = 0; j < Models.Count; j++)
|
||||||
{
|
// {
|
||||||
if (lineData.Modelname[i].Contains(Models[j].name))
|
// if (lineData.Modelname[i].Contains(Models[j].name))
|
||||||
{
|
// {
|
||||||
Models[j].SetActive(true);
|
// Models[j].SetActive(true);
|
||||||
}
|
// }
|
||||||
if (lineData.Modelname[i].Equals(Models[j].name) && Models[j].name.Equals("diannaoxian"))
|
// if (lineData.Modelname[i].Equals(Models[j].name) && Models[j].name.Equals("diannaoxian"))
|
||||||
{
|
// {
|
||||||
Models[j].transform.DOLocalMove(new Vector3(-0.56f, -0.293f, -0.163f), 0.5f);
|
// Models[j].transform.DOLocalMove(new Vector3(-0.56f, -0.293f, -0.163f), 0.5f);
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
#endregion
|
||||||
//重新选择初始化
|
//重新选择初始化
|
||||||
ComputerPanel.gameObject.SetActive(false);
|
ComputerPanel.gameObject.SetActive(false);
|
||||||
allline = 0;
|
allline = 0;
|
||||||
|
|
@ -127,6 +130,9 @@ public class LineManager : SerializedMonoBehaviour
|
||||||
case 512:
|
case 512:
|
||||||
ComputerPanel.sprite = Experimentalresults[1];
|
ComputerPanel.sprite = Experimentalresults[1];
|
||||||
break;
|
break;
|
||||||
|
case 521:
|
||||||
|
ComputerPanel.sprite = Experimentalresults[2];
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
bool isshow;
|
bool isshow;
|
||||||
|
|
@ -152,24 +158,37 @@ public class LineManager : SerializedMonoBehaviour
|
||||||
Highlights = Highlights_Backup.ToList();
|
Highlights = Highlights_Backup.ToList();
|
||||||
Bootstrap.Instance.uiManager.HidePanel<UI_TopTipPanel>();
|
Bootstrap.Instance.uiManager.HidePanel<UI_TopTipPanel>();
|
||||||
}
|
}
|
||||||
if (Input.GetKeyDown(KeyCode.Alpha1))
|
if (LineShowModel.Instance.currentState == DrawingState.Idle)
|
||||||
{
|
|
||||||
//先重置高亮，再重置模型，否则初始化无法正确显示高亮
|
|
||||||
Highlights = highlightsdic[511].ToList();
|
|
||||||
Highlights_Backup = highlightsdic[511].ToList();
|
|
||||||
Initialization(511);
|
|
||||||
Models.ForEach((x) => { x.SetActive(false); });
|
|
||||||
Models = Modeldic[511].ToList();
|
|
||||||
}
|
|
||||||
if (Input.GetKeyDown(KeyCode.Alpha2))
|
|
||||||
{
|
{
|
||||||
|
if (Input.GetKeyDown(KeyCode.Alpha1))
|
||||||
|
{
|
||||||
|
//先重置高亮，再重置模型，否则初始化无法正确显示高亮
|
||||||
|
Highlights = highlightsdic[511].ToList();
|
||||||
|
Highlights_Backup = highlightsdic[511].ToList();
|
||||||
|
Initialization(511);
|
||||||
|
Models.ForEach((x) => { x.SetActive(false); });
|
||||||
|
Models = Modeldic[511].ToList();
|
||||||
|
}
|
||||||
|
if (Input.GetKeyDown(KeyCode.Alpha2))
|
||||||
|
{
|
||||||
|
|
||||||
//先重置高亮，再重置模型，否则初始化无法正确显示高亮
|
//先重置高亮，再重置模型，否则初始化无法正确显示高亮
|
||||||
Highlights = highlightsdic[512].ToList();
|
Highlights = highlightsdic[512].ToList();
|
||||||
Highlights_Backup = highlightsdic[512].ToList();
|
Highlights_Backup = highlightsdic[512].ToList();
|
||||||
Initialization(512);
|
Initialization(512);
|
||||||
Models.ForEach((x) => { x.SetActive(false); });
|
Models.ForEach((x) => { x.SetActive(false); });
|
||||||
Models = Modeldic[512].ToList();
|
Models = Modeldic[512].ToList();
|
||||||
|
}
|
||||||
|
if (Input.GetKeyDown(KeyCode.Alpha3))
|
||||||
|
{
|
||||||
|
|
||||||
|
//先重置高亮，再重置模型，否则初始化无法正确显示高亮
|
||||||
|
Highlights = highlightsdic[521].ToList();
|
||||||
|
Highlights_Backup = highlightsdic[521].ToList();
|
||||||
|
Initialization(521);
|
||||||
|
Models.ForEach((x) => { x.SetActive(false); });
|
||||||
|
Models = Modeldic[521].ToList();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -192,18 +211,6 @@ public class LineManager : SerializedMonoBehaviour
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//if (point1 != null)
|
|
||||||
//{
|
|
||||||
// point2 = point;
|
|
||||||
//}
|
|
||||||
//if (point1 == null)
|
|
||||||
//{
|
|
||||||
// point1 = point;
|
|
||||||
//}
|
|
||||||
//if (point1 != null && point2 != null)
|
|
||||||
//{
|
|
||||||
// //StartCoroutine(Checkconnection(point1, point2));
|
|
||||||
//}
|
|
||||||
if (point.name.Equals("diannaoxian"))
|
if (point.name.Equals("diannaoxian"))
|
||||||
{
|
{
|
||||||
if (!lineData.Modelname.Contains(point.name))
|
if (!lineData.Modelname.Contains(point.name))
|
||||||
|
|
@ -218,24 +225,10 @@ public class LineManager : SerializedMonoBehaviour
|
||||||
|
|
||||||
if (point.name.Equals("开关"))
|
if (point.name.Equals("开关"))
|
||||||
{
|
{
|
||||||
//if (!lineData.Modelname.Contains(point.name))
|
|
||||||
//{
|
|
||||||
// allline++;
|
|
||||||
// lineData.Modelname.Add(point.name);
|
|
||||||
// string json = JsonConvert.SerializeObject(lineData);
|
|
||||||
// PlayerPrefs.SetString("LineData", json);
|
|
||||||
//}
|
|
||||||
point.DORotateQuaternion(Quaternion.Euler(-17f, 0, 0), 0.5f);
|
point.DORotateQuaternion(Quaternion.Euler(-17f, 0, 0), 0.5f);
|
||||||
}
|
}
|
||||||
if (point.name.Equals("闸"))
|
if (point.name.Equals("闸"))
|
||||||
{
|
{
|
||||||
//if (!lineData.Modelname.Contains(point.name))
|
|
||||||
//{
|
|
||||||
// allline++;
|
|
||||||
// lineData.Modelname.Add(point.name);
|
|
||||||
// string json = JsonConvert.SerializeObject(lineData);
|
|
||||||
// PlayerPrefs.SetString("LineData", json);
|
|
||||||
//}
|
|
||||||
Material material = Lights.GetComponent<MeshRenderer>().material;
|
Material material = Lights.GetComponent<MeshRenderer>().material;
|
||||||
material.EnableKeyword("_EMISSION");
|
material.EnableKeyword("_EMISSION");
|
||||||
material.color = UnityEngine.Color.red;
|
material.color = UnityEngine.Color.red;
|
||||||
|
|
@ -353,10 +346,10 @@ public class LineManager : SerializedMonoBehaviour
|
||||||
{
|
{
|
||||||
if (!lineData.Modelname.Contains(Models[i].name))
|
if (!lineData.Modelname.Contains(Models[i].name))
|
||||||
{
|
{
|
||||||
allline++;
|
|
||||||
lineData.Modelname.Add(Models[i].name);
|
lineData.Modelname.Add(Models[i].name);
|
||||||
string json = JsonConvert.SerializeObject(lineData);
|
string json = JsonConvert.SerializeObject(lineData);
|
||||||
PlayerPrefs.SetString("LineData", json);
|
PlayerPrefs.SetString("LineData", json);
|
||||||
|
allline++;
|
||||||
}
|
}
|
||||||
Models[i].SetActive(true);
|
Models[i].SetActive(true);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,15 @@
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
public enum DrawingState
|
||||||
|
{
|
||||||
|
Idle, // 空闲状态
|
||||||
|
SelectingStart, // 选择起点
|
||||||
|
SelectingEnd // 选择终点
|
||||||
|
}
|
||||||
public class LineShowModel : MonoBehaviour
|
public class LineShowModel : MonoBehaviour
|
||||||
{
|
{
|
||||||
public enum DrawingState
|
|
||||||
{
|
|
||||||
Idle, // 空闲状态
|
|
||||||
SelectingStart, // 选择起点
|
|
||||||
SelectingEnd // 选择终点
|
|
||||||
}
|
|
||||||
|
|
||||||
[Header("Á¬ÏßÉèÖÃ")]
|
[Header("Á¬ÏßÉèÖÃ")]
|
||||||
public Material wireMaterial;
|
public Material wireMaterial;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue