按照新系统组装peipei

This commit is contained in:
2024-12-14 17:47:15 +08:00
parent 8f28951f7a
commit c33f8425ec
17 changed files with 7258 additions and 7140 deletions
@@ -37,6 +37,16 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5acc7b09cc2b5e34d94171f018eb47d0
m_Address: PeipeiFixScene
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8220a2f6b45b8dd4e8dab6e1aaefb073
m_Address: ExpressFixScene
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
@@ -0,0 +1,198 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3506613774900747202
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3319291487393607640}
- component: {fileID: 230090618675107037}
- component: {fileID: 8433616502553146576}
- component: {fileID: 1631752023640685220}
m_Layer: 0
m_Name: InteractiveLineSegmentNew
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3319291487393607640
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3506613774900747202}
serializedVersion: 2
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: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!120 &230090618675107037
LineRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3506613774900747202}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 51099a9679b002c46b76c25f9ac139e3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 3
m_Positions:
- {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 1}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.02299881
value: 0.19807816
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
key0: {r: 0.6415094, g: 0.0145247225, b: 0.062264785, a: 1}
key1: {r: 0.94509804, g: 0, b: 0.22703783, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 6
numCapVertices: 6
alignment: 0
textureMode: 0
textureScale: {x: 1, y: 1}
shadowBias: 0.5
generateLightingData: 0
m_MaskInteraction: 0
m_UseWorldSpace: 1
m_Loop: 0
m_ApplyActiveColorSpace: 1
--- !u!61 &8433616502553146576
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3506613774900747202}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 6.61, y: -0.60116494}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!114 &1631752023640685220
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3506613774900747202}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 067e5e9e7bcd7a2429feff639d0ef630, type: 3}
m_Name:
m_EditorClassIdentifier:
lineRenderer: {fileID: 0}
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 43e57126c498f174d9bca18cca08993e
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
+156
View File
@@ -0,0 +1,156 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3614166255594274803
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9034087187549040666}
- component: {fileID: 8979707155830308861}
- component: {fileID: -3073236352691771152}
m_Layer: 0
m_Name: PhysicLinePrefabNew
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &9034087187549040666
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3614166255594274803}
serializedVersion: 2
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: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!120 &8979707155830308861
LineRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3614166255594274803}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 51099a9679b002c46b76c25f9ac139e3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 5
m_Positions:
- {x: 0, y: 0, z: 0}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.02299881
value: 0.20912552
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 1, g: 1, b: 1, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 6
numCapVertices: 6
alignment: 0
textureMode: 0
textureScale: {x: 1, y: 1}
shadowBias: 0.5
generateLightingData: 0
m_MaskInteraction: 0
m_UseWorldSpace: 1
m_Loop: 0
m_ApplyActiveColorSpace: 1
--- !u!114 &-3073236352691771152
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3614166255594274803}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1198bee0150e12d4aa20514b2c8f3362, type: 3}
m_Name:
m_EditorClassIdentifier:
segmentSpacing: 0.1
k: 30
start: {x: 0, y: 0, z: 0}
end: {x: 0, y: 0, z: 0}
lineRenderer: {fileID: 0}
gravity: -9.8
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: befc2e1cb50eae541870ccb46e98e3ee
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
File diff suppressed because it is too large Load Diff
@@ -541,12 +541,12 @@ MonoBehaviour:
m_EditorClassIdentifier:
config:
samples: 1024
amplitude: 0.6
amplitude: 0.48
spikeRange: 20
spatialFrequency: 1
temporalFrequency: 0.1
targetWaveformNoiseAmplitude: 0.1
noiseAmplitude: 0.5
noiseAmplitude: 0.2
noiseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
clearColor: {r: 0, g: 1, b: 0, a: 1}
hotColor: {r: 1, g: 0, b: 0, a: 1}
@@ -1275,7 +1275,7 @@ MeshRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 5
m_SortingOrder: 6
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &3869349595394045992
MonoBehaviour:
@@ -1665,7 +1665,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 4
m_SortingOrder: 5
m_Sprite: {fileID: -4876564293708829301, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
+5 -3
View File
@@ -2,9 +2,11 @@
tags:
---
<<indoor>>
<<load_scene 佩佩视觉模块>>
<<ShowHeatMap Plug true>>
<<SetHeat Plug 2>>
<<load_scene PeipeiFixScene>>
我: 进入了
// <<load_scene 佩佩视觉模块>>
// <<ShowHeatMap Plug true>>
// <<SetHeat Plug 2>>
===
title: choice
File diff suppressed because it is too large Load Diff
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5acc7b09cc2b5e34d94171f018eb47d0
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
File diff suppressed because it is too large Load Diff
@@ -29,7 +29,7 @@ public class HeatMapController : MonoBehaviour
//public float module=0.7f;
//public Texture2D hotspotShapeTexture; // 引用热点形状纹理
private float tempture = 0;
private float tempture = 1;
//public GameObject heatMap;
public float Tempture
@@ -86,7 +86,8 @@ public class HeatMapController : MonoBehaviour
for (int i = 0; i < 7; i++)
{
RectTransform transform=Pos[i].GetComponent<RectTransform>();
//RectTransform transform=Pos[i].GetComponent<RectTransform>();
Transform transform=Pos[i].GetComponent<Transform>();
Debug.Log($"Point {i}: {points[i]}");
if (i == 0)
@@ -101,8 +102,13 @@ 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)
}
Sprite currentSprite=transform.GetComponent<SpriteRenderer>().sprite;
properties[i] = new Vector4(currentSprite.bounds.size.x, currentSprite.bounds.size.y, 0.0f, 0.0f); // (boxsize x, boxsize y, unused, unused)
Debug.Log($"Point {i}: {currentSprite.bounds.size.x}");
//properties[i] = new Vector4(transform.rect.width*1, transform.rect.height*1, 0.0f, 0.0f); // (boxsize x, boxsize y, unused, unused)
//properties[i] = new Vector4(transform.rect.width*1, transform.rect.height*1, 0.0f, 0.0f); // (boxsize x, boxsize y, unused, unused)
}
// 将数据传递给 Shader
+1 -1
View File
@@ -23,7 +23,7 @@ public class LineManager : MonoBehaviour
public GameObject physicLineSegmentPrefab;
public CustomCursor customCursor; // 自定义光标,你可以在 Inspector 中设置
//public CustomCursor customCursor; // 自定义光标,你可以在 Inspector 中设置
private bool isScissorsMode;
@@ -37,6 +37,7 @@ namespace AibisDream.FixSystem
{
// 插入后先播放wave
ShowWave();
if(DialogController.Instance!=null)
// 然后触发Yarn节点
DialogController.Instance.StartDialogNode(data.PlugInNodeName);
}
@@ -52,6 +53,7 @@ namespace AibisDream.FixSystem
{
if (!data.waveHasError) return;
// 如果有错误并且已经深入了
if(DialogController.Instance!=null)
DialogController.Instance.StartDialogNode(data.DeepInNodeName);
}
@@ -12,11 +12,11 @@ namespace AibisDream.FixSystem
#region
public BodyModule[] BodyModules { get; private set; }
public CableSystem CableSystem { get; private set; }
[HideInInspector]public BodyModule[] BodyModules { get; private set; }
[HideInInspector]public CableSystem CableSystem { get; private set; }
public GameObject bodyModulePrefab;
public Transform bodyModuleGroup;
public OscilloscopeSystem oscilloscopeSystem;
[HideInInspector]public Transform bodyModuleGroup;
[HideInInspector]public OscilloscopeSystem oscilloscopeSystem;
#endregion
@@ -37,8 +37,8 @@ namespace AibisDream.FixSystem
#region
public bool inHotErr;
public BodyModule curBodyModule;
[HideInInspector]public bool inHotErr;
[HideInInspector]public BodyModule curBodyModule;
#endregion
@@ -0,0 +1 @@
{"hasHotErr":false,"moduleDataArray":[{"moduleName":"Memory","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/记忆模块","modulePos":{"x":-2.524,"y":2.662,"z":0.0},"socketPos":{"x":0.092,"y":0.017,"z":0.0},"waveformType":0,"waveHasError":false},{"moduleName":"UF","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/UF底板","modulePos":{"x":-4.406,"y":0.431,"z":0.0},"socketPos":{"x":-0.243,"y":0.148,"z":0.0},"waveformType":0,"waveHasError":false},{"moduleName":"RightEye","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/右眼","modulePos":{"x":-0.471,"y":0.604,"z":0.0},"socketPos":{"x":-0.879,"y":-0.57,"z":0.0},"waveformType":0,"waveHasError":false},{"moduleName":"","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/色觉","modulePos":{"x":-2.554,"y":0.689,"z":0.0},"socketPos":{"x":-0.003,"y":-0.744,"z":0.0},"waveformType":0,"waveHasError":false},{"moduleName":"Emo","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/情绪模块","modulePos":{"x":-4.5,"y":2.16,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":0,"waveHasError":false},{"moduleName":"Logic","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/思维模块","modulePos":{"x":-0.67,"y":2.16,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":0,"waveHasError":false},{"moduleName":"Speak","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/讲话模块","modulePos":{"x":-2.58,"y":-2.51,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":0,"waveHasError":false}]}
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5b6000e0d9663a647b29e13c14c3ee70
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: