DESKTOP-FB72PO8\Administrator hai 5 días
pai
achega
50c1bb3b10

+ 5 - 4
Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -91,12 +91,13 @@ public class PlayerManager : Singleton<PlayerManager>
         {
             FaBaoInfo faBaoInfo = new FaBaoInfo(magicWeaponId[i], 1);
             FaBaoControl.AddFaBao(faBaoInfo);
+            FaBaoControl.FightFaBao[i]= faBaoInfo;
         }
 
-        for (int i = 0; i < 4; i++)
-        {
-            FaBaoControl.FightFaBao[i] = FaBaoControl.myAllFaBao[i];
-        }
+        // for (int i = 0; i < 4; i++)
+        // {
+        //     FaBaoControl.FightFaBao[i] = FaBaoControl.myAllFaBao[i];
+        // }
 
         myHero.TaoismSkillId = 601011;
         myHero.MagicWeaponID.Clear();

+ 41 - 41
UserSettings/Layouts/default-2022.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Hierarchy
+  m_Title: Project
   m_RootView: {fileID: 4}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -40,11 +40,11 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 792
+    y: 892
     width: 932
-    height: 507
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+    height: 407
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 17}
@@ -152,7 +152,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 221
+  controlID: 104
   draggingID: 0
 --- !u!114 &7
 MonoBehaviour:
@@ -194,8 +194,8 @@ MonoBehaviour:
     y: 0
     width: 564
     height: 1299
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 13}
@@ -271,7 +271,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 932
-    height: 792
+    height: 892
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 16}
@@ -302,8 +302,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 676
-    height: 439
+    width: 931
+    height: 871
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -360,20 +360,20 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: b6250100
       m_LastClickedID: 0
-      m_ExpandedIDs: a4cbf5ffaacbf5fffc32f6ff0233f6ffdc53f9ffe253f9ff40f1fbff4ef1fbff8272fcffe0b0fcffaab1fcff36d1fcff78faffff3ab1000040b100004ab10000b8b10000c0b10000d0b10000dcb10000e0b1000004b2000008b200002cb200004cb2000058b2000092b20000
+      m_ExpandedIDs: 7c7ff9ff308ff9ff7427faffb66dfbff60c2fbff2a3bfdff54e2fdff6ae2fdff8ce2fdff721bffffee1dffff0a1effffde1fffff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: GameObject (2)
-        m_OriginalName: GameObject (2)
+        m_Name: fb_xuanguidun
+        m_OriginalName: fb_xuanguidun
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 45510
+        m_UserData: -422106
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
         m_OriginalEventType: 0
@@ -478,7 +478,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Editor
+    - Assets/Art/ArtHero/FaBao
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -486,16 +486,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Editor
+  - Assets/Art/ArtHero/FaBao
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: e4bd0000
-    m_LastClickedID: 48612
-    m_ExpandedIDs: 00000000c0bd0000c2bd0000c4bd0000c6bd0000c8bd0000cabd0000ccbd0000cebd0000d0bd0000d2bd0000d4bd0000d6bd0000d8bd0000dabd0000dcbd0000debd0000e0bd0000e2bd0000e4bd0000e6bd0000e8bd0000eabd000080c0000000ca9a3bffffff7f
+    m_SelectedIDs: b6250100
+    m_LastClickedID: 75190
+    m_ExpandedIDs: 000000004cbe00004ebe000050be000052be000054be000056be000058be00005abe00005cbe00005ebe000060be000062be000064be000066be000068be00006abe00006cbe00006ebe000070be000072be000074be000076be0000e4c000000cc10000b8250100d225010000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -523,7 +523,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000c0bd0000c2bd0000c4bd0000c6bd0000c8bd0000cabd0000ccbd0000cebd0000d0bd0000d2bd0000d4bd0000d6bd0000d8bd0000dabd0000dcbd0000debd0000e0bd0000e2bd0000e4bd0000e6bd0000e8bd0000eabd0000
+    m_ExpandedIDs: 000000004cbe00004ebe000050be000052be000054be000056be000058be00005abe00005cbe00005ebe000060be000062be000064be000066be000068be00006abe00006cbe00006ebe000070be000072be000074be000076be0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -551,7 +551,7 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: 66bd0200ee82000000000000
+    m_ExpandedInstanceIDs: 66bd0200ee820000000000004ac80000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -602,7 +602,7 @@ MonoBehaviour:
     x: 0
     y: 73
     width: 931
-    height: 771
+    height: 871
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -656,22 +656,22 @@ MonoBehaviour:
       x: 0
       y: 21
       width: 931
-      height: 750
-    m_Scale: {x: 0.46182266, y: 0.46182266}
-    m_Translation: {x: 465.5, y: 375}
+      height: 850
+    m_Scale: {x: 0.523399, y: 0.523399}
+    m_Translation: {x: 465.5, y: 424.99997}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -1007.96265
+      x: -889.37885
       y: -812
-      width: 2015.9253
+      width: 1778.7577
       height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.46182266
-  m_LastWindowPixelSize: {x: 931, y: 771}
+  m_defaultScale: 0.523399
+  m_LastWindowPixelSize: {x: 931, y: 871}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
@@ -698,9 +698,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 865
+    y: 965
     width: 931
-    height: 486
+    height: 386
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -767,9 +767,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: -179}
+      snapOffset: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 2
+      snapCorner: 0
       id: unity-transform-toolbar
       index: 0
       layout: 2
@@ -1072,9 +1072,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.24290682, y: 25.945236, z: 39.796368}
+    m_Target: {x: -0.91, y: 0.493, z: 0.282}
     speed: 2
-    m_Value: {x: -0.24290682, y: 25.945236, z: 39.796368}
+    m_Value: {x: -0.91, y: 0.493, z: 0.282}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1120,13 +1120,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.2924829, y: -0.2139448, z: 0.067299604, w: 0.9296543}
+    m_Target: {x: -0.07301824, y: 0.8609839, z: -0.12904477, w: -0.48670152}
     speed: 2
-    m_Value: {x: 0.29246756, y: -0.21393357, z: 0.06729607, w: 0.92960554}
+    m_Value: {x: -0.07301255, y: 0.8609169, z: -0.12903473, w: -0.48666364}
   m_Size:
-    m_Target: 14.867585
+    m_Target: 0.52748185
     speed: 2
-    m_Value: 14.867585
+    m_Value: 0.52748185
   m_Ortho:
     m_Target: 0
     speed: 2