Accept Merge Request #89 : (SaipoVersion -> master)

Merge Request: 8.14合并 Created By: @SAIPO Accepted By: @SAIPO URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/89
1
2021-08-14 08:00:17 +08:00 · 2021-08-14 07:57:06 +08:00 · 2021-08-14 07:43:34 +08:00 · 2021-08-14 04:44:23 +08:00 · 2021-08-14 01:43:42 +08:00 · 2021-08-13 00:32:23 +08:00
23 changed files with 3855 additions and 118 deletions
--- a/Assets/MyPostProcess/post.asset
+++ b/Assets/MyPostProcess/post.asset
@ -0,0 +1,68 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-3884794239773962025
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3}
+  m_Name: Bloom
+  m_EditorClassIdentifier: 
+  active: 1
+  m_AdvancedMode: 0
+  threshold:
+    m_OverrideState: 1
+    m_Value: 0.98
+    min: 0
+  intensity:
+    m_OverrideState: 1
+    m_Value: 9.59354
+    min: 0
+  scatter:
+    m_OverrideState: 0
+    m_Value: 0.7
+    min: 0
+    max: 1
+  clamp:
+    m_OverrideState: 0
+    m_Value: 65472
+    min: 0
+  tint:
+    m_OverrideState: 0
+    m_Value: {r: 1, g: 0, b: 0, a: 1}
+    hdr: 0
+    showAlpha: 0
+    showEyeDropper: 1
+  highQualityFiltering:
+    m_OverrideState: 0
+    m_Value: 0
+  skipIterations:
+    m_OverrideState: 0
+    m_Value: 1
+    min: 0
+    max: 16
+  dirtTexture:
+    m_OverrideState: 0
+    m_Value: {fileID: 0}
+  dirtIntensity:
+    m_OverrideState: 0
+    m_Value: 0
+    min: 0
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3}
+  m_Name: post
+  m_EditorClassIdentifier: 
+  components:
+  - {fileID: -3884794239773962025}
--- a/Assets/MyPostProcess/post.asset.meta
+++ b/Assets/MyPostProcess/post.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 276382b4749182849a2306c94b19d810
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources.meta
+++ b/Assets/Resources.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 29af985829b48094fb08a2663024a254
+guid: 550fb5428e1e45a4e860ea43a10dc791
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/Resources/BillingMode.json
+++ b/Assets/Resources/BillingMode.json
@ -0,0 +1 @@
+{"androidStore":"GooglePlay"}
--- a/Assets/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta
+++ b/Assets/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: fd02c799f3f5c4c83b2fc26c105a3821
-DefaultImporter:
+guid: d08d6fdedf0895b4c9ead26d9da12404
+TextScriptImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Assets/Scenes/各种系统测试与陈列.unity
+++ b/Assets/Scenes/各种系统测试与陈列.unity
@ -1192,7 +1192,7 @@ GameObject:
  m_Component:
  - component: {fileID: 305694997}
  - component: {fileID: 305694998}
-  m_Layer: 0
+  m_Layer: 3
  m_Name: "\u591A\u6001\u7BA1\u7406\u5458"
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -2571,6 +2571,7 @@ MonoBehaviour:
  rateOfChangeOfThrowingAngle: 1
  strengthOfThrowing: 8
  stageName: 
+  CGFadeTime: 0
 --- !u!4 &912162410
 Transform:
  m_ObjectHideFlags: 0
@ -2721,7 +2722,7 @@ SpriteRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
+  - {fileID: 2100000, guid: 28189444f97f59f4080b9146857f6833, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@ -2753,6 +2754,36 @@ SpriteRenderer:
  m_WasSpriteAssigned: 1
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
+--- !u!1 &1113866055
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1113866056}
+  m_Layer: 0
+  m_Name: "\u6295\u63B7\u70B9"
+  m_TagString: Untagged
+  m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1113866056
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1113866055}
+  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: 1272973346}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1144456071
 GameObject:
  m_ObjectHideFlags: 0
@ -3008,6 +3039,304 @@ Canvas:
  m_SortingLayerID: 0
  m_SortingOrder: 0
  m_TargetDisplay: 0
+--- !u!1001 &1272973345
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1601657821}
+    m_Modifications:
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 2.455
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -2.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6505588563760846690, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_Name
+      value: "\u5C0F\u5B69\uFF08\u52A8\u753B\u6D4B\u8BD5"
+      objectReference: {fileID: 0}
+    - target: {fileID: 6505588563760846690, guid: 28d7167a156a930489d946fd19163778, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 28d7167a156a930489d946fd19163778, type: 3}
+--- !u!4 &1272973346 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2658040339138525627, guid: 28d7167a156a930489d946fd19163778, type: 3}
+  m_PrefabInstance: {fileID: 1272973345}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1272973347 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6505588563760846690, guid: 28d7167a156a930489d946fd19163778, type: 3}
+  m_PrefabInstance: {fileID: 1272973345}
+  m_PrefabAsset: {fileID: 0}
+--- !u!95 &1272973348
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1272973347}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: ed1c51e5852ad914e8c313176c3789cb, type: 2}
+  m_CullingMode: 1
+  m_UpdateMode: 1
+  m_ApplyRootMotion: 1
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!114 &1272973349
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1272973347}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e2c1a0de69ef6d468a14db32ebf68fe, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  catched: {fileID: 0}
+  missile: {fileID: 4018427281142380165, guid: 628f0c1ef857ddd4687c94b8ba9b1aa6, type: 3}
+  throwOffset: {fileID: 0}
+--- !u!50 &1272973350
+Rigidbody2D:
+  serializedVersion: 4
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1272973347}
+  m_BodyType: 0
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDrag: 0
+  m_AngularDrag: 0.05
+  m_GravityScale: 1
+  m_Material: {fileID: 0}
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 0
+  m_Constraints: 0
+--- !u!61 &1272973351
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1272973347}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0.28}
+  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.87, y: 5.53}
+  m_EdgeRadius: 0
+--- !u!114 &1272973352
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1272973347}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Actions: {fileID: -944628639613478452, guid: 6c1186e0febe48c4e866173c0f39422d, type: 3}
+  m_NotificationBehavior: 2
+  m_UIInputModule: {fileID: 0}
+  m_DeviceLostEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  m_DeviceRegainedEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  m_ControlsChangedEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  m_ActionEvents:
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1272973349}
+        m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
+        m_MethodName: OnMoveHorizons
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: 5a93f020-27b4-4cb6-975f-af9ed1ef4ec3
+    m_ActionName: PlayerNormal/MoveHorizons[/Keyboard/a,/Keyboard/d,/XInputControllerWindows/leftStick/left,/XInputControllerWindows/leftStick/right]
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1272973349}
+        m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
+        m_MethodName: OnRun
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: 5c554403-34b9-4a85-a8f5-ac58363cad75
+    m_ActionName: PlayerNormal/Run[/XInputControllerWindows/rightShoulder,/Keyboard/shift]
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1272973349}
+        m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
+        m_MethodName: OnInteraction
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: a3099043-3ac2-4656-8595-f0c577842621
+    m_ActionName: PlayerNormal/Interaction[/XInputControllerWindows/buttonWest,/Keyboard/f]
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1272973349}
+        m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
+        m_MethodName: OnCoding
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: f7af9390-5dad-4c80-a4a7-83d8314f8e88
+    m_ActionName: PlayerNormal/Codeing[/XInputControllerWindows/rightTrigger,/Keyboard/space]
+  - m_PersistentCalls:
+      m_Calls: []
+    m_ActionId: beabb251-6f14-495d-9364-88119e0f9bf0
+    m_ActionName: NullMap/New action
+  - m_PersistentCalls:
+      m_Calls: []
+    m_ActionId: 078b3370-2cb6-4574-9156-0146ae814573
+    m_ActionName: PlayerInThrowing/Quit[/Keyboard/k]
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1272973349}
+        m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
+        m_MethodName: OnThrow
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: 6bab4454-55d6-409c-9736-d1640a407628
+    m_ActionName: PlayerInThrowing/Throw[/Keyboard/shift]
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1272973349}
+        m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
+        m_MethodName: OnAdjustTheAngle
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: fddd4068-5ae8-4c1a-8498-4c8c30327f57
+    m_ActionName: PlayerInThrowing/AdjustTheAngle[/Keyboard/s,/Keyboard/w]
+  m_NeverAutoSwitchControlSchemes: 0
+  m_DefaultControlScheme: Player
+  m_DefaultActionMap: PlayerNormal
+  m_SplitScreenIndex: -1
+  m_Camera: {fileID: 0}
 --- !u!1 &1302000701
 GameObject:
  m_ObjectHideFlags: 0
@ -3261,9 +3590,9 @@ MonoBehaviour:
  m_RendererIndex: -1
  m_VolumeLayerMask:
    serializedVersion: 2
-    m_Bits: 1
+    m_Bits: 8
  m_VolumeTrigger: {fileID: 0}
-  m_RenderPostProcessing: 0
+  m_RenderPostProcessing: 1
  m_Antialiasing: 0
  m_AntialiasingQuality: 2
  m_StopNaN: 0
@ -4088,6 +4417,70 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  content: "\u516B\u8DEF\u519B"
  num: 864246511
+--- !u!1 &1545643695
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1545643696}
+  - component: {fileID: 1545643698}
+  - component: {fileID: 1545643697}
+  m_Layer: 3
+  m_Name: Global Volume
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1545643696
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1545643695}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.19999981, y: -0.87, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1789875270}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1545643697
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1545643695}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d58ce9ce23ba37f42a04fad82e8f1222, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  VolumeProfile: {fileID: 11400000, guid: 276382b4749182849a2306c94b19d810, type: 2}
+  Cycle: 3.65
+  rate: 1.31
+--- !u!114 &1545643698
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1545643695}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isGlobal: 1
+  priority: 0
+  blendDistance: 0
+  weight: 1
+  sharedProfile: {fileID: 11400000, guid: 276382b4749182849a2306c94b19d810, type: 2}
 --- !u!1 &1550886584
 GameObject:
  m_ObjectHideFlags: 0
