更新

2026-01-03 18:19:39 -05:00
parent 3bcd7c1cf8
commit 33b1795c1f
7387 changed files with 2762819 additions and 716926 deletions
--- a/Assets/Resources/Items/MainWeapons/FutureWand.prefab
+++ b/Assets/Resources/Items/MainWeapons/FutureWand.prefab
@@ -137,7 +137,7 @@ MonoBehaviour:
  DebugActive: 0
  InScriptDrivenPause: 0
  FeedbacksList:
-  - rid: 5266334308210049401
+  - rid: 563130844529033324
  KeepPlayModeChanges: 0
  PerformanceMode: 0
  RestoreInitialValuesOnDisable: 0
@@ -146,20 +146,20 @@ MonoBehaviour:
  references:
    version: 2
    RefIds:
-    - rid: 5266334308210049401
-      type: {class: MMF_CinemachineImpulse, ns: MoreMountains.FeedbacksForThirdParty, asm: MoreMountains.Tools}
+    - rid: 563130844529033324
+      type: {class: MMF_CinemachineRotation, ns: MoreMountains.FeedbacksForThirdParty, asm: MoreMountains.Tools}
      data:
        Active: 1
-        UniqueID: 122366422
-        Label: Cinemachine Impulse
-        OriginalLabel: Cinemachine Impulse
+        UniqueID: -1235249708
+        Label: Cinemachine Rotation Shake
+        OriginalLabel: Cinemachine Rotation Shake
        ChannelMode: 0
        Channel: 0
        MMChannelDefinition: {fileID: 0}
        Chance: 100
        Timing:
          TimescaleMode: 0
-          applyOwnerExternalTimescale: 1
+          applyOwnerExternalTimescale: 0
          ExcludeFromHoldingPauses: 0
          ContributeToTotalDuration: 1
          InitialDelay: 0
@@ -218,52 +218,62 @@ MonoBehaviour:
          m_RotationOrder: 4
        RemapRangeFalloff: {x: 0, y: 1}
        AutomaticShakerSetupButton:
-          ButtonText: Automatic Shaker Setup
+          ButtonText: 
        Owner: {fileID: 5264817877047676679}
        DebugActive: 0
-        m_ImpulseDefinition:
-          ImpulseChannel: 1
-          ImpulseShape: 2
-          CustomImpulseShape:
-            serializedVersion: 2
-            m_Curve: []
-            m_PreInfinity: 2
-            m_PostInfinity: 2
-            m_RotationOrder: 4
-          ImpulseDuration: 0.2
-          ImpulseType: 0
-          DissipationRate: 0
-          RawSignal: {fileID: 11400000, guid: bcf6524ce6451f34cb7106d0c00da9a5, type: 2}
-          AmplitudeGain: 1
-          FrequencyGain: 1
-          RepeatMode: 0
-          Randomize: 1
-          TimeEnvelope:
-            AttackShape:
-              serializedVersion: 2
-              m_Curve: []
-              m_PreInfinity: 2
-              m_PostInfinity: 2
-              m_RotationOrder: 4
-            DecayShape:
-              serializedVersion: 2
-              m_Curve: []
-              m_PreInfinity: 2
-              m_PostInfinity: 2
-              m_RotationOrder: 4
-            AttackTime: 0
-            SustainTime: 0.2
-            DecayTime: 0.7
-            ScaleWithImpact: 1
-            HoldForever: 0
-          ImpactRadius: 100
-          DirectionMode: 0
-          DissipationMode: 2
-          DissipationDistance: 100
-          PropagationSpeed: 343
-        Velocity: {x: 0, y: 0, z: 0}
-        ClearImpulseOnStop: 0
-        DrawGizmos: 0
+        Duration: 0.2
+        RotationAmplitude: {x: 0, y: 0, z: 0}
+        ShakeCurve:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: -3.1114726
+            outSlope: -3.1114726
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0.0352
+          - serializedVersion: 3
+            time: 1
+            value: 0
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        UseAttenuation: 0
+        AttenuationRange: 50
+        AttenuationCurve:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          - serializedVersion: 3
+            time: 1
+            value: 0
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        DrawGizmos: 1
 --- !u!1 &1531999231273389742
 GameObject:
  m_ObjectHideFlags: 0
