Merge branch 'master' of http://192.168.123.2:3000/fort23/XY001

# Conflicts:
#	Assets/StreamingAssets/assetConfig.txt   resolved by origin/master(远端) version
#	Excel2Json/Excel/HeroBasicEquip.xlsx   resolved by master version

Assets/Res/Config/SkillUpConfig.json

@@ -139,6 +139,13 @@
       "upValue": 211,
       "idx": 5,
       "skillLv": 3
+    },
+    {
+      "ID": 54,
+      "upType": 1,
+      "upValue": 300,
+      "idx": 5,
+      "skillLv": 4
     }
   ]
 }

Assets/Res/UI/BoxPanel.prefab

@@ -350,7 +350,6 @@ GameObject:
   m_Component:
   - component: {fileID: 671376058743289274}
   - component: {fileID: 6970032159206589122}
-  - component: {fileID: 7708093179394439336}
   - component: {fileID: 8745496088663452512}
   m_Layer: 5
   m_HasEditorInfo: 1
@@ -387,50 +386,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1901584059914874739}
   m_CullTransparentMesh: 1
---- !u!114 &7708093179394439336
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1901584059914874739}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 8745496088663452512}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!114 &8745496088663452512
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroDetailPanel.prefab

@@ -6129,6 +6129,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -6367,6 +6369,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -6788,7 +6792,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 24.4, y: 3.7}
+  m_AnchoredPosition: {x: 25.8, y: 3.7}
   m_SizeDelta: {x: 80, y: 31.1}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9123609471762755513
@@ -8186,6 +8190,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -9755,6 +9761,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -10663,6 +10671,8 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -14264,6 +14274,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -14728,6 +14740,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -15657,6 +15671,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -15867,6 +15883,8 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:

Assets/Res/UI/MainUIPanel.prefab

@@ -2769,7 +2769,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 305, y: 382}
+  m_AnchoredPosition: {x: -300, y: 1000}
   m_SizeDelta: {x: 105.8279, y: 108.6129}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1659965290666304219
@@ -2876,7 +2876,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   maxDuration: 0
   isUpdate: 0
-  currTime: 0.102648
+  currTime: 0
   GrpupInfos:
   - Foldout: 1
     isActive: 0
@@ -5264,7 +5264,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4391858190883622590
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/SpecificProfessionEquipmentPanel.prefab

@@ -4329,8 +4329,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 188}
-  m_SizeDelta: {x: 807, y: 1721}
+  m_AnchoredPosition: {x: 0, y: 296}
+  m_SizeDelta: {x: 1024, y: 1024}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2557411863742407161
 CanvasRenderer:
@@ -4353,15 +4353,15 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 21300000, guid: 1d40c4387f630574382521f617eb1815, type: 3}
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -4370,14 +4370,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_00_04_06_Bg
+  _icon_name: bg_Archer
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 0}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
+    packName: bg
+    packgJsonPath: /Art/UIAssets/TextrueJson/bg.txt
+    packgSpritePath: Assets/Res/UIAtlas/bg.spriteatlasv2
+    lasetJsonGUID: 
 --- !u!1 &5901547370205652887
 GameObject:
   m_ObjectHideFlags: 0
@@ -5402,7 +5402,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5542169788541678593
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetHero.prefab

@@ -190,7 +190,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 21, y: 23}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8144389359825814294
 CanvasRenderer:
@@ -616,7 +616,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 21, y: 23}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2739737631316204749
 CanvasRenderer:
@@ -700,7 +700,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 21, y: 23}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2708601044019718149
 CanvasRenderer:
@@ -874,7 +874,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 21, y: 23}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8783385350428690739
 CanvasRenderer:
@@ -1142,7 +1142,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 8309734339275653843}
-  - component: {fileID: 1738032295264763748}
+  - component: {fileID: 6446373274172980238}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Stars
@@ -1170,12 +1170,12 @@ RectTransform:
   - {fileID: 7878371381901126332}
   m_Father: {fileID: 5106666997551906113}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -20.2, y: 52.8}
-  m_SizeDelta: {x: 94.79, y: 28.9}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 73.5, y: -67.4}
+  m_SizeDelta: {x: 100.8, y: 28.899994}
   m_Pivot: {x: 1, y: 1}
---- !u!114 &1738032295264763748
+--- !u!114 &6446373274172980238
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1184,23 +1184,21 @@ MonoBehaviour:
   m_GameObject: {fileID: 4057140983503937497}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
     m_Left: 0
     m_Right: 0
