修改bug

Assets/Res/Config/OpenBoxConfig.json

@@ -4,7 +4,7 @@
       "ID": 1,
       "oneConsume": 500,
       "tenConsume": 4500,
-      "reward": 40002
+      "reward": 20001
     }
   ]
 }

Assets/Scenes/testCombat.scene

@@ -1217,10 +1217,6 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 5530431059692892977, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: speed
-      value: 20
-      objectReference: {fileID: 0}
     - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
       propertyPath: m_LocalPosition.x
       value: -4.3

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using Common.Utility.CombatEvent;
 using Core.Utility;
 using Fort23.Core;
+using Fort23.UTool;
 using GameLogic.Equipment;
 using UnityEngine;
 using Utility;
@@ -150,6 +151,7 @@ namespace GameLogic.Bag
             for (int i = 0; i < itemInfos.Count; i++)
             {
                 ItemInfo itemInfo = itemInfos[i];
+                LogTool.Log("获得了道具"+itemInfo.itemID);
                 AddItem(itemInfo, itemInfo.count.Value);
             }
         }

Assets/Scripts/GameLogic/Equipment/EquipmentController.cs

@@ -140,6 +140,27 @@ namespace GameLogic.Equipment
             
             return info;
         }
+        public ItemInfo BuildEquipmentForItemId(int itemId, int qualityDropID, int lvDropID)
+        {
+            ItemInfo info = null;
+
+
+
+            ItemInfo equipModelInfo = new ItemInfo(itemId);
+            
+            List<ItemInfo> qualityDropItems = DropManager.Instance.DropItem(qualityDropID);
+            List<ItemInfo> lvDropItems = DropManager.Instance.DropItem(lvDropID);
+
+            info = equipModelInfo;
+
+            info.eqInfo = new EquipmentInfo();
+            // info.eqInfo.InitEquipment(info.config,
+            //     lvDropItems[0].dropItemConfig.itemID[0], 
+            //     qualityDropItems[0].dropItemConfig.itemID[0]);
+            info.eqInfo.InitEquipment(equipModelInfo, lvDropItems[0], qualityDropItems[0]);
+            
+            return info;
+        }
 
         /// <summary>
         /// 一键穿职业装备

Assets/Scripts/GameLogic/Equipment/EquipmentInfo.cs

@@ -94,10 +94,10 @@ namespace GameLogic.Equipment
             // guid = GlobalParam.GenerateGUID();
             myItemInfo.guid = itemConfig.ID.ToString() + basicEquipConfig.lv + quality;
             
-            LogTool.Log("装备职业:"+ basicEquipConfig.profession +
-                        "-装备位置:" + basicEquipConfig.Type + 
-                        "-装备品质:" + quality +
-                        "-装备等级:" + basicEquipConfig.lv);
+            // LogTool.Log("装备职业:"+ basicEquipConfig.profession +
+            //             "-装备位置:" + basicEquipConfig.Type + 
+            //             "-装备品质:" + quality +
+            //             "-装备等级:" + basicEquipConfig.lv);
             //凯旋 诸葛 某个 津津有味 厌烦 繁琐 述说 
             CalAtt();
         }

Assets/Scripts/GameLogic/Player/DropManager.cs

@@ -52,7 +52,7 @@ namespace GameLogic.Player
                 int.Parse(eqDropData[1]),
                 int.Parse(eqDropData[2]));
 
-            if(eqItemInfo != null)
+            if (eqItemInfo != null)
                 BagController.Instance.AddEquipmentItem(eqItemInfo);
 
             return eqItemInfo;
@@ -76,14 +76,14 @@ namespace GameLogic.Player
                 {
                     itemInfo = DropEquipment(eqDropStr);
                 }
-            } 
+            }
             else if (monsterType == 2)
             {
                 foreach (string eqDropStr in levelBattleConfig.eliteMonsterItem)
                 {
                     itemInfo = DropEquipment(eqDropStr);
-                }   
-            } 
+                }
+            }
             else if (monsterType == 3)
             {
                 foreach (string eqDropStr in levelBattleConfig.bossItem)
@@ -96,6 +96,7 @@ namespace GameLogic.Player
             {
                 equipmentList.Add(itemInfo);
             }
+
             return equipmentList;
         }
 
@@ -138,9 +139,9 @@ namespace GameLogic.Player
         private void DropItemConfig(List<ItemInfo> itemInfos, int[] dropItemID)
         {
             int rIdx = Random.Next(0, dropItemID.Length);
-            
+
             // DropItemConfig rDropItemConfig = ConfigComponent.Instance.Get<DropItemConfig>(dropItemID[rIdx]);
-            
+
             // for (int i = 0; i < dropItemID.Length; i++)
             // {
             //DropItemConfig dropItemConfig = ConfigComponent.Instance.Get<DropItemConfig>(dropItemID[i]);
@@ -165,6 +166,13 @@ namespace GameLogic.Player
                 {
                     itemInfo = new ItemInfo(dropItemConfig.itemID[j], c);
                 }
+                else if (dropItemConfig.dropItemType == 4)
+                {
+                    itemInfo = PlayerManager.Instance.eqController.BuildEquipmentForItemId(dropItemConfig.itemID[0],
+                        dropItemConfig.itemID[1],
+                        dropItemConfig.itemID[2]);
+                    // itemInfo = DropEquipment(dropItemConfig.itemID[j]);
+                }
                 else
                 {
                     itemInfo = new ItemInfo(dropItemConfig);

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: 2}
   m_MinSize: {x: 875, y: 321}
   m_MaxSize: {x: 10000, y: 10000}
@@ -122,7 +122,7 @@ MonoBehaviour:
   m_MinSize: {x: 500, y: 100}
   m_MaxSize: {x: 40480, y: 16192}
   vertical: 0
-  controlID: 182
+  controlID: 172
   draggingID: 0
 --- !u!114 &6
 MonoBehaviour:
@@ -247,7 +247,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1243
     y: 0
-    width: 338
+    width: 475
     height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
@@ -271,9 +271,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1581
+    x: 1718
     y: 0
-    width: 607
+    width: 529
     height: 1299
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
@@ -298,12 +298,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 2188
+    x: 2247
     y: 0
-    width: 372
+    width: 313
     height: 1299
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 21}
   m_Panes:
   - {fileID: 21}
@@ -329,9 +329,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1581
+    x: 1718
     y: 73
-    width: 605
+    width: 527
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -567,10 +567,10 @@ MonoBehaviour:
       containerId: overlay-container--right
       floating: 0
       collapsed: 0
-      displayed: 1
-      snapOffset: {x: 0, y: -197}
+      displayed: 0
+      snapOffset: {x: -387, y: -197}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 2
+      snapCorner: 3
       id: Scene View/Particles
       index: 8
       layout: 4
@@ -704,9 +704,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -5.028593, y: -20.22837, z: 3.8047159}
+    m_Target: {x: 1.3405353, y: 0.2975505, z: 7.735005}
     speed: 2
-    m_Value: {x: -5.028593, y: -20.22837, z: 3.8047159}
+    m_Value: {x: 1.3405353, y: 0.2975505, z: 7.735005}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -752,13 +752,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.1477964, y: -0.6906913, z: 0.14743912, w: 0.6923638}
+    m_Target: {x: -0.48231304, y: 0.30325496, z: -0.18252304, w: -0.8013251}
     speed: 2
-    m_Value: {x: 0.14779611, y: -0.6906899, z: 0.14743882, w: 0.69236237}
+    m_Value: {x: -0.48230678, y: 0.30325103, z: -0.18252067, w: -0.80131465}
   m_Size:
-    m_Target: 20.38144
+    m_Target: 1.0336097
     speed: 2
-    m_Value: 20.38144
+    m_Value: 1.0336097
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -778,7 +778,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: 0.1477964, y: -0.6906913, z: 0.14743912, w: 0.6923638}
+  m_LastSceneViewRotation: {x: 0.011674443, y: 0.05125597, z: 0.0006001084, w: -0.9986271}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
@@ -1167,23 +1167,23 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: fc57fcff
-      m_LastClickedID: -239620
-      m_ExpandedIDs: f290fffffe90ffff0491ffff5293ffff84faffff2aa700005aa70000
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: d0b6fcfffcbcfcff04bdfcff12bdfcfffa33fdff0234fdff1034fdff1234fdfffec8feffc0fffeff4ca0fffff0afffffdac8ffff6ac9ffff18caffff80cbffffdacbffffe6cbffff5ad4ffff5cd4ffff5ed4ffff68d4ffff52e6ffff56e6ffff5ae6fffff4e6fffff6e6ffff84faffffc0c00000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: fx_shouDong (Clone)
+        m_OriginalName: fx_shouDong (Clone)
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 0
+        m_UserData: -213742
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 0
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 9}
       m_SearchString: 
@@ -1215,7 +1215,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1243
     y: 73
-    width: 336
+    width: 473
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1228,7 +1228,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: fx_shouDong
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -1238,38 +1238,38 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/ArtHero
+    - Assets/Scripts
     m_Globs: []
-    m_OriginalText: fx_shouDong
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/ArtHero
+  - Assets/Scripts
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 38ab0000
-    m_LastClickedID: 43832
-    m_ExpandedIDs: 0000000060a8000062a8000064a8000066a8000068a800006aa800006ca800006ea8000070a8000072a8000074a8000076a8000078a800007aa800007ca800007ea8000080a8000082a8000084a8000086a8000088a800008aa800008ca800008ea8000090a8000092a8000094a8000096a8000098a800009aa800009ca800009ea80000a0a80000a2a80000a4a80000a6a80000a8a80000aaa80000aca80000aea80000b0a80000b2a80000b4a80000b6a80000b8a80000baa80000bca80000bea80000c0a80000c2a80000c4a80000c6a80000c8a80000caa80000cca80000cea80000d0a80000d2a80000d4a80000d6a80000d8a80000daa80000dca80000dea80000e0a80000e6a80000e8a80000eaa80000c8ac0000caac000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 746}
+    m_SelectedIDs: 82a90000
+    m_LastClickedID: 43394
+    m_ExpandedIDs: 00000000faa80000fca80000fea8000000a9000002a9000004a9000006a9000008a900000aa900000ca900000ea9000010a9000012a9000014a9000016a9000018a900001aa900001ca900001ea9000020a9000022a9000024a9000026a9000028a900002aa900002ca900002ea9000030a9000032a9000034a9000036a9000038a900003aa900003ca900003ea9000040a9000042a9000044a9000046a9000048a900004aa900004ca900004ea9000050a9000052a9000054a9000056a9000058a900005aa900005ca900005ea9000060a9000062a9000064a9000066a9000068a900006aa900006ca900006ea9000070a9000072a9000074a9000076a9000078a900007aa900007ca900007ea9000082a90000e2ab000016ac0000b4f2000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: Art
+      m_OriginalName: Art
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 43988
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 10}
     m_SearchString: 
@@ -1283,7 +1283,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000060a8000062a8000064a8000066a8000068a800006aa800006ca800006ea8000070a8000072a8000074a8000076a8000078a800007aa800007ca800007ea8000080a8000082a8000084a8000086a8000088a800008aa800008ca800008ea8000090a8000092a8000094a8000096a8000098a800009aa800009ca800009ea80000a0a80000a2a80000a4a80000a6a80000a8a80000aaa80000aca80000aea80000b0a80000b2a80000b4a80000b6a80000b8a80000baa80000bca80000bea80000c0a80000c2a80000c4a80000c6a80000c8a80000caa80000cca80000cea80000d0a80000d2a80000d4a80000d6a80000d8a80000daa80000dca80000dea80000e0a80000e2a80000e4a80000e6a80000e8a80000eaa80000
+    m_ExpandedIDs: 00000000faa80000fca80000fea8000000a9000002a9000004a9000006a9000008a900000aa900000ca900000ea9000010a9000012a9000014a9000016a9000018a900001aa900001ca900001ea9000020a9000022a9000024a9000026a9000028a900002aa900002ca900002ea9000030a9000032a9000034a9000036a9000038a900003aa900003ca900003ea9000040a9000042a9000044a9000046a9000048a900004aa900004ca900004ea9000050a9000052a9000054a9000056a9000058a900005aa900005ca900005ea9000060a9000062a9000064a9000066a9000068a900006aa900006ca900006ea9000070a9000072a9000074a9000076a9000078a900007aa900007ca900007ea9000080a9000082a90000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1359,9 +1359,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1581
+    x: 1718
     y: 73
-    width: 605
+    width: 527
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1415,23 +1415,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 605
+      width: 527
       height: 1257
-    m_Scale: {x: 0.7740148, y: 0.7740148}
-    m_Translation: {x: 302.5, y: 628.5}
+    m_Scale: {x: 0.70266664, y: 0.70266664}
+    m_Translation: {x: 263.5, y: 628.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -390.81943
-      y: -812
-      width: 781.63885
-      height: 1624
+      x: -375
+      y: -894.44977
+      width: 750
+      height: 1788.8995
     m_MinimalGUI: 1
-  m_defaultScale: 0.7740148
-  m_LastWindowPixelSize: {x: 605, y: 1278}
+  m_defaultScale: 0.70266664
+  m_LastWindowPixelSize: {x: 527, y: 1278}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -1457,9 +1457,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2188
+    x: 2247
     y: 73
-    width: 371
+    width: 312
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0