@@ -357,6 +367,7 @@ MonoBehaviour:
  - {fileID: 11400000, guid: 5dae8552f60f2c04b8ec6bd5c070772e, type: 2}
  - {fileID: 11400000, guid: a31727863ab7d8b46964840f10d6688e, type: 2}
  - {fileID: 11400000, guid: 2ade289f2956acc4aa42ef79025ef2b4, type: 2}
+  contentData: {fileID: 11400000, guid: 377ae7a88c5cd4549b8ba90d9dff4b15, type: 2}
  viewObjectData: {fileID: 11400000, guid: 0418af7cddfaad149a449c950a9d6e4c, type: 2}
  vfxData: {fileID: 11400000, guid: 5d145d0d0b68e6b499526e1a13f066a8, type: 2}
  comboData: {fileID: 11400000, guid: ea9965ca658cdcc45b128a62a54945bd, type: 2}
@@ -394,6 +405,7 @@ MonoBehaviour:
    - {fileID: 11400000, guid: 5c480da5ef68f364bb0c0a255baf8ea6, type: 2}
    - {fileID: 11400000, guid: 4513f05acdc283345a075b27d6838827, type: 2}
    - {fileID: 11400000, guid: 029e51258f4e4684bb7074b92568ce56, type: 2}
+    - {fileID: 11400000, guid: 798929491f3cdd4459d561d3cbb429cc, type: 2}
    SerializedBytesString: 
    Prefab: {fileID: 0}
    PrefabModificationsReferencedUnityObjects: []
@@ -412,7 +424,7 @@ MonoBehaviour:
      Data: 
    - Name: 
      Entry: 12
-      Data: 6
+      Data: 7
    - Name: 
      Entry: 7
      Data: 
@@ -593,6 +605,36 @@ MonoBehaviour:
    - Name: 
      Entry: 8
      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: SquareAura
+    - Name: $v
+      Entry: 7
+      Data: 14|AK.Wwise.Event, AK.Wwise.Unity.API.WwiseTypes
+    - Name: idInternal
+      Entry: 3
+      Data: 0
+    - Name: valueGuidInternal
+      Entry: 7
+      Data: 15|System.Byte[], mscorlib
+    - Name: 
+      Entry: 14
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: WwiseObjectReference
+      Entry: 10
+      Data: 6
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
    - Name: 
      Entry: 13
      Data: 
--- a/Assets/Resources/Items/MainWeapons/Polychrome.prefab
+++ b/Assets/Resources/Items/MainWeapons/Polychrome.prefab
@@ -667,7 +667,6 @@ MonoBehaviour:
  - rid: 563130779319140352
  - rid: 563130682456408171
  - rid: 563130683472478317
-  - rid: 563130684862890085
  KeepPlayModeChanges: 0
  PerformanceMode: 0
  RestoreInitialValuesOnDisable: 0
@@ -993,281 +992,6 @@ MonoBehaviour:
          m_RotationOrder: 4
        RemapIntensityZero: 0
        RemapIntensityOne: -0.25