@ -4196,6 +4589,7 @@ Transform:
  m_Children:
  - {fileID: 745750434}
  - {fileID: 2658040340377940378}
+  - {fileID: 1272973346}
  m_Father: {fileID: 0}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4424,6 +4818,7 @@ Transform:
  - {fileID: 535189456}
  - {fileID: 1894769948}
  - {fileID: 305694997}
+  - {fileID: 1545643696}
  m_Father: {fileID: 0}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5690,7 +6085,7 @@ MonoBehaviour:
  m_RendererIndex: 1
  m_VolumeLayerMask:
    serializedVersion: 2
-    m_Bits: 1
+    m_Bits: 0
  m_VolumeTrigger: {fileID: 0}
  m_RenderPostProcessing: 1
  m_Antialiasing: 0
@ -5733,7 +6128,7 @@ Camera:
  m_Depth: 0
  m_CullingMask:
    serializedVersion: 2
-    m_Bits: 0
+    m_Bits: 4294967295
  m_RenderingPath: -1
  m_TargetTexture: {fileID: 0}
  m_TargetDisplay: 0
@ -5761,7 +6156,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &2111184534
 Transform:
  m_ObjectHideFlags: 0
--- a/Assets/Scenes/序章-家中.unity
+++ b/Assets/Scenes/序章-家中.unity
@ -853,9 +853,9 @@ Transform:
  m_LocalPosition: {x: -7.563331, y: 2.5412881, z: 0.40322465}
  m_LocalScale: {x: 80.14687, y: 9.6395, z: 1}
  m_Children:
-  - {fileID: 480368884}
  - {fileID: 1266913498}
  - {fileID: 2056043213}
+  - {fileID: 1417197529}
  m_Father: {fileID: 1258629581}
  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1071,78 +1071,6 @@ Transform:
  m_Father: {fileID: 716192431}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &480368883
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 480368884}
-  - component: {fileID: 480368885}
-  m_Layer: 0
-  m_Name: Point Light 2D
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &480368884
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 480368883}
-  m_LocalRotation: {x: -0, y: -0, z: 0.99997365, w: -0.007262692}
-  m_LocalPosition: {x: 0.22558585, y: 0.08714144, z: 0}
-  m_LocalScale: {x: 0.01247941, y: 0.24431929, z: 1}
-  m_Children: []
-  m_Father: {fileID: 305985608}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180.05}
--- !u!114 &480368885
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 480368883}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_LightType: 3
-  m_BlendStyleIndex: 0
-  m_FalloffIntensity: 0.5
-  m_Color: {r: 1, g: 0.703978, b: 0, a: 1}
-  m_Intensity: 1
-  m_LightVolumeOpacity: 0
-  m_ApplyToSortingLayers: 00000000
-  m_LightCookieSprite: {fileID: 0}
-  m_UseNormalMap: 0
-  m_LightOrder: 0
-  m_AlphaBlendOnOverlap: 0
-  m_ShadowIntensity: 0
-  m_ShadowVolumeIntensity: 0
-  m_PointLightInnerAngle: 27.949997
-  m_PointLightOuterAngle: 105.03
-  m_PointLightInnerRadius: 1.5476075
-  m_PointLightOuterRadius: 6.5437922
-  m_PointLightDistance: 3
-  m_PointLightQuality: 1
-  m_ShapeLightParametricSides: 5
-  m_ShapeLightParametricAngleOffset: 0
-  m_ShapeLightParametricRadius: 1
-  m_ShapeLightFalloffSize: 0.5
-  m_ShapeLightFalloffOffset: {x: 0, y: 0}
-  m_ShapePath:
-  - {x: -0.5, y: -0.5, z: 0}
-  - {x: 0.5, y: -0.5, z: 0}
-  - {x: 0.5, y: 0.5, z: 0}
-  - {x: -0.5, y: 0.5, z: 0}
 --- !u!1 &582064874
 GameObject:
  m_ObjectHideFlags: 0
@ -1898,9 +1826,9 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  nodeRect:
    serializedVersion: 2
-    x: 67
-    y: 70
-    width: 112.4
+    x: 66
+    y: 69
+    width: 111
    height: 40
  tint: {r: 1, g: 1, b: 1, a: 1}
  useCustomTint: 0
@ -1927,10 +1855,10 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  version: 1
-  scrollPos: {x: 0, y: 0}
+  scrollPos: {x: 39, y: 184}
  variablesScrollPos: {x: 0, y: 0}
  variablesExpanded: 1
-  blockViewHeight: 400
+  blockViewHeight: 457
  zoom: 1
  scrollViewRect:
    serializedVersion: 2
@ -1967,7 +1895,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  itemId: 1
  indentLevel: 0
-  storyText: "\u60F3\u60F3\u5728\u6218\u573A\u4E0A\u53EF\u771F\u662F\u60CA\u9669\u554A\u3002"
+  storyText: "\u60F3\u60F3\u5728\u6218\u573A\u4E0A\u53EF\u771F\u662F\u60AC\u554A\u3002"
  description: 
  character: {fileID: 1851675996}
  portrait: {fileID: 21300000, guid: 6582be7064fb9d543a4d591e162f5327, type: 3}
