Browse Source

换装bug

guodong 2 years ago
parent
commit
839aca5fe7

+ 1 - 7
GameClient/Assets/Editor/Excel/ExcelScanner.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GFGEditor
+namespace GFGEditor
 {
     public class ExcelScanner
     {

+ 0 - 3
GameClient/Assets/Editor/Excel/Scanner/ShopScanner.cs

@@ -1,10 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using GFGGame;
-using UnityEngine;
 
 namespace GFGEditor
 {

+ 7 - 2
GameClient/Assets/Game/HotUpdate/Data/ScoreSystemData.cs

@@ -68,8 +68,13 @@ namespace GFGGame
                     bool isCheckFinish = false;
                     for (int k = 0; k < cfg.subTypesArr.Length; k++)
                     {
-                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(roleData.itemList[i]);
-
+                        var itemId = roleData.itemList[i];
+                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+                        if(itemCfg == null)
+                        {
+                            Log.Error($"id为 {itemId} 的物品没有配置,请查找原因!");
+                            continue;
+                        }
                         if (itemCfg.subType == cfg.subTypesArr[k])
                         {
                             roleData.pardListDic[cfg.id].Add(roleData.itemList[i]);

+ 1 - 4
GameClient/Assets/Game/HotUpdate/DressUp/DressUpObj.cs

@@ -171,10 +171,7 @@ namespace GFGGame
             {
                 if (!_showBg)
                 {
-                    if (DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(itemId))
-                    {
-                        return;
-                    }
+                    return;
                 }
                 _dressUpData.bgId = itemId;
                 bool showAni = IsAction || DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(itemId);

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -127,7 +127,7 @@ namespace GFGGame
             // UpdateItem(itemId);
             
             _dressUpObjUI.ResetSceneObj(70, false, true, null,  false);
-            _dressUpObjUI.dressUpObj.PutOnSuitCfg(suitId, false, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
+            _dressUpObjUI.dressUpObj.PutOnSuitCfg(suitId, false, null, false, false);
             _dressUpObjUI.UpdateWrapper(_ui.m_holder);
         }
     }

+ 8 - 0
GameClient/Assets/ResIn/Prefab/SceneDressUp.prefab

@@ -7,6 +7,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 1095836205521704273, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 1095836205521704273, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6789252974363538596, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
       propertyPath: m_Name
       value: SceneDressUp