新UI（物品信息）开发

Assets/Res/UIAtlas/bg.spriteatlasv2

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!612988286 &1
+SpriteAtlasAsset:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  serializedVersion: 3
+  m_MasterAtlas: {fileID: 0}
+  m_ImporterData:
+    packables: []
+  m_IsVariant: 0
+  m_IsPlaceholder: 0

Assets/Res/UIAtlas/bg.spriteatlasv2.meta

@@ -0,0 +1,31 @@
+fileFormatVersion: 2
+guid: DnsZsi//VXyBBe29+GdZE21/9l4E7OjnsUnaa3sZDDmuKQTqh69zVKY=
+SpriteAtlasImporter:
+  externalObjects: {}
+  textureSettings:
+    serializedVersion: 3
+    anisoLevel: 1
+    compressionQuality: 50
+    maxTextureSize: 2048
+    textureCompression: 0
+    filterMode: 1
+    generateMipMaps: 0
+    readable: 0
+    crunchedCompression: 0
+    webStreaming: 0
+    sRGB: 1
+  platformSettings: []
+  packingSettings:
+    serializedVersion: 2
+    padding: 4
+    blockOffset: 1
+    allowAlphaSplitting: 0
+    enableRotation: 1
+    enableTightPacking: 1
+    enableAlphaDilation: 0
+  secondaryTextureSettings: {}
+  variantMultiplier: 1
+  bindAsDefault: 1
+  userData: 
+  assetBundleName: moban
+  assetBundleVariant: 

Assets/Scripts/GameLogic/Hero/HeroController.cs

@@ -36,11 +36,11 @@ namespace GameLogic.Hero
         private void CalMainLevel()
         {
             //主力英雄不足4个时，就没有主力等级的说法
-            if (heroDicInLead.Count < GlobalParam.Max_Deploy_HERO)
-            {
-                m_MainLevel = -1;
-                return;
-            }
+            // if (heroDicInLead.Count < GlobalParam.Max_Deploy_HERO)
+            // {
+            //     m_MainLevel = -1;
+            //     return;
+            // }
 
             //计算主力英雄的最低等级
             int tmpLv = 9999;

Assets/Scripts/GameUI/UI/Hero/HeroBagPanel.cs

@@ -30,7 +30,8 @@ namespace Fort23.Mono
 
         private async void OnclickEquipment()
         {
-            ProfessionEquipmentPanel professionEquipmentPanel = await UIManager.Instance.LoadAndOpenPanel<ProfessionEquipmentPanel>(null);
+            ProfessionEquipmentPanel professionEquipmentPanel = await UIManager.
+                Instance.LoadAndOpenPanel<ProfessionEquipmentPanel>(null, isFullUI: true);
             professionEquipmentPanel.InitPanel();
         }
 

Assets/Scripts/GameUI/UI/Hero/SpecificProfessionEquipmentPanel.cs

@@ -75,24 +75,26 @@ namespace Fort23.Mono
                 case 1:
                     SetZyTxt(97);
                     zyBg.icon_name = "bg_warrior";
+                    colorBg.color = new Color(255, 215, 0);
                     break;
                 case 2:
                     SetZyTxt(98);
                     zyBg.icon_name = "bg_priest";
+                    colorBg.color = new Color(128, 0, 128);
                     break;
                 case 3:
                     SetZyTxt(99);
                     zyBg.icon_name = "bg_Mage";
+                    colorBg.color = new Color(255, 255, 204);
                     break;
                 case 4:
                     SetZyTxt(100);
                     zyBg.icon_name = "bg_Archer";
+                    colorBg.color = new Color(0, 128, 0);
                     break;
                 default:
                     break;
             }
-
-            SetZyBg(curZy);
         }
 
         private void SetZyTxt(int languageId)
@@ -103,8 +105,6 @@ namespace Fort23.Mono
 
         private void SetZyBg(int zy)
         {
-            
-           
         }
     }
 }

Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -106,7 +106,7 @@ namespace Fort23.Mono
 
         private async void OnClickHeroBag()
         {
-            HeroBagPanel heroBagPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBagPanel>(null);
+            HeroBagPanel heroBagPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBagPanel>(null, isFullUI: true);
             heroBagPanel.InitPanel();
         }
 

UGUIPack/uguiconfig.db

@@ -1 +1 @@
-{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"278bde855f239720008efb1760563849"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"a54d3984b6522f413325daf005732f7d"},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"151dde130cdc5228de9614f608886409"},{"packName":"itemIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/itemIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/itemIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"EquipmentIcon","packgJsonPath":"/Art/UIAssets/TextrueJson\\EquipmentIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2","lasetJsonGUID":"3f341819198f0a90aee7b2673a546c13"},{"packName":"bg","packgJsonPath":"/Art/UIAssets/TextrueJson\\bg.txt","packgSpritePath":"","lasetJsonGUID":""}],"isJiaoYan":true}
+{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"278bde855f239720008efb1760563849"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"a54d3984b6522f413325daf005732f7d"},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"151dde130cdc5228de9614f608886409"},{"packName":"itemIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/itemIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/itemIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"EquipmentIcon","packgJsonPath":"/Art/UIAssets/TextrueJson\\EquipmentIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2","lasetJsonGUID":"3f341819198f0a90aee7b2673a546c13"},{"packName":"bg","packgJsonPath":"/Art/UIAssets/TextrueJson\\bg.txt","packgSpritePath":"Assets/Res/UIAtlas/bg.spriteatlasv2","lasetJsonGUID":""}],"isJiaoYan":true}

UserSettings/EditorUserSettings.asset

@@ -39,13 +39,13 @@ EditorUserSettings:
       value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
+      value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-9:
       value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a