-    - rid: 563130684862890085
-      type: {class: MMF_ColorAdjustments_URP, ns: MoreMountains.FeedbacksForThirdParty, asm: MoreMountains.Tools}
-      data:
-        Active: 1
-        UniqueID: 2040013610
-        Label: Color Adjustments URP
-        OriginalLabel: Color Adjustments URP
-        ChannelMode: 0
-        Channel: 0
-        MMChannelDefinition: {fileID: 0}
-        Chance: 100
-        Timing:
-          TimescaleMode: 0
-          applyOwnerExternalTimescale: 1
-          ExcludeFromHoldingPauses: 0
-          ContributeToTotalDuration: 1
-          InitialDelay: 0
-          CooldownDuration: 0
-          InterruptsOnStop: 1
-          NumberOfRepeats: 0
-          RepeatForever: 0
-          DelayBetweenRepeats: 1
-          PlayCount: 0
-          LimitPlayCount: 0
-          MaxPlayCount: 3
-          SetPlayCountToZeroOnReset: 0
-          MMFeedbacksDirectionCondition: 0
-          PlayDirection: 0
-          ConstantIntensity: 0
-          UseIntensityInterval: 0
-          IntensityIntervalMin: 0
-          IntensityIntervalMax: 0
-          Sequence: {fileID: 0}
-          TrackID: 0
-          Quantized: 0
-          TargetBPM: 120
-        AutomatedTargetAcquisition:
-          Mode: 0
-          ChildIndex: 0
-        RandomizeOutput: 0
-        RandomMultiplier: {x: 0.8, y: 1}
-        RandomizeDuration: 0
-        RandomDurationMultiplier: {x: 0.5, y: 2}
-        UseRange: 0
-        RangeDistance: 5
-        UseRangeFalloff: 0
-        RangeFalloff:
-          serializedVersion: 2
-          m_Curve:
-          - serializedVersion: 3
-            time: 0
-            value: 1
-            inSlope: 0
-            outSlope: 0
-            tangentMode: 0
-            weightedMode: 0
-            inWeight: 0
-            outWeight: 0
-          - serializedVersion: 3
-            time: 1
-            value: 0
-            inSlope: 0
-            outSlope: 0
-            tangentMode: 0
-            weightedMode: 0
-            inWeight: 0
-            outWeight: 0
-          m_PreInfinity: 2
-          m_PostInfinity: 2
-          m_RotationOrder: 4
-        RemapRangeFalloff: {x: 0, y: 1}
-        AutomaticShakerSetupButton:
-          ButtonText: Automatic Shaker Setup
-        Owner: {fileID: 8325693285929710460}
-        DebugActive: 0
-        ShakeDuration: 0.5
-        RelativeIntensity: 1
-        ResetShakerValuesAfterShake: 1
-        ResetTargetValuesAfterShake: 1
-        ShakePostExposure:
-          serializedVersion: 2
-          m_Curve:
-          - serializedVersion: 3
-            time: 0
-            value: 0
-            inSlope: 0
-            outSlope: 0
-            tangentMode: 0
-            weightedMode: 0
-            inWeight: 0
-            outWeight: 0
-          - serializedVersion: 3
-            time: 0.5
-            value: 1
-            inSlope: 0
-            outSlope: 0
-            tangentMode: 0
-            weightedMode: 0
-            inWeight: 0
-            outWeight: 0
-          - serializedVersion: 3
-            time: 1
-            value: 0
-            inSlope: 0
-            outSlope: 0
-            tangentMode: 0
-            weightedMode: 0
-            inWeight: 0
-            outWeight: 0
-          m_PreInfinity: 2
-          m_PostInfinity: 2
-          m_RotationOrder: 4
-        RemapPostExposureZero: 0
-        RemapPostExposureOne: 0
-        ShakeHueShift:
-          serializedVersion: 2
-          m_Curve:
-          - serializedVersion: 3
-            time: 0
-            value: 0
-            inSlope: 0
-            outSlope: 0
-            tangentMode: 0
-            weightedMode: 0
-            inWeight: 0
-            outWeight: 0
-          - serializedVersion: 3
-            time: 0.5
-            value: 1
-            inSlope: 0
-            outSlope: 0
-            tangentMode: 0
-            weightedMode: 0
-            inWeight: 0
-            outWeight: 0
-          - serializedVersion: 3
-            time: 1
-            value: 0
-            inSlope: 0
-            outSlope: 0
-            tangentMode: 0
-            weightedMode: 0
-            inWeight: 0
-            outWeight: 0
-          m_PreInfinity: 2
-          m_PostInfinity: 2
-          m_RotationOrder: 4
-        RemapHueShiftZero: 0
-        RemapHueShiftOne: 0
-        ShakeSaturation:
-          serializedVersion: 2
-          m_Curve:
-          - serializedVersion: 3
-            time: 0
-            value: 0
-            inSlope: 0
-            outSlope: 0
-            tangentMode: 0
-            weightedMode: 0
-            inWeight: 0
-            outWeight: 0
-          - serializedVersion: 3
-            time: 0.5
-            value: 1
-            inSlope: 0
-            outSlope: 0
-            tangentMode: 0
-            weightedMode: 0
-            inWeight: 0
-            outWeight: 0
-          - serializedVersion: 3
-            time: 1
-            value: 0
-            inSlope: 0
-            outSlope: 0
-            tangentMode: 0
-            weightedMode: 0
-            inWeight: 0
-            outWeight: 0
-          m_PreInfinity: 2
-          m_PostInfinity: 2
-          m_RotationOrder: 4
-        RemapSaturationZero: 0
-        RemapSaturationOne: 0
-        ShakeContrast:
-          serializedVersion: 2
-          m_Curve:
-          - serializedVersion: 3
-            time: 0
-            value: 1
-            inSlope: -3.1114726
-            outSlope: -3.1114726
-            tangentMode: 0
-            weightedMode: 0
-            inWeight: 0.33333334
-            outWeight: 0.0352
-          - serializedVersion: 3
-            time: 1
-            value: 0
-            inSlope: 0
-            outSlope: 0
-            tangentMode: 0
-            weightedMode: 0
-            inWeight: 0
-            outWeight: 0
-          m_PreInfinity: 2
-          m_PostInfinity: 2
-          m_RotationOrder: 4
-        RemapContrastZero: 0
-        RemapContrastOne: 50
-        ColorFilterMode: 0
-        ColorFilterGradient:
-          serializedVersion: 2
-          key0: {r: 1, g: 1, b: 1, a: 1}
-          key1: {r: 1, g: 1, b: 1, a: 1}
-          key2: {r: 0, g: 0, b: 0, a: 0}
-          key3: {r: 0, g: 0, b: 0, a: 0}
-          key4: {r: 0, g: 0, b: 0, a: 0}
-          key5: {r: 0, g: 0, b: 0, a: 0}
-          key6: {r: 0, g: 0, b: 0, a: 0}
-          key7: {r: 0, g: 0, b: 0, a: 0}
-          ctime0: 0
-          ctime1: 65535
-          ctime2: 0
-          ctime3: 0
-          ctime4: 0
-          ctime5: 0
-          ctime6: 0
-          ctime7: 0
-          atime0: 0
-          atime1: 65535
-          atime2: 0
-          atime3: 0
-          atime4: 0
-          atime5: 0
-          atime6: 0
-          atime7: 0
-          m_Mode: 0
-          m_ColorSpace: -1
-          m_NumColorKeys: 2
-          m_NumAlphaKeys: 2
-        ColorFilterDestination: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
-        ColorFilterCurve:
-          serializedVersion: 2
-          m_Curve:
-          - serializedVersion: 3
-            time: 0
-            value: 0
-            inSlope: 0
-            outSlope: 0
-            tangentMode: 0
-            weightedMode: 0
-            inWeight: 0
-            outWeight: 0
-          - serializedVersion: 3
-            time: 0.5
-            value: 1
-            inSlope: 0
-            outSlope: 0
-            tangentMode: 0
-            weightedMode: 0
-            inWeight: 0
-            outWeight: 0
-          - serializedVersion: 3
-            time: 1
-            value: 0
-            inSlope: 0
-            outSlope: 0
-            tangentMode: 0
-            weightedMode: 0
-            inWeight: 0
-            outWeight: 0
-          m_PreInfinity: 2
-          m_PostInfinity: 2
-          m_RotationOrder: 4
    - rid: 563130686401937514
      type: {class: MMF_CinemachinePosition, ns: MoreMountains.Feedbacks, asm: MoreMountains.Tools}
      data:
