修改bug

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.0012691617
+    - _Alpha: 0.10351008
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.16708773
+    - _Alpha: 0.25107044
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.25332355
+    - _MainTexOffsetU: 0.15252745
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/Config/EventLinkConfig.json

@@ -2312,7 +2312,7 @@
       "LanID": [
         5180
       ],
-      "DialogueType": 0,
+      "DialogueType": 2,
       "EventID": 10004,
       "step": 2,
       "optionType": 0,

Assets/Scripts/GameUI/UI/ComBatFrontPanel/ComBatFrontPanel.cs

@@ -78,11 +78,11 @@ namespace Fort23.Mono
                     combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
                 }
 
-                if (PlayerManager.Instance.myHero.powerUpConfig.ID > combatHeroInfo.powerUpConfig.ID)
+                if (PlayerManager.Instance.myHero.powerUpConfig.ID > combatHeroInfo.MonsterPowerUpConfig.ID)
                 {
                     csc.ChangeState(0);
                 }
-                else if (PlayerManager.Instance.myHero.powerUpConfig.ID == combatHeroInfo.powerUpConfig.ID)
+                else if (PlayerManager.Instance.myHero.powerUpConfig.ID == combatHeroInfo.MonsterPowerUpConfig.ID)
                 {
                     csc.ChangeState(1);
                 }

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -400,7 +400,7 @@ namespace Fort23.Mono
                 case ShowDialogueEventData.MessageShowType.Verbatim:
                     _sb.Clear();
                     _currShowMessage = m.ToCharArray();
-                    if (eventConditionConfig.step == 1 && eventConditionConfig.NPCID == 100 && PlayerManager.Instance.PlayerName != String.Empty)
+                    if (eventConditionConfig.DialogueType == 2 && eventConditionConfig.NPCID == 100 && PlayerManager.Instance.PlayerName != String.Empty)
                     {
                         _sb.Append(PlayerManager.Instance.PlayerName + ":");
                     }

UserSettings/Layouts/default-2022.dwlt

@@ -15,11 +15,11 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: -2553
-    y: 483
+    y: 489
     width: 2560
-    height: 829
+    height: 823
   m_ShowMode: 0
-  m_Title: 
+  m_Title: ' Hot Reload'
   m_RootView: {fileID: 6}
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
@@ -62,8 +62,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: -1208
-    y: 99
+    x: 289
+    y: 86
     width: 1208
     height: 1293
   m_ShowMode: 0
@@ -91,7 +91,7 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Hierarchy
+  m_Title: Inspector
   m_RootView: {fileID: 11}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -114,7 +114,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 2560
-    height: 829
+    height: 823
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
   m_ActualView: {fileID: 19}
@@ -141,11 +141,11 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 2560
-    height: 829
+    height: 823
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 192
+  controlID: 43
   draggingID: 0
 --- !u!114 &7
 MonoBehaviour:
@@ -166,8 +166,8 @@ MonoBehaviour:
     y: 0
     width: 1189
     height: 662
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
   m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 20}
@@ -196,7 +196,7 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 43
+  controlID: 92
   draggingID: 0
 --- !u!114 &9
 MonoBehaviour:
@@ -217,8 +217,8 @@ MonoBehaviour:
     y: 0
     width: 1208
     height: 1293
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 200, y: 221}
+  m_MaxSize: {x: 4000, y: 4021}
   m_ActualView: {fileID: 22}
   m_Panes:
   - {fileID: 22}
@@ -346,7 +346,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 50}
   m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 184
+  controlID: 140
   draggingID: 0
 --- !u!114 &15
 MonoBehaviour:
@@ -374,7 +374,7 @@ MonoBehaviour:
   - {fileID: 21}
   - {fileID: 23}
   m_Selected: 0
-  m_LastSelected: 0
+  m_LastSelected: 1
 --- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -474,9 +474,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: -2553
-    y: 483
+    y: 489
     width: 2560
-    height: 808
+    height: 802
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -929,9 +929,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.03153256, y: 0.5676818, z: 0.009998513}
+    m_Target: {x: 2.8204772, y: -0.5277249, z: 3436.3313}
     speed: 2
-    m_Value: {x: 0.03153256, y: 0.5676818, z: 0.009998513}
+    m_Value: {x: 2.8204772, y: -0.5277249, z: 3436.3313}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -981,9 +981,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 3.1422668
+    m_Target: 9.966226
     speed: 2
-    m_Value: 3.1422668
+    m_Value: 9.966226
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -1030,8 +1030,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -1208
-    y: 99
+    x: 289
+    y: 86
     width: 1208
     height: 1272
   m_SerializedDataModeController:
@@ -1234,21 +1234,21 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: bac4feffc0c4feff845bffff8a5bffffd85cffffe65cffffeaf1fffff0f1ffff78faffff
+      m_ExpandedIDs: 3a5bf2ff405bf2ff92e3f2ff2e7ef4ff347ef4ffbc2df6ffc22df6ff9824f9ff9e24f9ffb64cf9ffbc4cf9fff44cf9fffa4cf9ffe057f9ffee57f9fff257f9ff9258f9ff8259f9ffe459f9ff1c9bf9ff229bf9ff6c9cf9ff7e9cf9ffceedfcffd4edfcff463bfeff4c3bfeffc4a7feffcaa7feffc4f6feffcaf6feff78fafffff4ffffff84c50000bec50000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: FocusFrame01
+        m_OriginalName: FocusFrame01
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 0
+        m_UserData: -439052
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 0
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 16}
       m_SearchString: 
@@ -1293,7 +1293,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: gamerun
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -1303,24 +1303,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameUI/UI/GuidePanel
+    - Assets/Res/UI/DivineSence
     m_Globs: []
-    m_OriginalText: gamerun
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameUI/UI/GuidePanel
+  - Assets/Res/UI/DivineSence
   m_LastFoldersGridSize: -1
   m_LastProjectPath: D:\FB\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 406}
-    m_SelectedIDs: 80cb0000
-    m_LastClickedID: 52096
-    m_ExpandedIDs: 0000000074cb000076cb000078cb00007acb00007ccb00007ecb000080cb000082cb000084cb000086cb000088cb0000c8cb0000d0cb0000180401001a04010000ca9a3b
+    scrollPos: {x: 0, y: 438}
+    m_SelectedIDs: 88430100
+    m_LastClickedID: 82824
+    m_ExpandedIDs: 0000000080cb000082cb000084cb000086cb000088cb00008acb00008ccb00008ecb000090cb000092cb000094cb0000d0cb0000d4cb0000dccb0000f0cb0000f2cb000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1348,7 +1348,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000074cb000076cb000078cb00007acb00007ccb00007ecb000080cb000082cb000084cb000086cb000088cb0000
+    m_ExpandedIDs: 0000000080cb000082cb000084cb000086cb000088cb00008acb00008ccb00008ecb000090cb000092cb000094cb0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: