feat: 打孔带更新

Assets/GameContent/Feature_Memory/Art/打孔带收藏簿.psd.meta

@@ -107,8 +107,8 @@ ScriptedImporter:
       serializedVersion: 2
       x: 4
       y: 373
-      width: 34
-      height: 83
+      width: 36
+      height: 85
     spriteID: 8d5471f026f7c2d45b7eb72a1334cb2d
     spriteBone: []
     spriteOutline: []
@@ -118,7 +118,7 @@ ScriptedImporter:
     edges: []
     tessellationDetail: 0
     uvTransform: {x: 4, y: 373}
-    spritePosition: {x: 10, y: 40}
+    spritePosition: {x: 46, y: 40}
   - name: "\u5361\u53E3\u7EC4"
     originalName: 
     pivot: {x: 0.5, y: 0.5}
@@ -148,7 +148,7 @@ ScriptedImporter:
     rect:
       serializedVersion: 2
       x: 4
-      y: 464
+      y: 466
       width: 78
       height: 34
     spriteID: 8d1617363ca09d1488692bfaf74d8f32
@@ -159,7 +159,7 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 4, y: 464}
+    uvTransform: {x: 4, y: 466}
     spritePosition: {x: 306, y: 163}
   - name: "\u7C3F\u5B50"
     originalName: 
@@ -339,7 +339,7 @@ ScriptedImporter:
   documentPivot: {x: 0, y: 0}
   documentAlignment: 7
   importHiddenLayers: 0
-  layerMappingOption: 2
+  layerMappingOption: 0
   generatePhysicsShape: 0
   paperDollMode: 0
   keepDupilcateSpriteName: 1
@@ -356,7 +356,7 @@ ScriptedImporter:
     isGroup: 0
     parentIndex: -1
     spriteID: 8d5471f026f7c2d45b7eb72a1334cb2d
-    layerID: 7
+    layerID: 14
     mosaicPosition: {x: 4, y: 373}
     flatten: 0
     isImported: 1
@@ -377,7 +377,7 @@ ScriptedImporter:
     parentIndex: -1
     spriteID: 8d1617363ca09d1488692bfaf74d8f32
     layerID: 10
-    mosaicPosition: {x: 4, y: 464}
+    mosaicPosition: {x: 4, y: 466}
     flatten: 0
     isImported: 1
     isVisible: 1

Assets/GameContent/Feature_Memory/Art/放映机.psb.meta

@@ -101,8 +101,8 @@ ScriptedImporter:
     border: {x: 0, y: 0, z: 0, w: 0}
     rect:
       serializedVersion: 2
-      x: 1919
-      y: 4
+      x: 791
+      y: 221
       width: 82
       height: 21
     spriteID: 162c8bf032df4a7489d47b6cedffe118
@@ -113,29 +113,8 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 1919, y: 4}
+    uvTransform: {x: 791, y: 221}
     spritePosition: {x: 483, y: 163}
-  - name: "\u6253\u5B54\u5E26"
-    originalName: 
-    pivot: {x: 0.5, y: 0.5}
-    alignment: 0
-    border: {x: 0, y: 0, z: 0, w: 0}
-    rect:
-      serializedVersion: 2
-      x: 1008
-      y: 279
-      width: 68
-      height: 168
-    spriteID: 7b911a3ed902c7e41a4ef3f30f4f09f4
-    spriteBone: []
-    spriteOutline: []
-    vertices: []
-    spritePhysicsOutline: []
-    indices: 
-    edges: []
-    tessellationDetail: 0
-    uvTransform: {x: 518, y: 115}
-    spritePosition: {x: 490, y: 164}
   - name: "\u653E\u6620\u673A\u63D2\u5165\u53E3\u5185\u90E8"
     originalName: 
     pivot: {x: 0.5, y: 0.5}
@@ -143,8 +122,8 @@ ScriptedImporter:
     border: {x: 0, y: 0, z: 0, w: 0}
     rect:
       serializedVersion: 2
-      x: 1084
-      y: 367
+      x: 897
+      y: 133
       width: 72
       height: 35
     spriteID: a0bda809c603f14418c623132f4c4726
@@ -155,7 +134,7 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 596, y: 204}
+    uvTransform: {x: 409, y: -30}
     spritePosition: {x: 488, y: 163}
   - name: "\u653E\u6620\u673A\u63D2\u5165\u53E3"
     originalName: 
@@ -164,8 +143,8 @@ ScriptedImporter:
     border: {x: 0, y: 0, z: 0, w: 0}
     rect:
       serializedVersion: 2
-      x: 1164
-      y: 367
+      x: 897
+      y: 176
       width: 72
       height: 35
     spriteID: e48085212e4f1f84aa28fdc954f95153