@ -2036,7 +1964,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  itemId: 3
  indentLevel: 0
-  storyText: "\u65F6\u5019\u4E0D\u65E9\u4E86\uFF0C\u7761\u89C9\u5427\uFF0C\u7B49\u6211\u56DE\u6765\u4EE5\u540E\u7EE7\u7EED\u7ED9\u4F60\u8BB2\u3002"
+  storyText: "\u9ED1\u7ECF\u534A\u591C\u4E86\u90FD\uFF0C\u7761\u89C9\u5427\uFF0C\u7B49\u6211\u56DE\u6765\u4EE5\u540E\u7EE7\u7EED\u7ED9\u4F60\u8BB2\u3002"
  description: 
  character: {fileID: 1851675996}
  portrait: {fileID: 21300000, guid: 6582be7064fb9d543a4d591e162f5327, type: 3}
@ -2164,6 +2092,7 @@ GameObject:
  - component: {fileID: 866289594}
  - component: {fileID: 866289593}
  - component: {fileID: 866289592}
+  - component: {fileID: 866289596}
  m_Layer: 0
  m_Name: "\u4E0E\u7236\u4EB2\u5BF9\u8BDD"
  m_TagString: Untagged
@ -2185,8 +2114,8 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  nodeRect:
    serializedVersion: 2
-    x: 68
-    y: 68
+    x: 67
+    y: 67
    width: 122
    height: 40
  tint: {r: 1, g: 1, b: 1, a: 1}
@ -2202,6 +2131,7 @@ MonoBehaviour:
  - {fileID: 866289594}
  - {fileID: 866289593}
  - {fileID: 866289592}
+  - {fileID: 866289596}
  - {fileID: 866289591}
  suppressAllAutoSelections: 0
 --- !u!114 &866289586
@ -2217,10 +2147,10 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  version: 1
-  scrollPos: {x: 31.5, y: 185}
+  scrollPos: {x: 32.5, y: 186}
  variablesScrollPos: {x: 0, y: 0}
  variablesExpanded: 1
-  blockViewHeight: 580
+  blockViewHeight: 504
  zoom: 1
  scrollViewRect:
    serializedVersion: 2
@ -2231,7 +2161,7 @@ MonoBehaviour:
  selectedBlocks:
  - {fileID: 866289585}
  selectedCommands:
-  - {fileID: 866289590}
+  - {fileID: 866289594}
  variables: []
  description: 
  stepPause: 0
@ -2313,7 +2243,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  itemId: 2
  indentLevel: 0
-  storyText: "\u662F\u554A\uFF0C\u6700\u8FD1\u654C\u4EBA\u8FDB\u57CE\u4E86\uFF0C\u6218\u5F79\u8D8A\u6765\u8D8A\u9891\u7E41\u4E86\u3002"
+  storyText: "\u662F\u554A\uFF0C\u540E\u534A\u664C\u513F\u654C\u4EBA\u8FDB\u57CE\u4E86\uFF0C\u6218\u5F79\u8D8A\u6765\u8D8A\u9891\u7E41\u4E86\u3002"
  description: 
  character: {fileID: 1851675996}
  portrait: {fileID: 21300000, guid: 6582be7064fb9d543a4d591e162f5327, type: 3}
@ -2451,6 +2381,33 @@ MonoBehaviour:
  stopVoiceover: 1
  waitForVO: 0
  setSayDialog: {fileID: 582064879}
+--- !u!114 &866289596
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 866289584}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemId: 8
+  indentLevel: 0
+  storyText: "\u65E2\u7136\u4F60\u592E\u8BB0\u6211\u4E86\uFF0C\u90A3\u6211\u5C31\u6559\u6559\u4F60\u5427\u3002"
+  description: 
+  character: {fileID: 1851675996}
+  portrait: {fileID: 21300000, guid: 6582be7064fb9d543a4d591e162f5327, type: 3}
+  voiceOverClip: {fileID: 0}
+  showAlways: 1
+  showCount: 1
+  extendPrevious: 0
+  fadeWhenDone: 1
+  waitForClick: 1
+  stopVoiceover: 1
+  waitForVO: 0
+  setSayDialog: {fileID: 582064879}
 --- !u!1 &899940056
 GameObject:
  m_ObjectHideFlags: 0
@ -2527,7 +2484,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 899940056}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 11.046668, y: 0.3912881, z: 0.40322465}
+  m_LocalPosition: {x: 8.15, y: 0.3912881, z: 0.40322465}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1258629581}
@ -3248,7 +3205,8 @@ MonoBehaviour:
    height: 859
  selectedBlocks:
  - {fileID: 1132274498}
-  selectedCommands: []
+  selectedCommands:
+  - {fileID: 1132274501}
  variables: []
  description: 
  stepPause: 0
@ -3288,7 +3246,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  itemId: 1
  indentLevel: 0