@@ -1514,7 +1238,7 @@ MonoBehaviour:
        GlobalRemapOne: 1
        ModifyPlayer: 1
        PlayerOverrideDuration: 1
-        PlayerDuration: 0.08
+        PlayerDuration: 0.12
        PlayerMode: 0
        PlayerFixedValue: 0
        PlayerCurve:
@@ -1554,7 +1278,7 @@ MonoBehaviour:
        PlayerRemapOne: 0.1
        ModifyEnemy: 1
        EnemyOverrideDuration: 1
-        EnemyDuration: 0.2
+        EnemyDuration: 0.3
        EnemyMode: 0
        EnemyFixedValue: 0
        EnemyCurve:
@@ -6242,7 +5966,7 @@ MonoBehaviour:
        GlobalRemapOne: 1
        ModifyPlayer: 1
        PlayerOverrideDuration: 1
-        PlayerDuration: 0.04
+        PlayerDuration: 0.06
        PlayerMode: 0
        PlayerFixedValue: 0
        PlayerCurve:
@@ -6443,6 +6167,9 @@ MonoBehaviour:
    PrefabModificationsReferencedUnityObjects: []
    PrefabModifications: []
    SerializationNodes:
+    - Name: passiveAttributeSm
+      Entry: 6
+      Data: 
    - Name: comboSm
      Entry: 6
      Data: 
