tinbird/aibis-dream
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复小bug

Browse Source
This commit is contained in:
bottlefish
2024-12-11 18:52:54 +08:00
parent 97645fece3
commit aee673a041
4 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Prototype/佩佩/佩佩视觉模块.unity
+14 -3
View File
@@ -4687,6 +4687,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2a37d0f43cb6f14c8011e55a756c448, type: 3}
m_Name:
m_EditorClassIdentifier:
plug: {fileID: 0}
notAlowedDeep: 0
targetData: {fileID: 0}
--- !u!114 &177996565
@@ -10530,9 +10531,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
heatMaterial: {fileID: 2100000, guid: 72b0010e1307b614ebb427b0d8dc54ee, type: 2}
Pos:
- {fileID: 217924070}
- {fileID: 1376336156}
- {fileID: 1190564545}
- {fileID: 1376336156}
- {fileID: 217924070}
- {fileID: 1543897235}
- {fileID: 2077058953}
- {fileID: 157256356}
@@ -11043,6 +11044,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2a37d0f43cb6f14c8011e55a756c448, type: 3}
m_Name:
m_EditorClassIdentifier:
plug: {fileID: 0}
notAlowedDeep: 0
targetData: {fileID: 0}
--- !u!21 &461186577
@@ -13504,6 +13506,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2a37d0f43cb6f14c8011e55a756c448, type: 3}
m_Name:
m_EditorClassIdentifier:
plug: {fileID: 0}
notAlowedDeep: 0
targetData: {fileID: 0}
--- !u!114 &572427498
@@ -23843,6 +23846,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2a37d0f43cb6f14c8011e55a756c448, type: 3}
m_Name:
m_EditorClassIdentifier:
plug: {fileID: 0}
notAlowedDeep: 0
targetData: {fileID: 0}
--- !u!114 &1079123348
@@ -24061,6 +24065,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2a37d0f43cb6f14c8011e55a756c448, type: 3}
m_Name:
m_EditorClassIdentifier:
plug: {fileID: 0}
notAlowedDeep: 0
targetData: {fileID: 0}
--- !u!114 &1081427057
@@ -25431,6 +25436,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2a37d0f43cb6f14c8011e55a756c448, type: 3}
m_Name:
m_EditorClassIdentifier:
plug: {fileID: 0}
notAlowedDeep: 0
targetData: {fileID: 0}
--- !u!1 &1132009642
@@ -28009,7 +28015,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -2.4, y: -3.18}
m_AnchoredPosition: {x: -2.48, y: -3.45}
m_SizeDelta: {x: 2.5, y: 2.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1257460299
@@ -30931,6 +30937,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2a37d0f43cb6f14c8011e55a756c448, type: 3}
m_Name:
m_EditorClassIdentifier:
plug: {fileID: 0}
notAlowedDeep: 0
targetData: {fileID: 0}
--- !u!21 &1373427824
@@ -32473,6 +32480,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2a37d0f43cb6f14c8011e55a756c448, type: 3}
m_Name:
m_EditorClassIdentifier:
plug: {fileID: 0}
notAlowedDeep: 0
targetData: {fileID: 0}
--- !u!1 &1460543628
@@ -34837,6 +34845,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2a37d0f43cb6f14c8011e55a756c448, type: 3}
m_Name:
m_EditorClassIdentifier:
plug: {fileID: 0}
notAlowedDeep: 1
targetData: {fileID: 0}
--- !u!21 &1609483042
@@ -37700,6 +37709,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2a37d0f43cb6f14c8011e55a756c448, type: 3}
m_Name:
m_EditorClassIdentifier:
plug: {fileID: 0}
notAlowedDeep: 0
targetData: {fileID: 0}
--- !u!1 &1700390216
@@ -40333,6 +40343,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2a37d0f43cb6f14c8011e55a756c448, type: 3}
m_Name:
m_EditorClassIdentifier:
plug: {fileID: 0}
notAlowedDeep: 0
targetData: {fileID: 0}
--- !u!21 &1770343418
Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs
+2 -4
View File
@@ -98,7 +98,7 @@ public class HeatMapController : MonoBehaviour
{
RectTransform transform=Pos[i].GetComponent<RectTransform>();
if(i==2)
if(i==0)
{
points[i] = new Vector4(Pos[i].position.x, Pos[i].position.y, uftempture, 0);
@@ -111,9 +111,7 @@ public class HeatMapController : MonoBehaviour
{
points[i] = new Vector4(Pos[i].position.x, Pos[i].position.y, modulesTempture, 0); // (x, y, z, temperature)
}
}
properties[i] = new Vector4(transform.rect.width*1, transform.rect.height*1, 0.0f, 0.0f); // (boxsize x, boxsize y, unused, unused)
}
Assets/Scripts/FixSystem/HeatMap/HeatTest.shader
+6 -7
View File
@@ -4,9 +4,9 @@ Shader "Unlit/HeatTest"
{
//_MainTex ("Texture", 2D) = "white" {}
_RampTexture ("_RampTexture", 2D) = "white" {}
_UFtexture ("_UFtexture", 2D) = "white" {}
_Eyetexture ("_Eyetexture", 2D) = "white" {}
_Memorytexture ("_Memorytexture", 2D) = "white" {}
_Eyetexture ("_Eyetexture", 2D) = "white" {}
_UFtexture ("_UFtexture", 2D) = "white" {}
_Emotexture ("_Emotexture", 2D) = "white" {}
_Logictexture ("_Logictexture", 2D) = "white" {}
_Speaktexture ("_Speaktexture", 2D) = "white" {}
@@ -51,10 +51,9 @@ Shader "Unlit/HeatTest"
sampler2D _Noise;
uniform float4 _Points[7]; // (x, y) = center z = tempture
uniform float4 _Properties[7]; // (x,y) = boxsize
sampler2D _UFtexture;
sampler2D _Eyetexture ;
sampler2D _Memorytexture;
sampler2D _Eyetexture ;
sampler2D _UFtexture;
sampler2D _Emotexture;
sampler2D _Logictexture ;
sampler2D _Speaktexture;
@@ -115,11 +114,11 @@ float remap(float x, float a, float b, float c, float d)
float GetAlphaForTexture(int j, float2 localPos)
{
if (j == 0)
return tex2D(_UFtexture, localPos).a;
return tex2D(_Memorytexture, localPos).a;
else if (j == 1)
return tex2D(_Eyetexture, localPos).a;
else if (j == 2)
return tex2D(_Memorytexture, localPos).a;
return tex2D(_UFtexture, localPos).a;
else if (j == 3)
return tex2D(_Emotexture, localPos).a;
else if (j == 4)
Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs
+8
View File
@@ -172,11 +172,19 @@ public class OscilloscopeController : MonoBehaviour
else if(heatNum>0)
{
screenText.text="模块过热，无法深入";
screenText.color=Color.red;
//transitionManager.SetViewAvailability(trimmedString, true);
//DeepInButton.interactable=false;
//HandleDeepIn();
}
else if(currentSocket.targetData.IsRunning())
{
screenText.text="记忆正在被外部连续调取，无法进入";
screenText.color=Color.red;
//waveformVisualizer.gameObject.SetActive(false);
// return;
}
else if(currentSocket.targetData.HasExternalError())
{
transitionManager.SetViewAvailability(trimmedString, true);