迷惑

2026-05-26 10:48:49 -04:00
parent b5cb6152ff
commit 76f498ae2b
15 changed files with 170 additions and 156 deletions
--- a/Assets/Prefabs/MainGame/Characters/AttributeCollection.asset
+++ b/Assets/Prefabs/MainGame/Characters/AttributeCollection.asset
@@ -120,6 +120,18 @@ MonoBehaviour:
    - attributeKey: DodgeInterval
      useManualInput: 0
      attributeValue: 0.5
+    - attributeKey: NegativeBuffDealtDurationMultiplier
+      useManualInput: 0
+      attributeValue: 1
+    - attributeKey: NegativeBuffReceivedDurationMultiplier
+      useManualInput: 0
+      attributeValue: 1
+    - attributeKey: PositiveBuffDealtDurationMultiplier
+      useManualInput: 0
+      attributeValue: 1
+    - attributeKey: PositiveBuffReceivedDurationMultiplier
+      useManualInput: 0
+      attributeValue: 1
    keyColumnWidth: 0.5
  runtimeAttributes:
    _duplicateStrategy: 0
--- a/Assets/Prefabs/MainGame/Characters/Player/Data/Player_AttributesData.asset
+++ b/Assets/Prefabs/MainGame/Characters/Player/Data/Player_AttributesData.asset
@@ -34,7 +34,7 @@ MonoBehaviour:
      Data: 
    - Name: 
      Entry: 12
-      Data: 38
+      Data: 39
    - Name: 
      Entry: 7
      Data: 
@@ -491,6 +491,18 @@ MonoBehaviour:
    - Name: 
      Entry: 8
      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: Shield
+    - Name: $v
+      Entry: 4
+      Data: 0
+    - Name: 
+      Entry: 8
+      Data: 
    - Name: 
      Entry: 13
      Data: 
--- a/Assets/Prefabs/MainGame/Characters/Player/PlayerAnimator.controller
+++ b/Assets/Prefabs/MainGame/Characters/Player/PlayerAnimator.controller
@@ -1295,7 +1295,7 @@ AnimatorState:
  m_IKOnFeet: 0
  m_WriteDefaultValues: 1
  m_Mirror: 0
-  m_SpeedParameterActive: 0
+  m_SpeedParameterActive: 1
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
@@ -2235,31 +2235,31 @@ AnimatorStateMachine:
    m_Position: {x: 290, y: 670, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 2223134468494821173}
-    m_Position: {x: 690, y: -750, z: 0}
+    m_Position: {x: 680, y: -750, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 7864196514086135053}
-    m_Position: {x: 690, y: -700, z: 0}
+    m_Position: {x: 680, y: -700, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -4851416975432954742}
-    m_Position: {x: 690, y: -650, z: 0}
+    m_Position: {x: 680, y: -650, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 8595554824368195830}
-    m_Position: {x: 690, y: -600, z: 0}
+    m_Position: {x: 680, y: -600, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 7931944737921474743}
-    m_Position: {x: 690, y: -550, z: 0}
+    m_Position: {x: 680, y: -550, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -2607808126468391771}
-    m_Position: {x: 690, y: -500, z: 0}
+    m_Position: {x: 680, y: -500, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -4983804647749610965}
-    m_Position: {x: 690, y: -450, z: 0}
+    m_Position: {x: 680, y: -450, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -495817140485372644}
-    m_Position: {x: 690, y: -400, z: 0}
+    m_Position: {x: 680, y: -400, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 7309516632162187452}
-    m_Position: {x: 690, y: -350, z: 0}
+    m_Position: {x: 680, y: -350, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 3248467611931784592}
    m_Position: {x: -480, y: 220, z: 0}
@@ -2448,7 +2448,7 @@ AnimatorStateMachine:
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: 1337410687775109143}
-    m_Position: {x: 290, y: 20, z: 0}
+    m_Position: {x: 290, y: 30, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 4463052745325409679}
    m_Position: {x: 70, y: -130, z: 0}
@@ -2542,7 +2542,7 @@ AnimatorState:
  m_IKOnFeet: 0
  m_WriteDefaultValues: 1
  m_Mirror: 0
