瀏覽代碼

修改bug

DESKTOP-BGJIU14\ck 4 月之前
父節點
當前提交
899fe15a71

+ 4 - 3
Assets/Res/UI/HeroDetailPanel.prefab

@@ -12607,7 +12607,7 @@ RectTransform:
   m_GameObject: {fileID: 6213300356282155384}
   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_LocalScale: {x: 1.0024261, y: 1.0029813, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1477454125738495998}
@@ -12986,11 +12986,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   allTargets:
   - {fileID: 8323024823130982353}
+  - {fileID: 4187952801782332659}
   TweenAssetInfo: {fileID: 11400000, guid: f0bdd4e99fcc6c74da59f9ab86e8701f, type: 2}
   TargetFoldout: 1
-  maxDuration: 1
+  maxDuration: 0.3
   isUpdate: 0
-  currTime: 1.0401256
+  currTime: 0.3
 --- !u!1 &6246054039842062518
 GameObject:
   m_ObjectHideFlags: 0

+ 3 - 3
Assets/Res/UIAnimRes/TweenAssetInfoHeroDetailPanel.asset

@@ -119,18 +119,18 @@ MonoBehaviour:
     delay: 0
     TweenBasic:
       Foldout: 0
-      duration: 0.3
+      duration: 0
       delay: 0
       currSchedule: 0
       TweenRectTransformInfos: []
     TweenCanvasGroup:
       Foldout: 1
-      duration: 0.3
+      duration: 0
       delay: 0
       currSchedule: 0
       TweenLerpType: 1
       StartAlpha: 0
-      EndAlpha: 1
+      EndAlpha: 0
       startX:
         serializedVersion: 2
         m_Curve:

+ 1 - 1
Assets/Scenes/testCombat.scene

@@ -156,7 +156,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ShaderVariantCollection: {fileID: 20000000, guid: 3536136831feec548bbaa7febad775f8, type: 2}
-  LoadType: 2
+  LoadType: 0
   h5Url: https://gamedata-1332030654.cos-website.ap-chengdu.myqcloud.com/Bundle/
 --- !u!4 &123020045
 Transform:

+ 2 - 0
Assets/Scripts/Core/Editor/Tween/UITweenControllerInspector.cs

@@ -123,10 +123,12 @@ public class UITweenControllerInspector : Editor
         if (EditorGUI.EndChangeCheck())
         {
             EditorUtility.SetDirty(_uiTweenController.TweenAssetInfo);
+            EditorUtility.SetDirty(_uiTweenController.gameObject);
             AssetDatabase.SaveAssets();
         }
 
         serializedObject.ApplyModifiedProperties();
+     
     }
 
     private void DrawTweenEntity(TweenEntity tweenEntity, Object ob, int index)

+ 2 - 2
UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 5455050750515e025d5f5b2342770f4212164878792d2462282a4a62b1e5603d
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 0600055050050c595f0c097146200b44464f4c2f7c2c24627b2a4d35e6e4366c
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 0600055050050c595f0c097146200b44464f4c2f7c2c24627b2a4d35e6e4366c
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

+ 108 - 107
UserSettings/Layouts/default-2022.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2560
     height: 1357
   m_ShowMode: 4
-  m_Title: Inspector
+  m_Title: Project
   m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 321}
   m_MaxSize: {x: 10000, y: 10000}
@@ -34,20 +34,20 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Name: SceneView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 548
+    x: 1672
     y: 0
-    width: 628
-    height: 1006
+    width: 214
+    height: 1307
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 21}
+  m_ActualView: {fileID: 22}
   m_Panes:
-  - {fileID: 21}
+  - {fileID: 22}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &3
@@ -59,23 +59,23 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: GameView
   m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 13}
-  - {fileID: 2}
+  m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 1279
     y: 0
