diff --git a/Assets/CGs.meta b/Assets/CGs.meta new file mode 100644 index 0000000..b9819da --- /dev/null +++ b/Assets/CGs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 23330c0bcd9d4534fb30c187968d32cc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CGs/cg2.mp4 b/Assets/CGs/cg2.mp4 new file mode 100644 index 0000000..14f44d1 Binary files /dev/null and b/Assets/CGs/cg2.mp4 differ diff --git a/Assets/CGs/cg2.mp4.meta b/Assets/CGs/cg2.mp4.meta new file mode 100644 index 0000000..2548cb0 --- /dev/null +++ b/Assets/CGs/cg2.mp4.meta @@ -0,0 +1,18 @@ +fileFormatVersion: 2 +guid: 0b064041d7d08df45af2dcadfbddf5d8 +VideoClipImporter: + externalObjects: {} + serializedVersion: 2 + frameRange: 0 + startFrame: -1 + endFrame: -1 + colorSpace: 0 + deinterlace: 0 + encodeAlpha: 0 + flipVertical: 0 + flipHorizontal: 0 + importAudio: 1 + targetSettings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CGs/新建渲染器纹理.renderTexture b/Assets/CGs/新建渲染器纹理.renderTexture new file mode 100644 index 0000000..eeff3a0 --- /dev/null +++ b/Assets/CGs/新建渲染器纹理.renderTexture @@ -0,0 +1,38 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u65B0\u5EFA\u6E32\u67D3\u5668\u7EB9\u7406" + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 3 + m_Width: 1920 + m_Height: 1080 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Assets/CGs/新建渲染器纹理.renderTexture.meta b/Assets/CGs/新建渲染器纹理.renderTexture.meta new file mode 100644 index 0000000..09d8094 --- /dev/null +++ b/Assets/CGs/新建渲染器纹理.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6d9157ca3fda02247bf6b0c548c30450 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/勍/InteractTest.unity b/Assets/Scenes/勍/InteractTest.unity index b19c534..2a1c012 100644 --- a/Assets/Scenes/勍/InteractTest.unity +++ b/Assets/Scenes/勍/InteractTest.unity @@ -149,7 +149,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5352854} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -8.47, y: 0.4, z: 0} + m_LocalPosition: {x: -8.83, y: 0.4, z: 0} m_LocalScale: {x: 1.54, y: 1.54, z: 1.26} m_Children: [] m_Father: {fileID: 288199589} @@ -246,7 +246,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 15582731} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 7.623, y: 0, z: 0} + m_LocalPosition: {x: 7.9469995, y: 0, z: 0} m_LocalScale: {x: 0.66, y: 0.66, z: 0.66} m_Children: [] m_Father: {fileID: 2122669497} @@ -739,7 +739,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 226789349} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 8.47, y: 0.34000003, z: -10} + m_LocalPosition: {x: 8.83, y: 0.34000003, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -1889,7 +1889,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 661209885} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 6.7760005, y: 0, z: 0} + m_LocalPosition: {x: 7.064, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2122669497} @@ -2045,7 +2045,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 781772278} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 8.47, y: 0.34000003, z: -10} + m_LocalPosition: {x: 8.83, y: 0.34000003, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 903864635} @@ -2154,6 +2154,7 @@ MonoBehaviour: P1Pos: {fileID: 1800855454} P2Pos: {fileID: 29782801} offset: {x: 2.5, y: 2.5} + end: 0 --- !u!1 &900617625 GameObject: m_ObjectHideFlags: 0 @@ -3027,7 +3028,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1449312143} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.235, y: 0, z: 0} + m_LocalPosition: {x: 4.415, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2122669497} @@ -3127,6 +3128,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9222d1d92d354f43bf3ecf3ad5f5e68, type: 3} m_Name: m_EditorClassIdentifier: + currentConversation: {fileID: 0} --- !u!4 &1473915067 Transform: m_ObjectHideFlags: 0 @@ -3194,6 +3196,7 @@ MonoBehaviour: P1Pos: {fileID: 1800855454} P2Pos: {fileID: 29782801} offset: {x: 2.5, y: 2.5} + end: 0 --- !u!1 &1558198558 GameObject: m_ObjectHideFlags: 0 @@ -3554,6 +3557,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e1b2323b7275ad44c94037be9f2ccec3, type: 3} m_Name: m_EditorClassIdentifier: + m_event: {fileID: 0} + m_stage: {fileID: 0} neededType: 2 state: 1 --- !u!212 &1750262985 @@ -3756,7 +3761,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1800855449} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 8.47, y: -1.66, z: 0} + m_LocalPosition: {x: 8.83, y: -1.66, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 470232330} @@ -3988,7 +3993,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1918365588} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.6940001, y: 0, z: 0} + m_LocalPosition: {x: 1.766, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2122669497} diff --git a/Assets/Scenes/勍/场景3.unity b/Assets/Scenes/勍/场景3.unity index 0425d81..422c412 100644 --- a/Assets/Scenes/勍/场景3.unity +++ b/Assets/Scenes/勍/场景3.unity @@ -157,6 +157,93 @@ Transform: m_CorrespondingSourceObject: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} m_PrefabInstance: {fileID: 566865784} m_PrefabAsset: {fileID: 0} +--- !u!1 &127674804 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 127674805} + - component: {fileID: 127674807} + - component: {fileID: 127674806} + - component: {fileID: 127674808} + m_Layer: 5 + m_Name: "CG\u7BA1\u7406\u5458" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &127674805 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 127674804} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5164, y: 1.5164, z: 1.5164} + m_Children: + - {fileID: 1775345958} + m_Father: {fileID: 273073465} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -3, y: -7} + m_SizeDelta: {x: -640.56506, y: -334.04953} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &127674806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 127674804} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 10916, guid: 0000000000000000f000000000000000, type: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &127674807 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 127674804} + m_CullTransparentMesh: 1 +--- !u!114 &127674808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 127674804} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b3954127e8ca6e448e4f5e6d742e054, type: 3} + m_Name: + m_EditorClassIdentifier: + CGs: [] --- !u!1 &143837087 GameObject: m_ObjectHideFlags: 0 @@ -187,6 +274,72 @@ Transform: m_Father: {fileID: 1801910678} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &145275566 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 145275569} + - component: {fileID: 145275568} + - component: {fileID: 145275567} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &145275567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 145275566} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &145275568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 145275566} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &145275569 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 145275566} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &245386978 GameObject: m_ObjectHideFlags: 0 @@ -344,6 +497,106 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &273073461 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 273073465} + - component: {fileID: 273073464} + - component: {fileID: 273073463} + - component: {fileID: 273073462} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &273073462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 273073461} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 55 +--- !u!114 &273073463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 273073461} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &273073464 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 273073461} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &273073465 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 273073461} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 127674805} + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &520470564 GameObject: m_ObjectHideFlags: 0 @@ -370,7 +623,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 520470564} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -13.98476, y: 1.36, z: 0} + m_LocalPosition: {x: -13.983922, y: 1.36, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 771707216} @@ -1349,7 +1602,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 758554695} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -17.980406, y: 1.75, z: 0} + m_LocalPosition: {x: -17.979328, y: 1.75, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} m_Children: [] m_Father: {fileID: 771707216} @@ -1515,7 +1768,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 775402495} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -21.72, y: 0.14999998, z: -10} + m_LocalPosition: {x: -25.56, y: -0.3699999, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2079299524} @@ -1539,6 +1792,79 @@ MonoBehaviour: m_BoundingShape2D: {fileID: 1206805637} m_ConfineScreenEdges: 1 m_Damping: 0 +--- !u!1 &787777828 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 787777829} + - component: {fileID: 787777830} + - component: {fileID: 787777831} + m_Layer: 0 + m_Name: "\u51E4\u51F0\u6F14\u51FA\u89E6\u53D1\u5668" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &787777829 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 787777828} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 18.75, y: -0.43, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1144265960} + m_Father: {fileID: 1350588867} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &787777830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 787777828} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a08702285d1216941b48b6d42e06bf82, type: 3} + m_Name: + m_EditorClassIdentifier: + m_event: {fileID: 0} + m_stage: {fileID: 1144265961} +--- !u!61 &787777831 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 787777828} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + 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!1 &789055111 GameObject: m_ObjectHideFlags: 0 @@ -1647,7 +1973,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963605171} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 19.97823, y: 1.6, z: 0} + m_LocalPosition: {x: 19.977032, y: 1.6, z: 0} m_LocalScale: {x: 1.7, y: 1.7, z: 2} m_Children: [] m_Father: {fileID: 675942874} @@ -1745,7 +2071,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1067217490} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -12.665646, y: -0.52, z: 0} + m_LocalPosition: {x: -12.665406, y: -0.52, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 630093755} @@ -1865,6 +2191,51 @@ Transform: m_Father: {fileID: 1801910678} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1144265959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1144265960} + - component: {fileID: 1144265961} + m_Layer: 0 + m_Name: "\u51E4\u51F0" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1144265960 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1144265959} + 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_Children: [] + m_Father: {fileID: 787777829} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1144265961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1144265959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0452ca03894ec814a820bde0997076e7, type: 3} + m_Name: + m_EditorClassIdentifier: + isPlaying: 0 + yufu: {fileID: 1297731197} --- !u!1 &1148879750 GameObject: m_ObjectHideFlags: 0 @@ -2072,6 +2443,224 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1297731196 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -7270117784625415873, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -7270117784625415873, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: -6975861736583330436, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -6975861736583330436, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: -6094979069657214950, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -6094979069657214950, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: -4684080122663859018, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -4684080122663859018, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: -4611080708904030687, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -4611080708904030687, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: -2713449328852785023, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -2713449328852785023, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: -272516521266710048, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -272516521266710048, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: 751472210890163416, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 751472210890163416, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: 909161542005416385, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 909161542005416385, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: 1105392726835277074, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 1105392726835277074, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_LocalScale.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 1105392726835277074, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1105392726835277074, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_LocalPosition.x + value: 21.16 + objectReference: {fileID: 0} + - target: {fileID: 1105392726835277074, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_LocalPosition.y + value: -1.44 + objectReference: {fileID: 0} + - target: {fileID: 1105392726835277074, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1105392726835277074, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1105392726835277074, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1105392726835277074, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1105392726835277074, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1105392726835277074, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1105392726835277074, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1105392726835277074, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2892878664361459489, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2892878664361459489, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: 5570243216381771845, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5570243216381771845, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: 5831037673901693968, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5831037673901693968, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: 5892321452393962104, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_Name + value: "\u6E14\u592B" + objectReference: {fileID: 0} + - target: {fileID: 5892321452393962104, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7220821505117169067, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7220821505117169067, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: 8277073487214448673, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8277073487214448673, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: 8772085326587373577, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8772085326587373577, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 5098611169727499518, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} +--- !u!1 &1297731197 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5892321452393962104, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + m_PrefabInstance: {fileID: 1297731196} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1297731198 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297731197} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 3fd006cd2e6a2d24dbe1328024bb6cc2, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!4 &1297731199 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1105392726835277074, guid: 2bdf4e57e0e53004da283bd9016144c8, type: 3} + m_PrefabInstance: {fileID: 1297731196} + m_PrefabAsset: {fileID: 0} --- !u!1 &1319377546 GameObject: m_ObjectHideFlags: 0 @@ -2102,6 +2691,217 @@ Transform: m_Father: {fileID: 245386983} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1350588866 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1350588867} + m_Layer: 0 + m_Name: "\u6F14\u51FA" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1350588867 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1350588866} + 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_Children: + - {fileID: 787777829} + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1469216307 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1469216309} + - component: {fileID: 1469216308} + m_Layer: 0 + m_Name: "\u6811\u53F6" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1469216308 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1469216307} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 831774835 + m_SortingLayer: 6 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: c0f2fd242cf846143be501c88ec9a734, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.74, y: 4.87} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1469216309 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1469216307} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 10} + m_LocalScale: {x: 2, y: 2, z: 2} + m_Children: [] + m_Father: {fileID: 1754304756} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1528592911 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1528592913} + - component: {fileID: 1528592912} + m_Layer: 0 + m_Name: "\u5BF9\u8BDD\u7BA1\u7406\u5668" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1528592912 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1528592911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9222d1d92d354f43bf3ecf3ad5f5e68, type: 3} + m_Name: + m_EditorClassIdentifier: + currentConversation: {fileID: 0} +--- !u!4 &1528592913 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1528592911} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1573789361 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1573789362} + - component: {fileID: 1573789363} + m_Layer: 0 + m_Name: "\u6E14\u592B\u4E4B\u6307\u5F15" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1573789362 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573789361} + 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_Children: [] + m_Father: {fileID: 1717115422} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1573789363 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573789361} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6cb90a10e58c42d47b5142ad61ef47d8, type: 3} + m_Name: + m_EditorClassIdentifier: + contentList: + - {fileID: 21300000, guid: 3913503185e153e4a9c7e819ee1f5b65, type: 3} + speakerList: 01000000 + conversationName: "\u6E14\u592B\u4E4B\u6307\u5F15" + timePerSpeak: 3 + P1Background: {fileID: 21300000, guid: af1a632119c2cae4590e3d61c88b4ad9, type: 3} + P2Background: {fileID: 21300000, guid: 9c6f1b7fb2e78b541985e40a52b9ca6c, type: 3} + P1Pos: {fileID: 1801910678} + P2Pos: {fileID: 1297731199} + offset: {x: 1.8, y: 4} + end: 0 --- !u!1 &1612026504 GameObject: m_ObjectHideFlags: 0 @@ -2174,6 +2974,37 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1717115421 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1717115422} + m_Layer: 0 + m_Name: "\u5BF9\u8BDD" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1717115422 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1717115421} + 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_Children: + - {fileID: 1573789362} + m_Father: {fileID: 0} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1754304753 GameObject: m_ObjectHideFlags: 0 @@ -2253,9 +3084,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1754304753} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -19.97823, y: 0.040209174, z: -10} + m_LocalPosition: {x: -19.977032, y: -0.35302734, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 1469216309} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2326,6 +3158,94 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!1 &1775345957 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1775345958} + - component: {fileID: 1775345959} + - component: {fileID: 1775345960} + m_Layer: 5 + m_Name: CG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1775345958 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1775345957} + 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_Children: [] + m_Father: {fileID: 127674805} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1775345959 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1775345957} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d1cc526f2420065428c7ff9dcc3b51ec, type: 3} + m_Name: + m_EditorClassIdentifier: + CGName: "\u9E1F" + texture: {fileID: 8400000, guid: 6d9157ca3fda02247bf6b0c548c30450, type: 2} + time: 10 + onEnded: {fileID: 0} +--- !u!328 &1775345960 +VideoPlayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1775345957} + m_Enabled: 1 + m_VideoClip: {fileID: 32900000, guid: 0b064041d7d08df45af2dcadfbddf5d8, type: 3} + m_TargetCameraAlpha: 1 + m_TargetCamera3DLayout: 0 + m_TargetCamera: {fileID: 0} + m_TargetTexture: {fileID: 8400000, guid: 6d9157ca3fda02247bf6b0c548c30450, type: 2} + m_TimeReference: 0 + m_TargetMaterialRenderer: {fileID: 0} + m_TargetMaterialProperty: _MainTex + m_RenderMode: 2 + m_AspectRatio: 2 + m_DataSource: 0 + m_PlaybackSpeed: 1 + m_AudioOutputMode: 2 + m_TargetAudioSources: + - {fileID: 0} + m_DirectAudioVolumes: + - 1 + m_Url: + m_EnabledAudioTracks: 01 + m_DirectAudioMutes: 00 + m_ControlledAudioTrackCount: 1 + m_PlayOnAwake: 1 + m_SkipOnDrop: 1 + m_Looping: 0 + m_WaitForFirstFrame: 1 + m_FrameReadyEventEnabled: 0 + m_VideoShaders: [] --- !u!1 &1801910673 GameObject: m_ObjectHideFlags: 0 @@ -2475,7 +3395,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1801910673} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -21.72, y: -1.85, z: 0} + m_LocalPosition: {x: -25.56, y: -2.37, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 39548311} @@ -2592,7 +3512,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2049596583} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -13.98476, y: -0.98, z: 0} + m_LocalPosition: {x: -13.983922, y: -0.98, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 771707216} diff --git a/Assets/Scripts/勍/事件型工具/EntryTrigger.cs b/Assets/Scripts/勍/事件型工具/EntryTrigger.cs index 3e9fff8..5746701 100644 --- a/Assets/Scripts/勍/事件型工具/EntryTrigger.cs +++ b/Assets/Scripts/勍/事件型工具/EntryTrigger.cs @@ -8,6 +8,8 @@ using UnityEngine; public class EntryTrigger : Event { private Collider2D m_collider; + public Event m_event; + public Stage m_stage; void Start() { @@ -28,4 +30,13 @@ public class EntryTrigger : Event //如果玩家进入碰撞盒则触发事件 if(other.TryGetComponent(out Player player)) OnCall(); } + + public override void OnCall() + { + //如果链接了事件或者演出，则执行 + if(m_event != null) m_event.OnCall(); + if(m_stage != null) m_stage.OnCall(); + //如果二者都为null，则报告 + if(m_event == null && m_stage == null) Debug.Log(this.GetType() + gameObject.name + "没有链接事件或者演出，你确定吗？"); + } } diff --git a/Assets/Scripts/勍/对话框架/AConversation.cs b/Assets/Scripts/勍/对话框架/AConversation.cs index 266f3f7..26982b1 100644 --- a/Assets/Scripts/勍/对话框架/AConversation.cs +++ b/Assets/Scripts/勍/对话框架/AConversation.cs @@ -23,6 +23,7 @@ public class AConversation : MonoBehaviour public Transform P2Pos; [Header("对话框到说话者中心的偏移量")] public Vector2 offset = new Vector2(3.5f, 2.5f); + public bool end = false; @@ -125,6 +126,7 @@ public class AConversation : MonoBehaviour /// public virtual void OnEnd() { + end = true; //不在演出中时，恢复玩家的操作权限 if(!ConversationController.Instance.CheckStage()) player.ToMap("Normal"); diff --git a/Assets/Scripts/勍/对话框架/ConversationController.cs b/Assets/Scripts/勍/对话框架/ConversationController.cs index 12cdc36..f222d3f 100644 --- a/Assets/Scripts/勍/对话框架/ConversationController.cs +++ b/Assets/Scripts/勍/对话框架/ConversationController.cs @@ -5,6 +5,7 @@ using UnityEngine; public class ConversationController : UnitySingleton { private AConversation[] conversationList; + public AConversation currentConversation; void Start() { @@ -19,6 +20,7 @@ public class ConversationController : UnitySingleton if (conversation.conversationName == name) { Debug.Log("找到对话：" + name); + currentConversation = conversation; conversation.OnCall(); //改变玩家地图至Null FindObjectOfType().ToMap("Null"); diff --git a/Assets/Scripts/勍/播片系统/CGAdministrator.cs b/Assets/Scripts/勍/播片系统/CGAdministrator.cs index d65e39b..6bb85ac 100644 --- a/Assets/Scripts/勍/播片系统/CGAdministrator.cs +++ b/Assets/Scripts/勍/播片系统/CGAdministrator.cs @@ -1,94 +1,77 @@ -// using System.Collections; -// using System.Collections.Generic; -// using UnityEngine; -// using UnityEngine.UI; -// using UnityEditor; -// using UnityEngine.Video; -// using UnityEngine.InputSystem; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using UnityEditor; +using UnityEngine.Video; +using UnityEngine.InputSystem; -// public class CGAdministrator : MonoBehaviour -// { -// // Start is called before the first frame update -// //CG管理员相关代码 +public class CGAdministrator : UnitySingleton +{ + // Start is called before the first frame update + //CG管理员相关代码 -// private RawImage rawImage; -// [Tooltip("记录这个场景中的所有CG，要加的话直接扩容数组，并往新的CG里面加内容")][SerializeField] -// private ACG[] CGs; -// private IndexRecoder indexRecoder; -// private ACG playingCG;//正在播放的CG，因为invoke无法传参而存在 -// void Start() -// { -// rawImage = GetComponent(); -// indexRecoder = FindObjectOfType(); -// rawImage.CrossFadeAlpha(0,0,true);//为了淡入显示，必须先把它的阿尔法值降到0，对吧？ - -// //好像可以让它自己找到所有CG -// CGs = new ACG[transform.childCount]; -// for(int i = 0; i < transform.childCount; i++) -// { -// CGs[i] = transform.GetChild(i).GetComponent(); -// } -// // - -// // -// //CallACG("暂用"); -// // -// } - -// // Update is called once per frame -// void Update() -// { -// } + private RawImage rawImage; + [Tooltip("记录这个场景中的所有CG，要加的话直接扩容数组，并往新的CG里面加内容")][SerializeField] + private ACG[] CGs; + private ACG playingCG;//正在播放的CG，因为invoke无法传参而存在 + void Start() + { + rawImage = GetComponent(); + rawImage.CrossFadeAlpha(0,0,true);//为了淡入显示，必须先把它的阿尔法值降到0，对吧？ + //把rawImage的颜色的透明度变为0 + //rawImage.color = new Color(rawImage.color.r, rawImage.color.g, rawImage.color.b, 1); + -// //外部呼叫CG用，传入你要调用的CG名 -// public　void　CallACG(string CGName) -// { -// //当外面叫了一个CG，传入CG名 -// foreach(ACG CG in CGs) -// { -// //找到这个CG -// if(CG.CGName.Equals(CGName)) -// { -// Debug.Log("正在显示CG："+CG.name); -// rawImage.texture = CG.texture;//把CG的内容装载上 -// rawImage.CrossFadeAlpha(1,indexRecoder.CGFadeTime,true);//淡入显示CG -// playingCG = CG; -// try -// { -// CG.GetComponent().Play();//开始播放这个CG -// FindObjectOfType().SwitchCurrentActionMap("NullMap");//使玩家无法操作 -// } -// catch(System.NullReferenceException) -// { -// Debug.Log("播放CG失败，看看赋值对不对"); -// } -// Invoke("StopIt",CG.time); -// } -// } -// } + //好像可以让它自己找到所有CG + CGs = new ACG[transform.childCount]; + for(int i = 0; i < transform.childCount; i++) + { + CGs[i] = transform.GetChild(i).GetComponent(); + } + // -// //改变标记，使管理员意识到CG该停了 -// private void StopIt(){rawImage.CrossFadeAlpha(0f,indexRecoder.CGFadeTime,true);//淡出CG -// playingCG.OnEnded();}//告诉这个CG它结束了，然后触发它的结束事件 + // + //CallACG("鸟"); + // + } -// // //制造一个只读的变量，不要动这些 -// // public class ReadOnlyAttribute : PropertyAttribute{} -// // [CustomPropertyDrawer(typeof(ReadOnlyAttribute))] -// // public class ReadOnlyDrawer : PropertyDrawer -// // { -// // public override float GetPropertyHeight(SerializedProperty property, GUIContent label) -// // { -// // return EditorGUI.GetPropertyHeight(property, label, true); -// // } -// // public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) -// // { -// // GUI.enabled = false; -// // EditorGUI.PropertyField(position, property, label, true); -// // GUI.enabled = true; -// // } -// // } -// // // + //外部呼叫CG用，传入你要调用的CG名 + public　void　CallACG(string CGName) + { + //当外面叫了一个CG，传入CG名 + foreach(ACG CG in CGs) + { + //找到这个CG + if(CG.CGName.Equals(CGName)) + { + Debug.Log("正在显示CG："+CG.name); + rawImage.texture = CG.texture;//把CG的内容装载上 + rawImage.CrossFadeAlpha(1,1f,true);//淡入显示CG + playingCG = CG; + try + { + CG.GetComponent().Play();//开始播放这个CG + //FindObjectOfType().SwitchCurrentActionMap("NullMap");//使玩家无法操作 + } + catch(System.NullReferenceException) + { + Debug.Log("播放CG失败，看看赋值对不对"); + } + Invoke("StopIt",CG.time); + } + } + } -// } + //改变标记，使管理员意识到CG该停了 + private void StopIt(){rawImage.CrossFadeAlpha(0f,1f,true);//淡出CG + playingCG.OnEnded();}//告诉这个CG它结束了，然后触发它的结束事件 + + public float GetPlayingCGTime() + { + return playingCG.time; + } + +} diff --git a/Assets/Scripts/勍/演出/FengHuang.cs b/Assets/Scripts/勍/演出/FengHuang.cs new file mode 100644 index 0000000..8e89173 --- /dev/null +++ b/Assets/Scripts/勍/演出/FengHuang.cs @@ -0,0 +1,52 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using DG.Tweening; + +public class FengHuang : Stage +{ + public GameObject yufu; + protected override IEnumerator Main() + { + //呼出CG + CGAdministrator.Instance.CallACG("鸟"); + //等待CG结束 + yield return new WaitForSeconds(CGAdministrator.Instance.GetPlayingCGTime()); + //再等待一秒 + yield return new WaitForSeconds(1); + //淡入显示叶片 + SpriteRenderer leaf = GameObject.Find("树叶").GetComponent(); + leaf.DOFade(1, 1); + //等待一秒 + yield return new WaitForSeconds(1); + //激活渔夫 + yufu.SetActive(true); + //等待一秒后淡出树叶 + yield return new WaitForSeconds(1); + leaf.DOFade(0, 1); + //等待一秒 + yield return new WaitForSeconds(1); + //触发对话“渔夫之指引” + ConversationController.Instance.OnCall("渔夫之指引"); + //等到对话结束 + yield return new WaitUntil(() => ConversationController.Instance.currentConversation.end); + //渐隐渔夫 + SpriteRenderer[] renderers = yufu.GetComponentsInChildren(); + foreach (SpriteRenderer renderer in renderers) + { + renderer.DOFade(0, 1); + } + //一秒后删除渔夫 + yield return new WaitForSeconds(1); + Destroy(yufu); + //结束 + yield return base.Main(); + } + + protected override void OnEnd() + { + base.OnEnd(); + //删除自己和父物体 + Destroy(transform.parent.gameObject); + } +} diff --git a/Assets/Scripts/勍/演出/FengHuang.cs.meta b/Assets/Scripts/勍/演出/FengHuang.cs.meta new file mode 100644 index 0000000..42ad306 --- /dev/null +++ b/Assets/Scripts/勍/演出/FengHuang.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0452ca03894ec814a820bde0997076e7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/勍/演出/Stage.cs b/Assets/Scripts/勍/演出/Stage.cs index eebe20f..91c5951 100644 --- a/Assets/Scripts/勍/演出/Stage.cs +++ b/Assets/Scripts/勍/演出/Stage.cs @@ -21,6 +21,7 @@ public class Stage : MonoBehaviour [ContextMenu("Play")] public void OnCall() { + Debug.Log("演出" + gameObject.name + "开始"); //初始化 Init(); //开始Main的协程 diff --git a/Assets/Scripts/勍/绳结/KnotMediator.cs b/Assets/Scripts/勍/绳结/KnotMediator.cs index d6ff789..21b05df 100644 --- a/Assets/Scripts/勍/绳结/KnotMediator.cs +++ b/Assets/Scripts/勍/绳结/KnotMediator.cs @@ -22,9 +22,20 @@ public class KnotMediator : UnitySingleton [Header("当前记录的绳结类型")][SerializeField][EnumPaging] private KnotType currentKnotType; + private Player player; + + void Start(){ + player = FindObjectOfType(); + } + + public void RecordKnotType(KnotType knotType) { currentKnotType = knotType; + //让仓颉做出查看绳结的动作 + player.StopInputTo(2f); + player.Behavior("查看绳结"); + } /// diff --git a/Assets/Scripts/勍/角色/PlayerControl.cs b/Assets/Scripts/勍/角色/PlayerControl.cs index 0003aea..0b677ef 100644 --- a/Assets/Scripts/勍/角色/PlayerControl.cs +++ b/Assets/Scripts/勍/角色/PlayerControl.cs @@ -150,4 +150,20 @@ public class PlayerControl : MonoBehaviour } } + + + /// + /// 接下来的time后，都无视输入事件 + /// + public void StopInputTo(float time) + { + ToMap("Null"); + StartCoroutine(RecoverInput(time)); + } + + private IEnumerator RecoverInput(float time) + { + yield return new WaitForSeconds(time); + ToMap("Normal"); + } } diff --git a/Assets/动画/cangjie 1.controller b/Assets/动画/cangjie 1.controller index e2ac9ec..0d19728 100644 --- a/Assets/动画/cangjie 1.controller +++ b/Assets/动画/cangjie 1.controller @@ -171,6 +171,7 @@ AnimatorStateMachine: - {fileID: -5953479891427718110} - {fileID: 5947422655733057457} - {fileID: 3330679229323852168} + - {fileID: 2419438947098571967} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -189,7 +190,8 @@ AnimatorState: m_Name: "\u4ED3\u9889\u67E5\u770B\u7EF3\u7ED3" m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -3078475898699272913} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -205,6 +207,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-3078475898699272913 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.8 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-1622693631265719714 AnimatorState: serializedVersion: 6 @@ -246,25 +270,31 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Move m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: "\u4E0E\u706B\u4EA4\u4E92" m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: "\u53D7\u4F24" m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} + - m_Name: "\u67E5\u770B\u7EF3\u7ED3" + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -331,6 +361,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &2419438947098571967 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: "\u67E5\u770B\u7EF3\u7ED3" + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5411793311571772822} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &3330679229323852168 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/动画/yufu 1.controller b/Assets/动画/yufu 1.controller index f1b9ad7..609081c 100644 --- a/Assets/动画/yufu 1.controller +++ b/Assets/动画/yufu 1.controller @@ -59,16 +59,16 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -961979011199463194} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 290, y: 30, z: 0} - serializedVersion: 1 m_State: {fileID: 7159605451625161076} - m_Position: {x: 235, y: 65, z: 0} + m_Position: {x: 460, y: 100, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_AnyStatePosition: {x: 280, y: 190, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} diff --git a/Assets/动画/仓颉查看绳结.anim b/Assets/动画/仓颉查看绳结.anim index 8fef480..0b55ff9 100644 --- a/Assets/动画/仓颉查看绳结.anim +++ b/Assets/动画/仓颉查看绳结.anim @@ -163,6 +163,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.5166667 + value: {x: 0, y: 0, z: -32.842} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -204,6 +213,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.5166667 + value: {x: 0, y: 0, z: -148.609} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -229,6 +247,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.5166667 + value: {x: 0, y: 0, z: 122.539} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -254,6 +281,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.5166667 + value: {x: 0, y: 0, z: 31.891} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -295,6 +331,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.5166667 + value: {x: 0, y: 0, z: 136.511} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -320,6 +365,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.5166667 + value: {x: 0, y: 0, z: 87.25} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1258,7 +1312,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 1.5166667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -2720,6 +2774,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -2748,6 +2811,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -2776,6 +2848,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: -32.842 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3089,6 +3170,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3117,6 +3207,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3145,6 +3244,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: -148.609 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3287,6 +3395,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3315,6 +3432,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3343,6 +3469,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: 122.539 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3485,6 +3620,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3513,6 +3657,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3541,6 +3694,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: 31.891 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3854,6 +4016,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3882,6 +4053,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3910,6 +4090,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: 136.511 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -4052,6 +4241,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -4080,6 +4278,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -4108,6 +4315,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5166667 + value: 87.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -4591,7 +4807,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: bone_1/bone_2/bone_3 + path: bone_1/bone_2/bone_3/bone_8 classID: 4 script: {fileID: 0} - curve: @@ -4601,7 +4817,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: bone_1/bone_2/bone_3 + path: bone_1/bone_2/bone_3/bone_8 classID: 4 script: {fileID: 0} - curve: @@ -4611,7 +4827,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: bone_1/bone_2/bone_3 + path: bone_1/bone_2/bone_3/bone_8 classID: 4 script: {fileID: 0} - curve: @@ -4681,7 +4897,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: bone_1/bone_2/bone_3/bone_5/bone_6/bone_7 + path: bone_1/bone_2/bone_3/bone_5/bone_6 classID: 4 script: {fileID: 0} - curve: @@ -4691,7 +4907,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: bone_1/bone_2/bone_3/bone_5/bone_6/bone_7 + path: bone_1/bone_2/bone_3/bone_5/bone_6 classID: 4 script: {fileID: 0} - curve: @@ -4701,7 +4917,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: bone_1/bone_2/bone_3/bone_5/bone_6/bone_7 + path: bone_1/bone_2/bone_3/bone_5/bone_6 classID: 4 script: {fileID: 0} - curve: @@ -4711,7 +4927,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: bone_1/bone_2/bone_3/bone_8 + path: bone_1/bone_2/bone_3/bone_5/bone_6/bone_7 classID: 4 script: {fileID: 0} - curve: @@ -4721,7 +4937,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: bone_1/bone_2/bone_3/bone_8 + path: bone_1/bone_2/bone_3/bone_5/bone_6/bone_7 classID: 4 script: {fileID: 0} - curve: @@ -4731,7 +4947,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: bone_1/bone_2/bone_3/bone_8 + path: bone_1/bone_2/bone_3/bone_5/bone_6/bone_7 classID: 4 script: {fileID: 0} - curve: @@ -4771,7 +4987,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: bone_1/bone_2/bone_3/bone_5 + path: bone_1/bone_2/bone_3 classID: 4 script: {fileID: 0} - curve: @@ -4781,7 +4997,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: bone_1/bone_2/bone_3/bone_5 + path: bone_1/bone_2/bone_3 classID: 4 script: {fileID: 0} - curve: @@ -4791,7 +5007,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: bone_1/bone_2/bone_3/bone_5 + path: bone_1/bone_2/bone_3 classID: 4 script: {fileID: 0} - curve: @@ -4801,7 +5017,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: bone_1/bone_2/bone_3/bone_5/bone_6 + path: bone_1/bone_2/bone_3/bone_5 classID: 4 script: {fileID: 0} - curve: @@ -4811,7 +5027,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: bone_1/bone_2/bone_3/bone_5/bone_6 + path: bone_1/bone_2/bone_3/bone_5 classID: 4 script: {fileID: 0} - curve: @@ -4821,7 +5037,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: bone_1/bone_2/bone_3/bone_5/bone_6 + path: bone_1/bone_2/bone_3/bone_5 classID: 4 script: {fileID: 0} - curve: diff --git a/Assets/美术素材/场景3/貔貅.png.meta b/Assets/美术素材/场景3/貔貅.png.meta index ffb88b3..260f2b9 100644 --- a/Assets/美术素材/场景3/貔貅.png.meta +++ b/Assets/美术素材/场景3/貔貅.png.meta @@ -46,7 +46,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 300 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -75,6 +75,54 @@ TextureImporter: 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: iPhone + 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: Windows Store Apps + 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: [] diff --git a/Logs/ApiUpdaterCheck.txt b/Logs/ApiUpdaterCheck.txt index bf06495..b0f3fcb 100644 --- a/Logs/ApiUpdaterCheck.txt +++ b/Logs/ApiUpdaterCheck.txt @@ -172,21 +172,11 @@ C# parse time : -1ms candidates check time : -1ms console write time : -1ms -[api-updater (non-obsolete-error-filter)] 2022/4/2 22:58:22 : Starting D:/unity/2019.3.2f1/2020.3.30f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] 2022/4/2 21:10:15 : Starting D:/unity/Editor/2020.3.30f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe [api-updater (non-obsolete-error-filter)] ---------------------------------- -jit/startup time : 808.5839ms -moved types parse time: 54ms -candidates parse time : 1ms -C# parse time : -1ms -candidates check time : -1ms -console write time : -1ms - -[api-updater (non-obsolete-error-filter)] 2022/4/3 1:10:31 : Starting D:/unity/2019.3.2f1/2020.3.30f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe -[api-updater (non-obsolete-error-filter)] ----------------------------------- -jit/startup time : 80.616ms -moved types parse time: 51ms +jit/startup time : 250.8009ms +moved types parse time: 50ms candidates parse time : 1ms C# parse time : -1ms candidates check time : -1ms diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index d04639a..b9555ac 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -576,6 +576,7 @@ PlayerSettings: webGLDecompressionFallback: 0 scriptingDefineSymbols: 1: ODIN_INSPECTOR;ODIN_INSPECTOR_3 + 7: ODIN_INSPECTOR;ODIN_INSPECTOR_3 additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 18b96d5..10b731f 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,31 +9,28 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0 - flags: 0 - RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0 - flags: 0 - RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036cdafbfb589dd6f6aedfff7e67083debf42d - flags: 0 - RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021 flags: 0 + RecentlyUsedScenePath-2: + value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021 + flags: 0 + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d + flags: 0 + RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb + flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb + flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb + flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357f67083debf42d + value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0 flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357f67083debf42d - flags: 0 - RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d + value: 22424703114646680e0b0227036cdafbfb589dd6f6aedfff7e67083debf42d flags: 0 vcSharedLogLevel: value: 0d5e400f0650