浏览代码

修改bug

lzx 1 月之前
父节点
当前提交
2c7e937db8

+ 34 - 8
Assets/Scripts/GameUI/Editor/PlayerDataEditorWindow.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System;
 using System.Collections;
 using System.IO;
+using Fort23.UTool;
 
 public class PlayerDataEditorWindow : EditorWindow
 {
@@ -28,10 +29,15 @@ public class PlayerDataEditorWindow : EditorWindow
 
 
     private string targetFolder = "";
+    private string targetItemId = "";
+    private string targetItemCount = "";
+
     private void OnGUI()
     {
-        GUIStyle headerStyle = new GUIStyle(EditorStyles.boldLabel) { fontSize = 14, padding = new RectOffset(5, 5, 5, 5) };
-        GUIStyle sectionStyle = new GUIStyle(EditorStyles.helpBox) { margin = new RectOffset(5, 5, 5, 5), padding = new RectOffset(10, 10, 10, 10) };
+        GUIStyle headerStyle = new GUIStyle(EditorStyles.boldLabel)
+            { fontSize = 14, padding = new RectOffset(5, 5, 5, 5) };
+        GUIStyle sectionStyle = new GUIStyle(EditorStyles.helpBox)
+            { margin = new RectOffset(5, 5, 5, 5), padding = new RectOffset(10, 10, 10, 10) };
 
         scrollPos = EditorGUILayout.BeginScrollView(scrollPos);
 
@@ -60,14 +66,29 @@ public class PlayerDataEditorWindow : EditorWindow
                 if (int.TryParse(targetFolder, out int eventid))
                 {
                     var eventList = EventSystemManager.Instance.AddEvent(eventid);
-                
+
                     if (eventList != null)
                     {
+                        LogTool.Log("添加事件:" + eventid);
                         AccountFileInfo.Instance.playerData.eventList.Add(eventList);
                         AccountFileInfo.Instance.SavePlayerData();
                     }
                 }
             }
+
+            EditorGUILayout.LabelField("道具id:", GUILayout.Width(200));
+            targetItemId = EditorGUILayout.TextField(targetItemId);
+            EditorGUILayout.LabelField("道具数量:", GUILayout.Width(200));
+            targetItemCount = EditorGUILayout.TextField(targetItemCount);
+            if (GUILayout.Button("添加道具", GUILayout.Height(30)))
+            {
+                if (int.TryParse(targetItemId, out int itemId) && int.TryParse(targetItemCount, out int itemCount))
+                {
+                    PlayerManager.Instance.BagController.AddItem(itemId, itemCount);
+                    LogTool.Log($"添加成功,id:{itemId},数量:{itemCount}");
+                    AccountFileInfo.Instance.SavePlayerData();
+                }
+            }
         }
 
         try