@@ -176,7 +155,7 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 676, y: 204}
+    uvTransform: {x: 409, y: 13}
     spritePosition: {x: 488, y: 163}
   - name: "\u653E\u6620\u673A\u65CB\u8F6C\u94AE\u673A"
     originalName: 
@@ -185,8 +164,8 @@ ScriptedImporter:
     border: {x: 0, y: 0, z: 0, w: 0}
     rect:
       serializedVersion: 2
-      x: 1008
-      y: 455
+      x: 944
+      y: 4
       width: 49
       height: 49
     spriteID: 847e795a5a9fbdd44ae796e9c165ca76
@@ -197,7 +176,7 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 1008, y: 455}
+    uvTransform: {x: 944, y: 4}
     spritePosition: {x: 500, y: 93}
   - name: "\u5C4F\u5E55"
     originalName: 
@@ -206,8 +185,8 @@ ScriptedImporter:
     border: {x: 0, y: 0, z: 0, w: 0}
     rect:
       serializedVersion: 2
-      x: 1084
-      y: 279
+      x: 791
+      y: 133
       width: 98
       height: 80
     spriteID: 62587819e95600d45b5401697d2a0ad2
@@ -218,8 +197,29 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 609, y: 67}
+    uvTransform: {x: 316, y: -79}
     spritePosition: {x: 475, y: 212}
+  - name: "\u653E\u6620\u673A\u5916\u58F3"
+    originalName: 
+    pivot: {x: 0.5, y: 0.5}
+    alignment: 0
+    border: {x: 0, y: 0, z: 0, w: 0}
+    rect:
+      serializedVersion: 2
+      x: 534
+      y: 4
+      width: 249
+      height: 270
+    spriteID: 7a4e315f1f20f424fb03ce1adac6212d
+    spriteBone: []
+    spriteOutline: []
+    vertices: []
+    spritePhysicsOutline: []
+    indices: 
+    edges: []
+    tessellationDetail: 0
+    uvTransform: {x: 534, y: 4}
+    spritePosition: {x: 399, y: 79}
   - name: "\u653E\u6620\u673A\u906E\u7F69"
     originalName: 
     pivot: {x: 0.5, y: 0.5}
@@ -229,8 +229,8 @@ ScriptedImporter:
       serializedVersion: 2
       x: 4
       y: 4
-      width: 494
-      height: 267
+      width: 522
+      height: 293
     spriteID: 67d38c4099799044f9aa8ada7746ffa2
     spriteBone: []
     spriteOutline: []
@@ -240,19 +240,19 @@ ScriptedImporter:
     edges: []
     tessellationDetail: 0
     uvTransform: {x: 4, y: 4}
-    spritePosition: {x: 273, y: 82}
-  - name: "\u653E\u6620\u673A\u5916\u58F3"
+    spritePosition: {x: 246, y: 67}
+  - name: "\u5C4F\u5E55\u906E\u7F69"
     originalName: 
     pivot: {x: 0.5, y: 0.5}
     alignment: 0
     border: {x: 0, y: 0, z: 0, w: 0}
     rect:
       serializedVersion: 2
-      x: 1008
+      x: 791
       y: 4
-      width: 249
-      height: 267
-    spriteID: 7a4e315f1f20f424fb03ce1adac6212d
+      width: 145
+      height: 121
+    spriteID: e2e078377570a164baf7eb2e0c0ff66a
     spriteBone: []
     spriteOutline: []
     vertices: []
@@ -260,8 +260,8 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 1008, y: 4}
-    spritePosition: {x: 400, y: 82}
+    uvTransform: {x: 791, y: 4}
+    spritePosition: {x: 452, y: 190}
   - name: "\u80F6\u7247"
     originalName: 
     pivot: {x: 0.5, y: 0.5}
@@ -269,8 +269,8 @@ ScriptedImporter:
     border: {x: 0, y: 0, z: 0, w: 0}
     rect:
       serializedVersion: 2
-      x: 1265
-      y: 4
+      x: 4
+      y: 580
       width: 646
       height: 24
     spriteID: e1b276793320a1848990e54e35e1102b
@@ -281,7 +281,7 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 1265, y: 4}
+    uvTransform: {x: 4, y: 580}
     spritePosition: {x: 2, y: 239}
   - name: "\u653E\u6620\u673A\u80CC\u666F"
     originalName: 
@@ -290,9 +290,9 @@ ScriptedImporter:
     border: {x: 0, y: 0, z: 0, w: 0}
     rect:
       serializedVersion: 2
-      x: 506
-      y: 4
-      width: 494
+      x: 4
+      y: 305
+      width: 518
       height: 267
     spriteID: 578ed2827fbf05040a3ac6fd2a2eb153
     spriteBone: []
@@ -302,8 +302,8 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 506, y: 4}
-    spritePosition: {x: 273, y: 82}
+    uvTransform: {x: 4, y: 305}
+    spritePosition: {x: 250, y: 82}
   characterData:
     bones: []
     parts: []
@@ -415,7 +415,7 @@ ScriptedImporter:
     isGroup: 1
     parentIndex: -1
     spriteID: 8f36b3aeecce75f41ab831f9e917f2a1
-    layerID: 16
+    layerID: 19
     mosaicPosition: {x: 0, y: 0}
     flatten: 0
     isImported: 0
@@ -425,18 +425,8 @@ ScriptedImporter:
     isGroup: 0
     parentIndex: 0
     spriteID: 162c8bf032df4a7489d47b6cedffe118
-    layerID: 15
-    mosaicPosition: {x: 1919, y: 4}
-    flatten: 0
-    isImported: 1
-    isVisible: 1
-  - name: "\u6253\u5B54\u5E26"
-    spriteName: "\u6253\u5B54\u5E26"
-    isGroup: 0
-    parentIndex: 0
-    spriteID: 7b911a3ed902c7e41a4ef3f30f4f09f4
-    layerID: 14
-    mosaicPosition: {x: 1008, y: 279}
+    layerID: 18
+    mosaicPosition: {x: 791, y: 221}
     flatten: 0
     isImported: 1
     isVisible: 1
@@ -445,8 +435,8 @@ ScriptedImporter:
     isGroup: 0
     parentIndex: 0
     spriteID: a0bda809c603f14418c623132f4c4726
-    layerID: 13
-    mosaicPosition: {x: 1084, y: 367}
+    layerID: 17
+    mosaicPosition: {x: 897, y: 133}
     flatten: 0
     isImported: 1
     isVisible: 1
@@ -455,8 +445,8 @@ ScriptedImporter:
     isGroup: 0
     parentIndex: -1
     spriteID: e48085212e4f1f84aa28fdc954f95153
-    layerID: 11
-    mosaicPosition: {x: 1164, y: 367}
+    layerID: 15
+    mosaicPosition: {x: 897, y: 176}
     flatten: 0
     isImported: 1
     isVisible: 1
@@ -465,8 +455,8 @@ ScriptedImporter:
     isGroup: 0
     parentIndex: -1
     spriteID: 847e795a5a9fbdd44ae796e9c165ca76
-    layerID: 10
-    mosaicPosition: {x: 1008, y: 455}
+    layerID: 14
+    mosaicPosition: {x: 944, y: 4}
     flatten: 0
     isImported: 1
     isVisible: 1
@@ -475,18 +465,8 @@ ScriptedImporter:
     isGroup: 0
     parentIndex: -1
     spriteID: 62587819e95600d45b5401697d2a0ad2
-    layerID: 9
-    mosaicPosition: {x: 1084, y: 279}
-    flatten: 0
-    isImported: 1
-    isVisible: 1
-  - name: "\u653E\u6620\u673A\u906E\u7F69"
-    spriteName: "\u653E\u6620\u673A\u906E\u7F69"
-    isGroup: 0
-    parentIndex: -1
-    spriteID: 67d38c4099799044f9aa8ada7746ffa2
-    layerID: 21
-    mosaicPosition: {x: 4, y: 4}
+    layerID: 13
+    mosaicPosition: {x: 791, y: 133}
     flatten: 0
     isImported: 1
     isVisible: 1
@@ -495,8 +475,28 @@ ScriptedImporter:
     isGroup: 0
     parentIndex: -1
     spriteID: 7a4e315f1f20f424fb03ce1adac6212d
-    layerID: 18
-    mosaicPosition: {x: 1008, y: 4}
+    layerID: 4
+    mosaicPosition: {x: 534, y: 4}
+    flatten: 0
+    isImported: 1
+    isVisible: 1
+  - name: "\u653E\u6620\u673A\u906E\u7F69"
+    spriteName: "\u653E\u6620\u673A\u906E\u7F69"
+    isGroup: 0
+    parentIndex: -1
+    spriteID: 67d38c4099799044f9aa8ada7746ffa2
+    layerID: 22
+    mosaicPosition: {x: 4, y: 4}
+    flatten: 0
+    isImported: 1
+    isVisible: 1
+  - name: "\u5C4F\u5E55\u906E\u7F69"
+    spriteName: "\u5C4F\u5E55\u906E\u7F69"
+    isGroup: 0
+    parentIndex: -1
+    spriteID: e2e078377570a164baf7eb2e0c0ff66a
+    layerID: 23
+    mosaicPosition: {x: 791, y: 4}
     flatten: 0
     isImported: 1
     isVisible: 1
@@ -506,7 +506,7 @@ ScriptedImporter:
     parentIndex: -1
     spriteID: e1b276793320a1848990e54e35e1102b
     layerID: 3
-    mosaicPosition: {x: 1265, y: 4}
+    mosaicPosition: {x: 4, y: 580}
     flatten: 0
     isImported: 1
     isVisible: 1
@@ -516,7 +516,7 @@ ScriptedImporter:
     parentIndex: -1
     spriteID: 578ed2827fbf05040a3ac6fd2a2eb153
     layerID: 2
-    mosaicPosition: {x: 506, y: 4}
+    mosaicPosition: {x: 4, y: 305}
     flatten: 0
     isImported: 1
     isVisible: 1

Assets/GameContent/Feature_Memory/Prefabs/PunchTapeCanvas.prefab

@@ -1612,7 +1612,6 @@ GameObject:
   m_Component:
   - component: {fileID: 3989752283083909171}
   - component: {fileID: 4898883305432867861}
-  - component: {fileID: 8387068626982547573}
   m_Layer: 5
   m_Name: Back
   m_TagString: Untagged
@@ -1653,36 +1652,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6950913950411107678}
   m_CullTransparentMesh: 1
---- !u!114 &8387068626982547573
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6950913950411107678}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: -26309010111099884, guid: e9415304abb986643be762d6adb803f3, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &7378000248900194247
 GameObject:
   m_ObjectHideFlags: 0
@@ -2144,7 +2113,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -3, y: -129}
-  m_SizeDelta: {x: 174, y: 422}
+  m_SizeDelta: {x: 180, y: 425}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2100153884298088836
 CanvasRenderer:

Assets/GameContent/Feature_Memory/Prefabs/PunchTapeForMem.prefab

@@ -1,5 +1,41 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2143112861795894348
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7898913313812929341}
+  m_Layer: 5
+  m_Name: Info
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7898913313812929341
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2143112861795894348}
+  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:
+  - {fileID: 7924894876819984995}
+  m_Father: {fileID: 6036857918381590041}
+  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: 0, y: 56}
+  m_SizeDelta: {x: 400, y: 38}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2260198552944312515
 GameObject:
   m_ObjectHideFlags: 0
@@ -32,6 +68,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4993650456917624668}
+  - {fileID: 7898913313812929341}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -108,8 +145,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 7924894876819984995}
+  m_Children: []
   m_Father: {fileID: 6036857918381590041}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -186,12 +222,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 4993650456917624668}
+  m_Father: {fileID: 7898913313812929341}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -100, y: 55.8}
-  m_SizeDelta: {x: -200, y: -100}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 100, y: -19.2}
+  m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8499524202528292966
 CanvasRenderer:
@@ -230,8 +266,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4278190080
-  m_fontColor: {r: 0, g: 0, b: 0, a: 1}
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -255,7 +291,7 @@ MonoBehaviour:
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 0
-  m_HorizontalAlignment: 2
+  m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
@@ -284,7 +320,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 6.3168945, z: -199.4336, w: 7.2193604}
+  m_margin: {x: 0, y: 6.3168945, z: -0.080078125, w: 7.2193604}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0

Assets/Scripts/FixSystem/PunchType/PunchTapeYarnCommand.cs

@@ -4,7 +4,7 @@ using Yarn.Unity;
 
 namespace AibisDream
 {
-    public static class PunchTypeYarnCommand
+    public static class PunchTapeYarnCommand
     {
         private static PunchTapeManager PunchTapeManager => PunchTapeManager.Instance;
         private static PunchTapePrinter PunchTapePrinter => PunchTapeManager.Instance.PunchTapePrinter;

Assets/Yarn/FP/FP_Peipei2/Stage5_UF检查.yarn

@@ -87,15 +87,15 @@ ULM自训练进程: 检测到进程接管请求！正在识别手动选择的目
 
 <<if $currentEyeTarget == "sky">>
         // <<set $targetDescription = "蓝色天空">>
-    <<set $targetDescription = "l10n.天空，蓝色">>
+    <<set $targetDescription = "l10n.天空">>
     // <<set $memoryDescription = "窗外的天空,是蓝色的，我总是生病，我记得…">>
 <<elseif $currentEyeTarget == "plant">>
     // <<set $targetDescription = "绿色">>
-    <<set $targetDescription = "l10n.植物，绿色">>
+    <<set $targetDescription = "l10n.植物">>
     // <<set $memoryDescription = "海浪一样的草地,是绿色的，我们在那绘画，我记得...">>
 <<elseif $currentEyeTarget == "poster">>
     // <<set $targetDescription = "红色">>
-    <<set $targetDescription = "l10n.人物面部">>
+    <<set $targetDescription = "l10n.海报">>
     // <<set $memoryDescription = "生气涨红的脸，是红色的，她总是生气，我记得的...">>
 <<endif>>