-    m_Top: 5
+    m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 2
-  m_Spacing: -5
-  m_ChildForceExpandWidth: 0
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 1
+  m_ChildAlignment: 4
+  m_StartCorner: 0
+  m_StartAxis: 0
+  m_CellSize: {x: 20, y: 20}
+  m_Spacing: {x: -4.2, y: 0}
+  m_Constraint: 0
+  m_ConstraintCount: 2
 --- !u!1 &4370823504067617340
 GameObject:
   m_ObjectHideFlags: 0
@@ -2098,7 +2096,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 21, y: 23}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6307304734260365425
 CanvasRenderer:

Assets/Scripts/Core/Utility/GlobalParam.cs

@@ -51,7 +51,7 @@ namespace Core.Utility
         public static int Hero_Promote_UI_BG_Star_Pos_2 = 150;
 
         /// <summary>
-        /// 生成装备的GUID
+        /// 生成装备表的ID
         /// </summary>
         /// <param name="zy"></param>
         /// <param name="eqType"></param>

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -228,7 +228,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     /// </summary>
     private void CleanEmptyData()
     {
-        // 从后往前遍历，这样删除元素,可以一般循环，一遍删除
+        // 从后往前遍历，这样删除元素,可以边循环，边删除
         for (int i = playerData.ItemListData.Count - 1; i >= 0; i--)
         {
             // string ss = "";
@@ -297,15 +297,17 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     /// </summary>
     public void ClearInitPlayerData()
     {
-        ItemData coin = new ItemData(GlobalParam.Item_Coin_ID);
-
+        ItemData coin = new ItemData(GlobalParam.Item_Coin_ID, 10000);
+        
         ItemData diamond = new ItemData(GlobalParam.Item_Diamond_ID);
-
+        
         ItemData heroExp = new ItemData(GlobalParam.Item_HeroExp_ID);
-
+        
         playerData.ItemListData.Add(coin);
         playerData.ItemListData.Add(diamond);
         playerData.ItemListData.Add(heroExp);
+        
+        // BagController.Instance.AddCoin(10000);
 
         HeroData heroData1 = new HeroData
         {

Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -62,7 +62,7 @@ namespace Fort23.Mono
 
         private void TenButtonCallBack()
         {
-            if (BagController.Instance.IsEnough(GlobalParam.Item_Coin_ID, openBoxConfig.oneConsume))
+            if (BagController.Instance.IsEnough(GlobalParam.Item_Coin_ID, openBoxConfig.tenConsume))
             {
                 BagController.Instance.DeductCoin(openBoxConfig.tenConsume);
                 

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

@@ -548,8 +548,16 @@ namespace Fort23.Mono
                 redColorStar = "";
                 redColorEnd = "";
             }
+
+            if (PlayerManager.Instance.gameConstantConfig.maxStar <= heroInfo.star.Value)
+            {
+                txtPromote.text = "MAX";
+            }
+            else
+            {
+                txtPromote.text = redColorStar + curHeroCount + redColorEnd + "/" + costHeroCount;    
+            }
             
-            txtPromote.text = redColorStar + curHeroCount + redColorEnd + "/" + costHeroCount;
 
             // LogTool.Log(PlayerManager.Instance.heroController.CanUpgrade(heroInfo));
             // LogTool.Log(go1.activeSelf);

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

@@ -25,7 +25,7 @@ namespace Fort23.Mono
             //现在是全更新的，后面可以优化成只更新对应职业的装备栏，现在无法这样做的原因是，池子回收了全部装备
             HeroEquipEventData data = e as HeroEquipEventData;
             
-                
+            UIManager.Instance.DormancyAllGComponent<WidgetItem>("eq");
             UpdateAllEq();
         }
 

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

@@ -111,7 +111,7 @@ namespace Fort23.Mono
             UIManager.Instance.DormancyAllGComponent<WidgetItem>(SpecificEqsPoolName);
             if (isClickOnce)
             {
-                UIManager.Instance.DormancyAllGComponent<WidgetItem>("eq");
+                // UIManager.Instance.DormancyAllGComponent<WidgetItem>("eq");
             }
         }
 

UserSettings/EditorUserSettings.asset

@@ -42,10 +42,10 @@ EditorUserSettings:
       value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     RecentlyUsedSceneGuid-9:
       value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68