-  m_SpeedParameterActive: 0
+  m_SpeedParameterActive: 1
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
@@ -3107,7 +3107,7 @@ AnimatorState:
  m_IKOnFeet: 0
  m_WriteDefaultValues: 1
  m_Mirror: 0
-  m_SpeedParameterActive: 0
+  m_SpeedParameterActive: 1
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
@@ -6088,7 +6088,7 @@ AnimatorState:
  m_IKOnFeet: 0
  m_WriteDefaultValues: 1
  m_Mirror: 0
-  m_SpeedParameterActive: 0
+  m_SpeedParameterActive: 1
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
--- a/Assets/Prefabs/MainGame/Characters/Player/PlayerOverride.overrideController
+++ b/Assets/Prefabs/MainGame/Characters/Player/PlayerOverride.overrideController
@@ -10,23 +10,23 @@ AnimatorOverrideController:
  m_Controller: {fileID: 9100000, guid: fda18c69e5ccb554d8ae8867ca37c7cd, type: 2}
  m_Clips:
  - m_OriginalClip: {fileID: 7400000, guid: 99d9faf139ff6064c8e7d4d9d63f58e0, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: db4e03a90cfcbca4a80335177ce4377e, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: d95d162166de6ef43b1b02fd81bfac5f, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: ed2676607db0d6a4c99fa5df36dd09b7, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: a6530c5433035d040974f3cf8572fe7c, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 5c1c87a6d19434d4fa8401a700723ca0, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: b24a11ee47f88ff4eb978d5aca0ae93a, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: 2ca224e0bb91d7f4bb55fbb05ba6acf2, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 006c64cfe8d1ff74a95609b30c08226f, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: 25258b12f158def43a56416b73f94d80, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: 2f2de8fb421af5d479106b8ef9505348, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 55fc8ba7f6ff77c43b6fa2a248dc76ef, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: e6caba10fc3a02649821183412ab5d27, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: 2ac88efeeb1f1134bad19886bfd66dd5, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 6fe92b2195a121740a2634989e0f716c, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: a67e0dc7ee6cae741899189ffa2ddc92, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: e9235e894ec47e84fb276beef822777e, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: d70ab478c40d9624280e39279a520606, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: 7fde74c9e60900e4ca19db67cf173155, type: 2}
-    m_OverrideClip: {fileID: -4996637841620507632, guid: 5ae4e6fb437c04a49b116a062daf9892, type: 2}
+    m_OverrideClip: {fileID: -7353071353133039039, guid: 66d7c97acde74ce4e899ad9b96187c0e, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: 608dfee9855dc694aa1ea89a29de4d21, type: 2}
-    m_OverrideClip: {fileID: 6608794370682065959, guid: f1927d06b481d974aa61cf56710dce94, type: 2}
+    m_OverrideClip: {fileID: 711754592020139737, guid: 22059bdfc675ed4449c937fd23f06fa9, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: 3943c8602c6198544a485240dc3e4dc5, type: 2}
-    m_OverrideClip: {fileID: -266041012799328612, guid: 03ddb2652d7010b47bb65f6eaa27091c, type: 2}
+    m_OverrideClip: {fileID: 7814122754322888409, guid: f5d72584f2746ae488124c0f03cf3bee, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: 44a4a4e66482cdf4a90dfe1a2b8dcf9f, type: 2}
    m_OverrideClip: {fileID: -1037278177794748566, guid: 2ecf7267f05b6a74fa3a7b5831e7a7c7, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: 03b1b65aa412abb40a823ccb29db5e68, type: 2}
@@ -34,9 +34,9 @@ AnimatorOverrideController:
  - m_OriginalClip: {fileID: 7400000, guid: 60e1d16bb1bf0d34ca9779213d1de121, type: 2}
    m_OverrideClip: {fileID: -5197396910865140100, guid: e04988b618f662a44934fb8b31dee442, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: 16e418b0431434e45aceb776e47e4049, type: 2}