@@ -87,7 +108,8 @@ public class PlayerDataEditorWindow : EditorWindow
         {
             if (GUILayout.Button("保存 PlayerData", GUILayout.Height(30)))
             {
-                if (EditorUtility.DisplayDialog("保存确认", $"确定要保存到 {Application.persistentDataPath + DataFilePath}?\n现有文件将被覆盖。", "确定", "取消"))
+                if (EditorUtility.DisplayDialog("保存确认",
+                        $"确定要保存到 {Application.persistentDataPath + DataFilePath}?\n现有文件将被覆盖。", "确定", "取消"))
                 {
                     SavePlayerData();
                 }
@@ -96,7 +118,8 @@ public class PlayerDataEditorWindow : EditorWindow
 
         if (GUILayout.Button("加载 PlayerData", GUILayout.Height(30)))
         {
-            if (EditorUtility.DisplayDialog("加载确认", $"确定要从 {Application.persistentDataPath + DataFilePath} 加载数据?\n当前编辑的数据将被覆盖。", "确定", "取消"))
+            if (EditorUtility.DisplayDialog("加载确认",
+                    $"确定要从 {Application.persistentDataPath + DataFilePath} 加载数据?\n当前编辑的数据将被覆盖。", "确定", "取消"))
             {
                 LoadPlayerData();
             }
@@ -173,7 +196,8 @@ public class PlayerDataEditorWindow : EditorWindow
                 IList list = (IList)(value ?? Activator.CreateInstance(field.FieldType));
 
                 EditorGUILayout.BeginHorizontal();
-                foldoutStates[fieldKey] = EditorGUILayout.Foldout(foldoutStates[fieldKey], $"{field.Name} (列表, {list.Count} 项)", true);
+                foldoutStates[fieldKey] =
+                    EditorGUILayout.Foldout(foldoutStates[fieldKey], $"{field.Name} (列表, {list.Count} 项)", true);
                 EditorGUILayout.EndHorizontal();
 
                 if (foldoutStates[fieldKey])
@@ -209,7 +233,8 @@ public class PlayerDataEditorWindow : EditorWindow
                             foldoutStates[itemKey] = false;
 
                         EditorGUILayout.BeginHorizontal();
-                        foldoutStates[itemKey] = EditorGUILayout.Foldout(foldoutStates[itemKey], $"{field.Name}[{i}]", true);
+                        foldoutStates[itemKey] =
+                            EditorGUILayout.Foldout(foldoutStates[itemKey], $"{field.Name}[{i}]", true);
                         if (GUILayout.Button("删除", GUILayout.Width(60)))
                         {
                             list.RemoveAt(i);
@@ -258,7 +283,8 @@ public class PlayerDataEditorWindow : EditorWindow
             else if (field.FieldType.IsClass)
             {
                 EditorGUILayout.BeginHorizontal();
-                foldoutStates[fieldKey] = EditorGUILayout.Foldout(foldoutStates[fieldKey], $"{field.Name} ({field.FieldType.Name})", true);
+                foldoutStates[fieldKey] = EditorGUILayout.Foldout(foldoutStates[fieldKey],
+                    $"{field.Name} ({field.FieldType.Name})", true);
                 if (value == null && GUILayout.Button("创建", GUILayout.Width(60)))
                 {
                     value = Activator.CreateInstance(field.FieldType);

+ 11 - 11
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -99,17 +99,17 @@ namespace Fort23.Mono
                 }
 
                 // 扣除道具
-                foreach (var breakthroughItemWidget in breakthroughItemWidgets)
-                {
-                    if (breakthroughItemWidget.itemInfo != null)
-                    {
-                        if (!PlayerManager.Instance.BagController.IsEnough(breakthroughItemWidget.itemInfo.itemID, 1))
-                        {
-                            TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("道具不足!");
-                            return;
-                        }
-                    }
-                }
+                // foreach (var breakthroughItemWidget in breakthroughItemWidgets)
+                // {
+                //     if (breakthroughItemWidget.itemInfo != null)
+                //     {
+                //         if (!PlayerManager.Instance.BagController.IsEnough(breakthroughItemWidget.itemInfo.itemID, 1))
+                //         {
+                //             TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("道具不足!");
+                //             return;
+                //         }
+                //     }
+                // }
 
                 for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length; i++)
                 {

+ 1 - 0
XiuXianGame.sln.DotSettings.user

@@ -34,6 +34,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003AC_0021_003FUsers_003Fadmin_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fd3_003F4533b7c3_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003F78_003Fe39b72ca_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIGrouping_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5004a53079e04c2991f89460a5186cf010fc00_003Fb1_003F69de2d9e_003FIGrouping_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIMGUIContainer_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F56d039fe633a4adf8fb266a0b1797e6c17a000_003F2c_003F134ee6ec_003FIMGUIContainer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AINotifyCompletion_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003F64_003Fbb31faf9_003FINotifyCompletion_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AInt32_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003F6f_003F6f797d5f_003FInt32_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AInt64_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fc2_003Fd9090dcf_003FInt64_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>