-    width: 1176
-    height: 1006
-  m_MinSize: {x: 200, y: 50}
-  m_MaxSize: {x: 16192, y: 8096}
-  vertical: 0
-  controlID: 35
-  draggingID: 0
+    width: 393
+    height: 1307
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 21}
+  m_Panes:
+  - {fileID: 21}
+  m_Selected: 0
+  m_LastSelected: 0
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -92,9 +92,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1006
-    width: 1176
-    height: 301
+    y: 870
+    width: 756
+    height: 437
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 17}
@@ -168,6 +168,8 @@ MonoBehaviour:
   - {fileID: 9}
   - {fileID: 10}
   - {fileID: 11}
+  - {fileID: 3}
+  - {fileID: 2}
   - {fileID: 12}
   m_Position:
     serializedVersion: 2
@@ -175,10 +177,10 @@ MonoBehaviour:
     y: 30
     width: 2560
     height: 1307
-  m_MinSize: {x: 500, y: 100}
-  m_MaxSize: {x: 40480, y: 16192}
+  m_MinSize: {x: 600, y: 100}
+  m_MaxSize: {x: 48576, y: 16192}
   vertical: 0
-  controlID: 812
+  controlID: 200
   draggingID: 0
 --- !u!114 &8
 MonoBehaviour:
@@ -214,18 +216,18 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 3}
+  - {fileID: 13}
   - {fileID: 4}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1176
+    width: 756
     height: 1307
-  m_MinSize: {x: 200, y: 100}
-  m_MaxSize: {x: 16192, y: 16192}
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 34
+  controlID: 57
   draggingID: 0
 --- !u!114 &10
 MonoBehaviour:
@@ -242,9 +244,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1176
+    x: 756
     y: 0
-    width: 264
+    width: 194
     height: 1307
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
@@ -268,9 +270,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1440
+    x: 950
     y: 0
-    width: 541
+    width: 329
     height: 1307
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
@@ -294,9 +296,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1981
+    x: 1886
     y: 0
-    width: 579
+    width: 674
     height: 1307
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
@@ -315,25 +317,24 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: TimelineWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 548
-    height: 1006
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 22}
+    width: 756
+    height: 870
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 22}
   - {fileID: 16}
   - {fileID: 15}
   - {fileID: 14}
-  m_Selected: 0
-  m_LastSelected: 3
+  m_Selected: 2
+  m_LastSelected: 2
 --- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -356,8 +357,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 610
-    height: 962
+    width: 755
+    height: 849
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -666,9 +667,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 1079
-    width: 1175
-    height: 280
+    y: 943
+    width: 755
+    height: 416
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -699,9 +700,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1176
+    x: 756
     y: 73
-    width: 262
+    width: 192
     height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -716,23 +717,23 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 8c2e0100
-      m_LastClickedID: 77452
-      m_ExpandedIDs: 1263ffff2864ffff2e69ffffd875ffffee76fffff47bffffc888ffffde89ffff308fffff7cf7ffff5efaffff8ca60000bc2e0100
+      m_SelectedIDs: fece0000
+      m_LastClickedID: 0
+      m_ExpandedIDs: 20b4fcff2eb4fcffe2b7fcff62d7ffff26e3ffff92b30000d4ba00005ebb0000dabb0000e6bb0000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: Box (2)
+        m_OriginalName: Box (2)
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 0
+        m_UserData: 47866
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 0
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 10}
       m_SearchString: 
@@ -762,9 +763,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1981
+    x: 1886
     y: 73
-    width: 578
+    width: 673
     height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -779,7 +780,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 582
+    m_CachedPref: 367
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
@@ -809,9 +810,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1440
+    x: 950
     y: 73
-    width: 539
+    width: 327
     height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -824,7 +825,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: 
+    m_NameFilter: herod
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -834,24 +835,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Epic Toon FX/Textures/Text
+    - Assets/Scenes
     m_Globs: []