-    m_OverrideClip: {fileID: -6679882188084308422, guid: ca9edd43f681c7046a02489b15017517, type: 2}
+    m_OverrideClip: {fileID: -4186487134355181447, guid: f198c27c52a158942ab682ae4fcc4764, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: 16fe7b5baf0b4484d82bdf6e65f7f764, type: 2}
-    m_OverrideClip: {fileID: -962660157572785255, guid: 9ea02f821f2f66243bfc198d8367f8d5, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: fcbbe6ec48ef21241a5f6aa22b14239c, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: c4be64c0aa99e8d46b18bb9bbfe50b51, type: 2}
    m_OverrideClip: {fileID: 8895735517814013975, guid: cc7be8e826d20cc41a72c20f55350257, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: d6cd30a547339cf4ab437b1cf287b3b6, type: 2}
@@ -62,17 +62,17 @@ AnimatorOverrideController:
  - m_OriginalClip: {fileID: 7400000, guid: 26617ca51425c224c8301ca9732957d1, type: 2}
    m_OverrideClip: {fileID: 7400000, guid: 63648c46c93a31c45992fc87226f6250, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: 809bedf47813ead41a782f2fb907e92a, type: 2}
-    m_OverrideClip: {fileID: 6855822782620295428, guid: 36518a264992be14e99e7c3fd48a7f65, type: 2}
+    m_OverrideClip: {fileID: 526448870181282028, guid: dca0cb386a2cd714ea62c697c5b228bb, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: 56bfc371e2f641742a4e265413247bb7, type: 2}
    m_OverrideClip: {fileID: -3379015116143753677, guid: 70dff40dddf098c46b0397cf85a1c4bb, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: 77f0087f588da334a9390bac754e0661, type: 2}
-    m_OverrideClip: {fileID: 708219783587015279, guid: 2ade289f2956acc4aa42ef79025ef2b4, type: 2}
+    m_OverrideClip: {fileID: 38608564573035343, guid: 276c16384832a0841b7f23386709893c, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: 4bf2c010f7d09074d90bdf5ba4a963b4, type: 2}
-    m_OverrideClip: {fileID: -947574008279609053, guid: a31727863ab7d8b46964840f10d6688e, type: 2}
+    m_OverrideClip: {fileID: -7663133397540677395, guid: 86667fcf08e3e15408e18c6efd36ddf1, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: 3b5b951727ba18f44bfd49eb783b5962, type: 2}
    m_OverrideClip: {fileID: 7310127618108163040, guid: 355eb38f3725e6e48bc4d7fcf2608313, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: 6a1df70940a591645b87b639bd2e4db2, type: 2}
-    m_OverrideClip: {fileID: 6704612531316691056, guid: 0b3667eb58bb1344182d36d9c6aca3d9, type: 2}
+    m_OverrideClip: {fileID: 5622727906928794325, guid: c8e44d541a7617e47b0599da2cb5d7af, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: c1a20f998e23155458548b50a2e4ef78, type: 2}
    m_OverrideClip: {fileID: -7890072066398965591, guid: 27b0b2d99a406b84085629f58ec4ee96, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: 81cb8ecb343e3cd439e11f575d9f8787, type: 2}
@@ -88,7 +88,7 @@ AnimatorOverrideController:
  - m_OriginalClip: {fileID: 7400000, guid: 12d6fdaf1287de34b8242fef8bfdfffb, type: 2}
    m_OverrideClip: {fileID: -7202508781374027911, guid: 351c21c94ad728249ad533d8d2f511ae, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: 1069018dcbf6b264683585b238b48d7f, type: 2}
-    m_OverrideClip: {fileID: 2128303080740529859, guid: 881da7fc50f4662469213ca12cf29d31, type: 2}
+    m_OverrideClip: {fileID: 3117792367539062942, guid: 15695eb7a90849a4782af65d2c9c8a4c, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: ace81af5b21651a4ba800accd47fbe34, type: 2}
    m_OverrideClip: {fileID: 3336616053425093602, guid: 2a98f848897e27d45b24f8db62deb7ad, type: 2}
  - m_OriginalClip: {fileID: 7400000, guid: 3859e6d68f2917c44a01ffac957738c8, type: 2}