@@ -6472,6 +6199,9 @@ MonoBehaviour:
    - Name: 
      Entry: 8
      Data: 
+    - Name: activeAttributeSm
+      Entry: 6
+      Data: 
  fullBodyFuncAnims:
  - {fileID: 11400000, guid: 66d7c97acde74ce4e899ad9b96187c0e, type: 2}
  - {fileID: 11400000, guid: f5d72584f2746ae488124c0f03cf3bee, type: 2}
@@ -6485,8 +6215,11 @@ MonoBehaviour:
  - {fileID: 11400000, guid: 22f3bd8004835c846b9b71c010ecd5e4, type: 2}
  - {fileID: 11400000, guid: 77b2b9f117528f74590f162cd6a632ab, type: 2}
  - {fileID: 11400000, guid: 00f41d4451088774bad58271ff0097bc, type: 2}
+  - {fileID: 11400000, guid: 351c21c94ad728249ad533d8d2f511ae, type: 2}
+  contentData: {fileID: 11400000, guid: 98ad3fcda7168a949a766eb698768100, type: 2}
  viewObjectData: {fileID: 11400000, guid: 401e2bde415f34443ab14f20fe48f017, type: 2}
  vfxData: {fileID: 11400000, guid: f3ff888e4a6e2804fbd6faa8a732a2f2, type: 2}
+  passiveAttributeData: {fileID: 11400000, guid: df8905ea3864a2e49ab28985fec6443e, type: 2}
  comboData: {fileID: 11400000, guid: 11936c91a83eaf940b1c3c2d97f20132, type: 2}
  attackData: {fileID: 11400000, guid: a422243c6dbe4d54aa72d4fb8b96d639, type: 2}
  functionData: {fileID: 11400000, guid: 76a41913a5f85144a9e03c3c264653c3, type: 2}
@@ -6495,6 +6228,7 @@ MonoBehaviour:
  audioContainer: {fileID: 2420951624592306011}
  feedbackSc: {fileID: 5511732747931227639}
  baseAnimationGroup: {fileID: 11400000, guid: 0d5d1bbe0ea90f542a247c8a80b4cc99, type: 2}
+  activeAttributeData: {fileID: 0}
  disablePrimaryPreinput: 0
  disableSecondaryPreinput: 0
  disableSpecialAPreinput: 0