瀏覽代碼

修改bug

DESKTOP-FB72PO8\Administrator 12 小時之前
父節點
當前提交
ebf8eace63

+ 8 - 3
Assets/Art/Character/Zuoqi_feijian1/Zq_feijian1.mat

@@ -8,11 +8,10 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Zq_feijian1
-  m_Shader: {fileID: -6465566751694194690, guid: 3bb35f7f86ffc45c2aa6fc4291f787fc, type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: d1ba3a475e53be04c9bb3365e1e94a9e, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _SHADING_STYLE_SKIN_AND_TEXTILES
+  m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -28,6 +27,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 9ffba8d91daad454b8e8ca5f32e45fe1, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Base_map:
+        m_Texture: {fileID: 2800000, guid: 9ffba8d91daad454b8e8ca5f32e45fe1, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _BumpMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -163,8 +166,10 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Emission: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _HighColor: {r: 1, g: 1, b: 1, a: 1}
+    - _MainColor: {r: 1, g: 1, b: 1, a: 0}
     - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
     - _RimColor: {r: 0.21172799, g: 0.24817115, b: 0.264, a: 0}
     - _ShadowColor: {r: 0.8, g: 0.8, b: 1, a: 1}

+ 3 - 3
Assets/Art/nanzhujiao/nanzhujiao_chuwudai.mat

@@ -28,7 +28,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _Base_map:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 304348f4218a7de4eb13049584eb9d09, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
@@ -166,10 +166,10 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _Emission: {r: 0, g: 0, b: 0, a: 0}
+    - _Emission: {r: 1, g: 1, b: 1, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _HighColor: {r: 1, g: 1, b: 1, a: 1}
-    - _MainColor: {r: 0, g: 0, b: 0, a: 0}
+    - _MainColor: {r: 1, g: 1, b: 1, a: 0}
     - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
     - _RimColor: {r: 0.21172799, g: 0.24817115, b: 0.264, a: 0}
     - _ShadowColor: {r: 0.8, g: 0.8, b: 1, a: 1}

+ 45 - 17
Assets/Res/HeroAnimtion/fb_wulonglun.asset

@@ -1,5 +1,33 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-6135444481631302940
+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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: jihuo
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 2530115299889905666
+  references:
+    version: 2
+    RefIds:
+    - rid: 2530115299889905666
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: a0099887950fd0b47b22c72df744a257, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &-822125633454001215
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -43,36 +71,42 @@ MonoBehaviour:
   _Definition:
     _Transitions:
     - {fileID: 8413550133293145741}
-    - {fileID: 0}
     - {fileID: -822125633454001215}
     - {fileID: 4545472588857971225}
+    - {fileID: -6135444481631302940}
     _Modifiers:
     - _From: 0
       _To: 0
       _Fade: 0
-    - _From: 2
-      _To: 0
-      _Fade: 0
     - _From: 1
       _To: 0
       _Fade: 0
-    - _From: 3
+    - _From: 1
       _To: 1
       _Fade: 0
     - _From: 2
       _To: 1
       _Fade: 0
+    - _From: 2
+      _To: 2
+      _Fade: 0
     - _From: 1
-      _To: 1
+      _To: 2
       _Fade: 0
     - _From: 0
-      _To: 1
-      _Fade: 0
-    - _From: 1
       _To: 2
       _Fade: 0
+    - _From: 0
+      _To: 1
+      _Fade: 0
     - _From: 2
-      _To: 2
+      _To: 0
+      _Fade: 0
+    - _From: 3
+      _To: 0
+      _Fade: 0
+    - _From: 3
+      _To: 1
       _Fade: 0
     - _From: 3
       _To: 2
@@ -83,17 +117,11 @@ MonoBehaviour:
     - _From: 2
       _To: 3
       _Fade: 0
-    - _From: 0
-      _To: 3
-      _Fade: 0
     - _From: 1
       _To: 3
       _Fade: 0
     - _From: 0
-      _To: 2
-      _Fade: 0
-    - _From: 3
-      _To: 0
+      _To: 3
       _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0

+ 62 - 0
Assets/Scenes/testCombat.scene

@@ -2960,6 +2960,67 @@ RectTransform:
   m_AnchoredPosition: {x: -5, y: 0}
   m_SizeDelta: {x: -20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1001 &1089162872
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3076136778433984314, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_Name
+      value: Nanzhu (3)
+      objectReference: {fileID: 0}
+    - target: {fileID: 3780976137779322548, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.105
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 6.027
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.281
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
 --- !u!1 &1185765189
 GameObject:
   m_ObjectHideFlags: 0
@@ -6923,3 +6984,4 @@ SceneRoots:
   - {fileID: 1584646302}
   - {fileID: 2622624}
   - {fileID: 144571669}
+  - {fileID: 1089162872}