-  storyText: "\u8FD9\u662F\u7236\u4EB2\u4E3A\u4E86\u9632\u6B62\u654C\u4EBA\u53D1\u73B0\uFF0C\u85CF\u533F\u6C34\u7F38\u7684\u5730\u65B9\u3002"
+  storyText: "\u8FD9\u662F\u7236\u4EB2\u4E3A\u4E86\u9632\u6B62\u654C\u4EBA\u53D1\u73B0\uFF0C\u85CF\u533F\u7535\u53F0\u7684\u5730\u65B9\u3002"
  description: 
  character: {fileID: 995089250}
  portrait: {fileID: 21300000, guid: 29e56f162a0374b44a23437dd6e68ca6, type: 3}
@ -3880,7 +3838,7 @@ Transform:
  m_LocalScale: {x: 0.01247941, y: 0.24431929, z: 1}
  m_Children: []
  m_Father: {fileID: 305985608}
-  m_RootOrder: 1
+  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180.05}
 --- !u!114 &1266913499
 MonoBehaviour:
@ -4091,6 +4049,96 @@ Transform:
  m_Father: {fileID: 1170258148}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1417197528
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1417197529}
+  - component: {fileID: 1417197531}
+  - component: {fileID: 1417197530}
+  m_Layer: 0
+  m_Name: "\u7164\u6CB9\u706F\u5149"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1417197529
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1417197528}
+  m_LocalRotation: {x: -0, y: -0, z: 0.0009573369, w: 0.9999996}
+  m_LocalPosition: {x: 0.196, y: -0.2302, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 305985608}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1417197530
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1417197528}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1f441a0f578e97043870c1660f497826, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Light2D: {fileID: 1417197531}
+  radiusCycle: 0.21
+  radiusRate: 1.24
+  intensityCycle: 0.15
+  intensityRate: 1.14
+--- !u!114 &1417197531
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1417197528}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_LightType: 3
+  m_BlendStyleIndex: 0
+  m_FalloffIntensity: 0.5
+  m_Color: {r: 1, g: 0.6335857, b: 0.1273585, a: 1}
+  m_Intensity: 1.73
+  m_LightVolumeOpacity: 0
+  m_ApplyToSortingLayers: 00000000
+  m_LightCookieSprite: {fileID: 0}
+  m_UseNormalMap: 0
+  m_LightOrder: 0
+  m_AlphaBlendOnOverlap: 0
+  m_ShadowIntensity: 0
+  m_ShadowVolumeIntensity: 0
+  m_PointLightInnerAngle: 360
+  m_PointLightOuterAngle: 360
+  m_PointLightInnerRadius: 0
+  m_PointLightOuterRadius: 3.93
+  m_PointLightDistance: 3
+  m_PointLightQuality: 1
+  m_ShapeLightParametricSides: 5
+  m_ShapeLightParametricAngleOffset: 0
+  m_ShapeLightParametricRadius: 1
+  m_ShapeLightFalloffSize: 0.5
+  m_ShapeLightFalloffOffset: {x: 0, y: 0}
+  m_ShapePath:
+  - {x: -0.5, y: -0.5, z: 0}
+  - {x: 0.5, y: -0.5, z: 0}
+  - {x: 0.5, y: 0.5, z: 0}
+  - {x: -0.5, y: 0.5, z: 0}
 --- !u!1 &1430432767
 GameObject:
  m_ObjectHideFlags: 0
@ -4199,7 +4247,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  selectedFlowchart: {fileID: 1041575545}
+  selectedFlowchart: {fileID: 775073761}
 --- !u!4 &1463945086
 Transform:
  m_ObjectHideFlags: 1
@ -5374,7 +5422,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1861856986}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -11.039029, y: 0.08661765, z: -10}
+  m_LocalPosition: {x: -10.217708, y: 0.083872736, z: -10}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 716192431}
@ -5941,7 +5989,7 @@ Transform:
  m_LocalScale: {x: 0.01247941, y: 0.24431929, z: 1}
  m_Children: []
  m_Father: {fileID: 305985608}
-  m_RootOrder: 2
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180.05}
 --- !u!114 &2056043214
 MonoBehaviour:
@ -6273,6 +6321,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: "\u4ED6\u7238"
      objectReference: {fileID: 0}
+    - target: {fileID: 4912081361035269527, guid: 2ff4d949bf0f2f343893d8c570bf9f51, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 2ff4d949bf0f2f343893d8c570bf9f51, type: 3}
 --- !u!1001 &6148935033767695742
--- a/Assets/Scenes/序章-战场.unity
+++ b/Assets/Scenes/序章-战场.unity
@ -308,6 +308,7 @@ MonoBehaviour:
  m_CameraType: 0
  m_Cameras:
  - {fileID: 1935890969}
+  - {fileID: 1643861945}
  m_RendererIndex: -1
  m_VolumeLayerMask:
    serializedVersion: 2
@ -1408,6 +1409,7 @@ Transform:
  - {fileID: 1373134511}
  - {fileID: 2087774249}
  - {fileID: 1935890966}