-    m_OriginalText: 
+    m_OriginalText: herod
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Epic Toon FX/Textures/Text
+  - Assets/Scenes
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\UnityProject\XY001\xy001\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 610}
-    m_SelectedIDs: 3e4f0100
-    m_LastClickedID: 85822
-    m_ExpandedIDs: 000000008ea4000090a4000098a400000ea5000040a50000fc2f01000630010010300100143001002430010026300100283001005e38010086380100883801008a3801009838010008390100183901002039010048390100ea430100ec430100f443010076440100e64b010000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 62b70000
+    m_LastClickedID: 46946
+    m_ExpandedIDs: 00000000a8680000bab40000c0b40000c2b40000cab40000ccb40000ceb40000d0b40000d2b40000d4b40000d6b40000d8b40000dab40000dcb40000deb40000e0b40000e2b40000e4b40000e6b40000e8b40000eab4000064b7000044b800006ab800007eb8000088b80000feb8000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -879,7 +880,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 
+    m_ExpandedIDs: 00000000a8680000bab40000bcb40000beb40000c0b40000c2b40000c4b40000c6b40000c8b40000cab40000ccb40000ceb40000d0b40000d2b40000d4b40000d6b40000d8b40000dab40000dcb40000deb40000e0b40000e2b40000e4b40000e6b40000e8b40000eab40000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -910,18 +911,18 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: d02e01001ef900002afc000092f80000f0f70000d8fa000046fa0000f0f80000dc5b0100d05b0100c85b0100cc5b01004a0b0100de0b0100de0a01009e0b0100220b01002a4201007a490100aa4401008a4301006a4e010054a3000024350100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: HeroDetailPanel
+      m_OriginalName: HeroDetailPanel
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 52990
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 11}
     m_CreateAssetUtility:
@@ -934,7 +935,7 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 307.5
+  m_DirectoriesAreaWidth: 204
 --- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -955,10 +956,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 548
+    x: 1279
     y: 73
-    width: 626
-    height: 985
+    width: 391
+    height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1011,23 +1012,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 626
-      height: 964
-    m_Scale: {x: 0.59359604, y: 0.59359604}
-    m_Translation: {x: 313, y: 482}
+      width: 391
+      height: 1265
+    m_Scale: {x: 0.52133334, y: 0.52133334}
+    m_Translation: {x: 195.5, y: 632.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -527.2946
-      y: -812
-      width: 1054.5892
-      height: 1624
+      x: -375
+      y: -1213.2352
+      width: 750
+      height: 2426.4705
     m_MinimalGUI: 1
-  m_defaultScale: 0.59359604
-  m_LastWindowPixelSize: {x: 626, y: 985}
+  m_defaultScale: 0.52133334
+  m_LastWindowPixelSize: {x: 391, y: 1286}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -1053,10 +1054,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
+    x: 1672
     y: 73
-    width: 547
-    height: 985
+    width: 212
+    height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1071,8 +1072,8 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -156, y: -26}
-      snapOffsetDelta: {x: -18, y: 0}
+      snapOffset: {x: -174, y: -26}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
       index: 0
@@ -1149,9 +1150,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 67.5, y: 25}
-      snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapOffset: {x: -73, y: 25}
+      snapOffsetDelta: {x: -33, y: 0}
+      snapCorner: 1
       id: Orientation
       index: 0
       layout: 4
@@ -1357,7 +1358,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 48, y: 25}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: AINavigationOverlay
@@ -1428,9 +1429,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -1.58, y: 0.48, z: 0.80000013}
+    m_Target: {x: 375, y: 812, z: 0}
     speed: 2
-    m_Value: {x: -1.58, y: 0.48, z: 0.80000013}
+    m_Value: {x: 408.56125, y: 192.50809, z: -73.37091}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1478,11 +1479,11 @@ MonoBehaviour:
   m_Rotation:
     m_Target: {x: 0.2959024, y: -0.15921102, z: 0.05009006, w: 0.9405246}
     speed: 2
-    m_Value: {x: 0.29590213, y: -0.15921088, z: 0.05009001, w: 0.9405237}
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 3.2435408
+    m_Target: 894.40985
     speed: 2
-    m_Value: 3.2435408
+    m_Value: 1480.6464
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -1502,7 +1503,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: 0.21580243, y: -0.7561753, z: 0.30317518, w: 0.53825194}
+  m_LastSceneViewRotation: {x: 0.2959024, y: -0.15921102, z: 0.05009006, w: 0.9405246}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: