浏览代码

修复一些错误

大爷 1 年之前
父节点
当前提交
75445b8fe7

+ 2 - 0
.gitignore

@@ -3,3 +3,5 @@
 /Temp
 /Temp
 /*.csproj
 /*.csproj
 /UnityArts.sln
 /UnityArts.sln
+/.vs/UnityArts/v17/*.suo
+obj

+ 3 - 2
Assets/Prefabs/Unit/Aj.prefab.meta → Assets/BuyAssets_Model.meta

@@ -1,6 +1,7 @@
 fileFormatVersion: 2
 fileFormatVersion: 2
-guid: ad4c0d8eca02fe545912a5c081ce239b
-PrefabImporter:
+guid: eb0332c48d6baf244bdbda3c505c8aed
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
   externalObjects: {}
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 

+ 3 - 2
Assets/Prefabs/Unit/Amj.prefab.meta → Assets/Plugins.meta

@@ -1,6 +1,7 @@
 fileFormatVersion: 2
 fileFormatVersion: 2
-guid: 7167c226551c0ac47af28f96537386ab
-PrefabImporter:
+guid: e5fd28459abc8c9438a28740244bd26d
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
   externalObjects: {}
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 

+ 0 - 235
Assets/Prefabs/Unit/Aj.prefab

@@ -1,235 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &7042119172091256966
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5160706249531071732}
-  - component: {fileID: 2332256100424949404}
-  m_Layer: 0
-  m_Name: Aj
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &5160706249531071732
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7042119172091256966}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 4333487950334793260}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2332256100424949404
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7042119172091256966}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30230dd81a37f294191c8b75eaba261c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Animancer: {fileID: 496782286429750883}
-  AnimationClips:
-  - Type: 0
-    Clip:
-      _FadeDuration: 0.8
-      _Events:
-        _NormalizedTimes: []
-        _Callbacks: []
-        _Names: []
-      _Clip: {fileID: 7400000, guid: 652f1b6e587c05344a9f18f84102b66d, type: 2}
-      _Speed: 1
-      _NormalizedStartTime: NaN
-  - Type: 1
-    Clip:
-      _FadeDuration: 0.25
-      _Events:
-        _NormalizedTimes: []
-        _Callbacks: []
-        _Names: []
-      _Clip: {fileID: 7400000, guid: 47a043c408d0ee2479c771396f4c27e3, type: 2}
-      _Speed: 1
-      _NormalizedStartTime: NaN
-  - Type: 3
-    Clip:
-      _FadeDuration: 0.25
-      _Events:
-        _NormalizedTimes: []
-        _Callbacks: []
-        _Names: []
-      _Clip: {fileID: 7400000, guid: 0d6ba3f532befc54c88ec9a5bb03e193, type: 2}
-      _Speed: 1
-      _NormalizedStartTime: NaN
-  - Type: 4
-    Clip:
-      _FadeDuration: 0.25
-      _Events:
-        _NormalizedTimes: []
-        _Callbacks: []
-        _Names: []
-      _Clip: {fileID: 7400000, guid: 0878a3d5fa4695f48b9967ce32bc9b80, type: 2}
-      _Speed: 1
-      _NormalizedStartTime: NaN
-  - Type: 2
-    Clip:
-      _FadeDuration: 0.25
-      _Events:
-        _NormalizedTimes: []
-        _Callbacks: []
-        _Names: []
-      _Clip: {fileID: 7400000, guid: 736af3544010c84479ca4930b8e6d393, type: 2}
-      _Speed: 1
-      _NormalizedStartTime: NaN
-  - Type: 5
-    Clip:
-      _FadeDuration: 0.25
-      _Events:
-        _NormalizedTimes: []
-        _Callbacks: []
-        _Names: []
-      _Clip: {fileID: 7400000, guid: 8e4bd50d7fc4a5a409239668ec7cb51e, type: 2}
-      _Speed: 1
-      _NormalizedStartTime: NaN
-  - Type: 6
-    Clip:
-      _FadeDuration: 0.25
-      _Events:
-        _NormalizedTimes: []
-        _Callbacks: []
-        _Names: []
-      _Clip: {fileID: 7400000, guid: 0878a3d5fa4695f48b9967ce32bc9b80, type: 2}
-      _Speed: 1
-      _NormalizedStartTime: NaN
-  - Type: 7
-    Clip:
-      _FadeDuration: 0.25
-      _Events:
-        _NormalizedTimes: []
-        _Callbacks: []
-        _Names: []
-      _Clip: {fileID: 7400000, guid: 0878a3d5fa4695f48b9967ce32bc9b80, type: 2}
-      _Speed: 1
-      _NormalizedStartTime: NaN
---- !u!1001 &4298999384463995335
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 5160706249531071732}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: f2b34277dfe98cb4ca46b06a800bc717,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f2b34277dfe98cb4ca46b06a800bc717,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f2b34277dfe98cb4ca46b06a800bc717,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f2b34277dfe98cb4ca46b06a800bc717,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f2b34277dfe98cb4ca46b06a800bc717,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f2b34277dfe98cb4ca46b06a800bc717,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f2b34277dfe98cb4ca46b06a800bc717,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f2b34277dfe98cb4ca46b06a800bc717,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f2b34277dfe98cb4ca46b06a800bc717,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f2b34277dfe98cb4ca46b06a800bc717,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f2b34277dfe98cb4ca46b06a800bc717,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 825894089210680117, guid: f2b34277dfe98cb4ca46b06a800bc717,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: f2b34277dfe98cb4ca46b06a800bc717,
-        type: 3}
-      propertyPath: m_Name
-      value: Aj
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: f2b34277dfe98cb4ca46b06a800bc717, type: 3}
---- !u!1 &3992569678778354838 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: f2b34277dfe98cb4ca46b06a800bc717,
-    type: 3}
-  m_PrefabInstance: {fileID: 4298999384463995335}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &496782286429750883
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3992569678778354838}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _Animator: {fileID: 7693142672811871318}
-  _ActionOnDisable: 0
---- !u!4 &4333487950334793260 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f2b34277dfe98cb4ca46b06a800bc717,
-    type: 3}
-  m_PrefabInstance: {fileID: 4298999384463995335}
-  m_PrefabAsset: {fileID: 0}
---- !u!95 &7693142672811871318 stripped
-Animator:
-  m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: f2b34277dfe98cb4ca46b06a800bc717,
-    type: 3}
-  m_PrefabInstance: {fileID: 4298999384463995335}
-  m_PrefabAsset: {fileID: 0}

+ 0 - 230
Assets/Prefabs/Unit/Amj.prefab

@@ -1,230 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &5886224692352012151
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5326572749885524790}
-  - component: {fileID: 3928088366051565121}
-  m_Layer: 0
-  m_Name: Amj
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &5326572749885524790
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5886224692352012151}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.51, y: -0.04, z: -0.42}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 3764757209782593877}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3928088366051565121
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5886224692352012151}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30230dd81a37f294191c8b75eaba261c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Animancer: {fileID: 5808479688725758852}
-  AnimationClips:
-  - Type: 0
-    Clip:
-      _FadeDuration: 0.25
-      _Events:
-        _NormalizedTimes: []
-        _Callbacks: []
-        _Names: []
-      _Clip: {fileID: 7400000, guid: 652f1b6e587c05344a9f18f84102b66d, type: 2}
-      _Speed: 1
-      _NormalizedStartTime: NaN
-  - Type: 1
-    Clip:
-      _FadeDuration: 0.25
-      _Events:
-        _NormalizedTimes: []
-        _Callbacks: []
-        _Names: []
-      _Clip: {fileID: 7400000, guid: 47a043c408d0ee2479c771396f4c27e3, type: 2}
-      _Speed: 1
-      _NormalizedStartTime: NaN
-  - Type: 2
-    Clip:
-      _FadeDuration: 0.25
-      _Events:
-        _NormalizedTimes: []
-        _Callbacks: []
-        _Names: []
-      _Clip: {fileID: 7400000, guid: 736af3544010c84479ca4930b8e6d393, type: 2}
-      _Speed: 1
-      _NormalizedStartTime: NaN
-  - Type: 3
-    Clip:
-      _FadeDuration: 0.25
-      _Events:
-        _NormalizedTimes: []
-        _Callbacks: []
-        _Names: []
-      _Clip: {fileID: 7400000, guid: 0878a3d5fa4695f48b9967ce32bc9b80, type: 2}
-      _Speed: 1
-      _NormalizedStartTime: NaN
-  - Type: 4
-    Clip:
-      _FadeDuration: 0.25
-      _Events:
-        _NormalizedTimes: []
-        _Callbacks: []
-        _Names: []
-      _Clip: {fileID: 7400000, guid: 8e4bd50d7fc4a5a409239668ec7cb51e, type: 2}
-      _Speed: 1
-      _NormalizedStartTime: NaN
-  - Type: 5
-    Clip:
-      _FadeDuration: 0.25
-      _Events:
-        _NormalizedTimes: []
-        _Callbacks: []
-        _Names: []
-      _Clip: {fileID: 7400000, guid: 0878a3d5fa4695f48b9967ce32bc9b80, type: 2}
-      _Speed: 1
-      _NormalizedStartTime: NaN
-  - Type: 6
-    Clip:
-      _FadeDuration: 0.25
-      _Events:
-        _NormalizedTimes: []
-        _Callbacks: []
-        _Names: []
-      _Clip: {fileID: 7400000, guid: 0878a3d5fa4695f48b9967ce32bc9b80, type: 2}
-      _Speed: 1
-      _NormalizedStartTime: NaN
-  - Type: 7
-    Clip:
-      _FadeDuration: 0.25
-      _Events:
-        _NormalizedTimes: []
-        _Callbacks: []
-        _Names: []
-      _Clip: {fileID: 7400000, guid: 0878a3d5fa4695f48b9967ce32bc9b80, type: 2}
-      _Speed: 1
-      _NormalizedStartTime: NaN
---- !u!1001 &3726064316648246974
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 5326572749885524790}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: bf3f1458a66f45949a6c46115c8dcc76,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: bf3f1458a66f45949a6c46115c8dcc76,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0.058
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: bf3f1458a66f45949a6c46115c8dcc76,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.18
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: bf3f1458a66f45949a6c46115c8dcc76,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0.26
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: bf3f1458a66f45949a6c46115c8dcc76,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: bf3f1458a66f45949a6c46115c8dcc76,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: bf3f1458a66f45949a6c46115c8dcc76,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: bf3f1458a66f45949a6c46115c8dcc76,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: bf3f1458a66f45949a6c46115c8dcc76,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: bf3f1458a66f45949a6c46115c8dcc76,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: bf3f1458a66f45949a6c46115c8dcc76,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: bf3f1458a66f45949a6c46115c8dcc76,
-        type: 3}
-      propertyPath: m_Name
-      value: Amy
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: bf3f1458a66f45949a6c46115c8dcc76, type: 3}
---- !u!4 &3764757209782593877 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: bf3f1458a66f45949a6c46115c8dcc76,
-    type: 3}
-  m_PrefabInstance: {fileID: 3726064316648246974}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &4572501694979437551 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: bf3f1458a66f45949a6c46115c8dcc76,
-    type: 3}
-  m_PrefabInstance: {fileID: 3726064316648246974}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &5808479688725758852
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4572501694979437551}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _Animator: {fileID: 7124472959583089455}
-  _ActionOnDisable: 0
---- !u!95 &7124472959583089455 stripped
-Animator:
-  m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: bf3f1458a66f45949a6c46115c8dcc76,
-    type: 3}
-  m_PrefabInstance: {fileID: 3726064316648246974}
-  m_PrefabAsset: {fileID: 0}

+ 8 - 0
Assets/Scripts.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 96a51022c3154ab46bcfecba08dceab4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/Scripts/Codes.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3ead38306cc57124ab1e3bcee1cf0b69
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 3
Assets/Scripts/Codes/Mono/AnimationData.cs

@@ -1,5 +1,4 @@
-using ET;
-using Animancer;
+using Animancer;
 using UnityEngine;
 using UnityEngine;
 using System;
 using System;
 
 
@@ -83,7 +82,7 @@ namespace Mono
             }
             }
             else
             else
             {
             {
-                Log.Error($"Not exist clip({type}) @{gameObject.name}");
+                //Log.Error($"Not exist clip({type}) @{gameObject.name}");
             }
             }
         }
         }
     }
     }