+  - {fileID: 1643861943}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -6637,6 +6639,113 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1643861942
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1643861943}
+  - component: {fileID: 1643861945}
+  - component: {fileID: 1643861944}
+  m_Layer: 0
+  m_Name: "\u7206\u70B8\u51B2\u51FB\u6CE2\u6E32\u67D3"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1643861943
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1643861942}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -1.4000001, y: 0.49338245, z: -9.900214}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1049093360}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1643861944
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1643861942}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 2
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 1
+  m_Cameras: []
+  m_RendererIndex: 1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_RenderPostProcessing: 1
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_Version: 2
+--- !u!20 &1643861945
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1643861942}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 1
+  orthographic size: 5
+  m_Depth: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 0
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
 --- !u!1 &1677427149
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/抽象的东西/LightController.cs
+++ b/Assets/Scripts/抽象的东西/LightController.cs
@ -0,0 +1,41 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Experimental.Rendering.Universal;
+
+public class LightController : MonoBehaviour
+{
+    //控制灯光的火焰扰动 霄酱写的
+    public Light2D Light2D;
+    [Header("光半径")]
+    public float radiusCycle;
+    public float radiusRate;
+    [Header("光强度")]
+    public float intensityCycle;
+    public float intensityRate;
+    private float radiusOrigin;
+    private float radiusUpdate;
+
+    private float intensityOrigin;
+    private float intensityUpdate;
+    // Start is called before the first frame update
+    void Start()
+    {
+        //获取所有数据的初始值
+        radiusOrigin = Light2D.pointLightOuterRadius;
+        intensityOrigin = Light2D.intensity;
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        radiusUpdate = radiusOrigin;
+        radiusUpdate = radiusCycle * Mathf.Sin(Time.fixedTime * Mathf.PI * radiusRate) + radiusOrigin;//计算简谐震荡后的数值
+        Light2D.pointLightOuterRadius = radiusUpdate;
+
+        intensityUpdate = intensityOrigin;
+        intensityUpdate = intensityCycle * Mathf.Sin(Time.fixedTime * Mathf.PI * intensityRate) + intensityOrigin;
+        Light2D.intensity = intensityUpdate;
+
+    }
+}
--- a/Assets/Scripts/抽象的东西/LightController.cs.meta
+++ b/Assets/Scripts/抽象的东西/LightController.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1f441a0f578e97043870c1660f497826
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/抽象的东西/VolumeController.cs
+++ b/Assets/Scripts/抽象的东西/VolumeController.cs
@ -0,0 +1,33 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+public class VolumeController : MonoBehaviour
+{
+    //屏幕后处理控制 霄酱写的
+    public VolumeProfile VolumeProfile;
+
+    private List<VolumeComponent> VolumeComponents;
+    public float Cycle;
+    public float rate;
+
+    private float origin;
+    private float update;
+    
+    // Start is called before the first frame update
+    void Start()
+    {
+        VolumeComponents = VolumeProfile.components;
+        origin = VolumeComponents[0].parameters[1].GetValue<float>();
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        update = origin;
+        update = Cycle * Mathf.Sin(Time.fixedTime * Mathf.PI * rate) + origin;
+        VolumeComponents[0].parameters[1].SetValue(new FloatParameter(update));
+    }
+}
--- a/Assets/Scripts/抽象的东西/VolumeController.cs.meta
+++ b/Assets/Scripts/抽象的东西/VolumeController.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d58ce9ce23ba37f42a04fad82e8f1222
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta
+++ b/Assets/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta
@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: 81dbcde0f90df4e9ba9ca2794490e57a
+guid: b525f28b9cbdb06469297232d9159ef1
+folderAsset: yes
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Shader/光圈/aperture.mat
+++ b/Assets/Shader/光圈/aperture.mat
@ -0,0 +1,65 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: aperture
+  m_Shader: {fileID: -6465566751694194690, guid: efd32e3e59392b742b7aba2ff3c73b41, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - Texture2D_90a160666cb24ec3b8ccebb71e7b0c56:
+        m_Texture: {fileID: 2800000, guid: f753ea1c25836b147aac5175b6887b8e, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _AlphaTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - Vector1_12f5b81de73c4ac7b9b9260c98a38e5f: 0.03
+    - Vector1_3b86380921cb43cd93b90258f17f2c0c: 1.48
+    - Vector1_e7e5d7bdd0754d368e57dc233399e61e: 0.52
+    - _EnableExternalAlpha: 0
+    m_Colors:
+    - Color_1ad402aecdce423382c3e88d30da3013: {r: 11.482353, g: 11.984314, b: 6.211765, a: 0}
+    - Color_a74a476568e64d8aa5fd86f4c29fa629: {r: 1, g: 0.9404438, b: 0.4009434, a: 0}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Flip: {r: 1, g: 1, b: 1, a: 1}
+    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []
--- a/Assets/Shader/光圈/aperture.mat.meta
+++ b/Assets/Shader/光圈/aperture.mat.meta
@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: 73111a550ebd15b44943e6d155181519
-DefaultImporter:
+guid: 28189444f97f59f4080b9146857f6833
+NativeFormatImporter:
  externalObjects: {}
+  mainObjectFileID: 2100000
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Shader/光圈/aperture.shadergraph
+++ b/Assets/Shader/光圈/aperture.shadergraph
--- a/Assets/Shader/光圈/aperture.shadergraph.meta
+++ b/Assets/Shader/光圈/aperture.shadergraph.meta
@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: efd32e3e59392b742b7aba2ff3c73b41
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
--- a/Assets/图/动画/renwu.controller
+++ b/Assets/图/动画/renwu.controller
@ -17,11 +17,12 @@ AnimatorStateMachine:
    m_Position: {x: -10, y: 60, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
-  m_EntryTransitions: []
+  m_EntryTransitions:
+  - {fileID: 351989570621910821}
  m_StateMachineTransitions: {}
  m_StateMachineBehaviours: []
  m_AnyStatePosition: {x: -110, y: -30, z: 0}
-  m_EntryPosition: {x: -60, y: 180, z: 0}
+  m_EntryPosition: {x: -40, y: 190, z: 0}
  m_ExitPosition: {x: 800, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: 1259281646917324526}
@ -47,6 +48,20 @@ AnimatorController:
    m_IKPass: 0
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
+--- !u!1109 &351989570621910821
+AnimatorTransition:
+  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: 3926615483802031973}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 1
 --- !u!1102 &1259281646917324526
 AnimatorState:
  serializedVersion: 5
--- a/Assets/图/动画包2.unitypackage.meta
+++ b/Assets/图/动画包2.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 044ff6b1ad550174f889a7d6c83247e1
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/游戏内动画资源/AM/走.anim
+++ b/Assets/游戏内动画资源/AM/走.anim
@ -10230,7 +10230,7 @@ AnimationClip:
        outWeight: 0.33333334
      - serializedVersion: 3
        time: 1
-        value: 0.050330877
+        value: 1.9645065
        inSlope: 0
        outSlope: 0
        tangentMode: 136
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -549,7 +549,20 @@ PlayerSettings:
  webGLLinkerTarget: 1
  webGLThreadsSupport: 0
  webGLDecompressionFallback: 0
-  scriptingDefineSymbols: {}
+  scriptingDefineSymbols:
+    1: UNITY_POST_PROCESSING_STACK_V2
+    7: UNITY_POST_PROCESSING_STACK_V2
+    13: UNITY_POST_PROCESSING_STACK_V2
+    14: UNITY_POST_PROCESSING_STACK_V2
+    19: UNITY_POST_PROCESSING_STACK_V2
+    21: UNITY_POST_PROCESSING_STACK_V2
+    25: UNITY_POST_PROCESSING_STACK_V2
+    27: UNITY_POST_PROCESSING_STACK_V2
+    28: UNITY_POST_PROCESSING_STACK_V2
+    29: UNITY_POST_PROCESSING_STACK_V2
+    30: UNITY_POST_PROCESSING_STACK_V2
+    32: UNITY_POST_PROCESSING_STACK_V2
+    33: UNITY_POST_PROCESSING_STACK_V2
  additionalCompilerArguments: {}
  platformArchitecture: {}
  scriptingBackend: {}
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@ -11,7 +11,7 @@ TagManager:
  - Default
  - TransparentFX
  - Ignore Raycast
-  - 
+  - post
  - Water
  - UI
  - 
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@ -27,6 +27,9 @@ EditorUserSettings:
      value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
      flags: 0
    RecentlyUsedScenePath-7:
+      value: 22424703114646680e0b0227036cdafade90ecf1aafdcdb8e2dc99eb0c69f6dc6a20dea7f234362820
+      flags: 0
+    RecentlyUsedScenePath-2:
      value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb
      flags: 0
    UnityEditor.ShaderGraph.Blackboard:
Author	SHA1	Message	Date
SAIPO	8762248882	Accept Merge Request #89 : (SaipoVersion -> master) Merge Request: 8.14合并 Created By: @SAIPO Accepted By: @SAIPO URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/89	2021-08-14 08:00:17 +08:00
SAIPO	e2d0423a3b	1	2021-08-14 07:57:06 +08:00
SAIPO	ca4294b0bf	1.完善了对话内容，使对话内容更加口语化和方言化。 2.添加了Shader的框架（与屏幕后特效相关） 1）加入了LightController的代码文件，主要控制烛光等灯光的空气扰动现象 2）加入了VolumeController的代码文件，主要与屏幕后特效的控制变量相关 3）在场景中加入了Volume的对象，控制屏幕后特效Shader的运行 3.挪动了场景中煤油灯的位置，并且为煤油灯添加了会产生空气扰动使光范围发生变化的功能 4.为测试场景中的镜子添加了临时提示光边Shader	2021-08-14 07:43:34 +08:00
SAIPO	0e3f372bcf	1	2021-08-14 04:44:23 +08:00
Roman	35d0d80808	详情见最新RomanVersion Merge Request: 详情见最新RomanVersion Created By: @Roman Accepted By: @Roman URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/88	2021-08-14 01:43:42 +08:00
Roman	c8c9c895f8	详情见最新RomanVersion Merge Request: 详情见最新RomanVersion Created By: @Roman Accepted By: @Roman URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/87	2021-08-13 00:32:23 +08:00
Roman	717b2a11cc	详情见最新RomanVersion Merge Request: 详情见最新RomanVersion Created By: @Roman Accepted By: @Roman URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/78	2021-08-12 00:54:29 +08:00
Roman	a01fcd5c0b	详情见最新RomanVersion Merge Request: 详情见最新RomanVersion Created By: @Roman Accepted By: @Roman URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/77	2021-08-11 02:18:50 +08:00
Roman	454b038d55	详情见最新RomanVersion Merge Request: 详情见最新RomanVersion Created By: @Roman Accepted By: @Roman URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/76	2021-08-11 00:08:10 +08:00
SAIPO	dac3a2a444	Squashed commit of the following: commit 2781f7f874d8b595397c9bc5108186d845fe6bb0 Merge: 2faf844 b262e57 Author: Roman <1325980292@qq.com> Date: Mon Aug 9 23:15:43 2021 +0800 详情见最新RomanVers Merge Request: ？ Created By: @Roman Accepted By: @Roman URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/74 commit b262e579b24c8ffba6f08a5b79b9577b6d850d8b Author: Roman <1325980292@qq.com> Date: Mon Aug 9 23:14:55 2021 +0800 任务：以动画实现移动：实验场景：【各种系统测试与陈列】 1.创建测试小孩游戏物体 2.创建新的AC 3.编写步行动画逻辑：遇到问题，动画似乎不行，移动方式暂时换回原来的。：其余场景没有受到影响 commit 2faf844f461da8740a63e25413657b264e4eec22 Merge: 7749e35 0bc1c97 Author: Roman <1325980292@qq.com> Date: Mon Aug 9 21:24:20 2021 +0800 合并了麒哥的动画包2 Merge Request: ？？ Created By: @Roman Accepted By: @Roman URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/73 commit 0bc1c970e5ec4d993a0c81c7149901408664df76 Author: Roman <1325980292@qq.com> Date: Mon Aug 9 21:23:33 2021 +0800 合并了麒哥的动画包2 commit 7749e35c85f697a28234892cef01b369ef1b8c9c Merge: a4d3c53 9b7dbdf Author: Roman <1325980292@qq.com> Date: Sat Aug 7 01:32:57 2021 +0800 详情见RomanVersion最新提交 commit 9b7dbdf941327c1c891d19e82dc0460abfdb39c4 Author: Roman <1325980292@qq.com> Date: Sat Aug 7 01:31:29 2021 +0800 任务：搭建“序章-战场”的整体流程框架 1.创建可交互电报机这个逻辑物体 .在所有脚本首行添加说明方便查看 2.编写假电报机类，因为这个电报机没有电报机功能，而是一个类似事件的物体。 3.使假电报机可以分清场景中电话线断裂和修复的情况，并对其做出不同反应。 4.没修完电报机的反馈等待策划，修完了的等待我明天编写场景的多态系统 5.均通过了程序简单测试，请各位尽快拉取寻找问题下班，别摸了，兄弟们 commit a4d3c53f64887ad36dd7cdfce6ca8dda59471e8f Merge: 2dd6b3a b1dc321 Author: Roman <1325980292@qq.com> Date: Mon Jul 26 19:31:18 2021 +0800 傻逼coding，草你妈 Merge Request: 傻逼coding，草你妈 Created By: @Roman Accepted By: @Roman URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/52 commit b1dc32196aedf51326078a004361078fde8589ca Author: Roman <1325980292@qq.com> Date: Mon Jul 26 19:30:24 2021 +0800 傻逼coding commit d816886a9d13de83ff96d0e96358433b95dbcc17 Author: Roman <1325980292@qq.com> Date: Mon Jul 26 19:28:51 2021 +0800 ？ commit 86f446eb05a5150a3933f47f77c28099179a7291 Author: Roman <1325980292@qq.com> Date: Mon Jul 26 19:26:14 2021 +0800 测试 # Conflicts: # UserSettings/EditorUserSettings.asset	2021-08-09 23:45:01 +08:00
Roman	2781f7f874	详情见最新RomanVers Merge Request: ？ Created By: @Roman Accepted By: @Roman URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/74	2021-08-09 23:15:43 +08:00
Roman	2faf844f46	合并了麒哥的动画包2 Merge Request: ？？ Created By: @Roman Accepted By: @Roman URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/73	2021-08-09 21:24:20 +08:00
Roman	7749e35c85	详情见RomanVersion最新提交	2021-08-07 01:32:57 +08:00
Roman	a4d3c53f64	傻逼coding，草你妈 Merge Request: 傻逼coding，草你妈 Created By: @Roman Accepted By: @Roman URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/52	2021-07-26 19:31:18 +08:00
SAIPO	86fc77f246	修改bug	2021-07-26 19:02:49 +08:00