Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.1924724
+    - _Alpha: 0.9794099
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.95947623
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.20872194
+    - _Alpha: 0.22934401
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.20165503
+    - _MainTexOffsetU: 0.17737353
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/Config/BigMapConfig.json

@@ -8,8 +8,7 @@
       "places": [
         1,
         2,
-        3,
-        4
+        3
       ],
       "ulockFunction": [
         0

Assets/Res/UI/HeroInformainPanel/ElixirItemWidget.prefab

@@ -98,7 +98,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7084811652179703998
 RectTransform:
   m_ObjectHideFlags: 0
@@ -244,7 +244,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
     lasetJsonGUID: 4b54a953fcd0950cece7d4eeea1f40a9
-  imageH: 0
+  imageH: 58.874
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -333,7 +333,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
-  imageH: 0
+  imageH: 23
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -422,7 +422,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
-  imageH: 0
+  imageH: 173
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/HeroInformainPanel/ExpElixirItemWidget.prefab

@@ -689,7 +689,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 43.997498, y: -12.5}
-  m_SizeDelta: {x: 0, y: 23.1372}
+  m_SizeDelta: {x: 24, y: 23.1372}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7796567445027890541
 CanvasRenderer:

Assets/Res/UI/HeroInformainPanel/SelectElixirPanel.prefab

@@ -400,7 +400,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1304532800865056302
 RectTransform:
   m_ObjectHideFlags: 0
@@ -480,7 +480,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4207440298402796094
 RectTransform:
   m_ObjectHideFlags: 0
@@ -587,7 +587,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -97.5, y: -79.444855}
+  m_AnchoredPosition: {x: 7.958008, y: -79.444855}
   m_SizeDelta: {x: 153.9841, y: 31.566}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3434325199936299810
@@ -1175,8 +1175,8 @@ RectTransform:
   - {fileID: 5479327295762610055}
   - {fileID: 9083946382969641878}
   - {fileID: 8813146582474618022}
-  - {fileID: 1304532800865056302}
   - {fileID: 7348873872092931165}
+  - {fileID: 1304532800865056302}
   - {fileID: 4207440298402796094}
   - {fileID: 619903290553561830}
   - {fileID: 725548104741330431}
@@ -2021,7 +2021,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: -91.458, y: 128.24}
+  m_AnchoredPosition: {x: 14, y: 128.24}
   m_SizeDelta: {x: 122, y: 36}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4482844101870119250

Assets/Res/UI/ShopPanel/ShopItemWidgetType2.prefab

@@ -38,7 +38,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 115.51595, y: -23.732}
-  m_SizeDelta: {x: 0, y: 46.2139}
+  m_SizeDelta: {x: 57, y: 46.2139}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5356034030161481726
 CanvasRenderer:

Assets/Scripts/Core/UI/UTool/NicerOutline.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 [AddComponentMenu("UI/Effects/Nicer Outline", 15)]
 public class NicerOutline : BaseMeshEffect
 {
-    [SerializeField] private Color effectColor = new Color(0f, 0f, 0f, 1f);
+    [SerializeField] public Color effectColor = new Color(0f, 0f, 0f, 1f);
     [SerializeField] private float effectDistanceX = 2f;
     [SerializeField] private float effectDistanceY = 2f;
    [Range(4,12)] [SerializeField] private int samplingRate = 10;

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -190,7 +190,8 @@ namespace GameLogic.Bag
                         f.id == item.config.associateVlaue[1]);
                 if (faaData != null)
                 {
-                    return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2] *count);
+                    // item.isSuiPian = true;
+                    return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2] * count);
                 }
                 else
                 {
@@ -212,7 +213,8 @@ namespace GameLogic.Bag
                         s.id == item.config.associateVlaue[1]);
                 if (skillData != null)
                 {
-                    return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2]* count);
+                    // item.isSuiPian = true;
+                    return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2] * count);
                 }
                 else
                 {
@@ -286,6 +288,29 @@ namespace GameLogic.Bag
             //     PlayerManager.Instance.eqController.AddEquipment(itemInfo);    
             // }
 
+            //法宝
+            if (item.config.itemTag == 11)
+            {
+                AccountFileInfo.FaBaoData faaData = AccountFileInfo.Instance.playerData.AllFaBaoDatas.FirstOrDefault(
+                    f =>
+                        f.id == item.config.associateVlaue[1]);
+                if (faaData != null)
+                {
+                    item.isSuiPian = true;
+                }
+            }
+            //功法
+            else if (item.config.itemTag == 13)
+            {
+                AccountFileInfo.SkillData skillData = AccountFileInfo.Instance.playerData.AllSkillDatas.FirstOrDefault(
+                    s =>
+                        s.id == item.config.associateVlaue[1]);
+                if (skillData != null)
+                {
+                    item.isSuiPian = true;
+                }
+            }
+
             AddItemCount(itemInfo, count);
         }
 
@@ -359,8 +384,8 @@ namespace GameLogic.Bag
 
             //这里要设成0是因为，随机掉落的东西，第一次进背包时，先把数量去掉（否则会掉会多加1个）
             //该方法结束后，有统一加数量的代码，看后续代码。
-            itemInfo.count.Value = 0l;
-            m_allBagDic.Add(itemInfo.guid, itemInfo);
+            // itemInfo.count.Value = 0l;
+            m_allBagDic.Add(itemInfo.guid, new ItemInfo(itemInfo.itemID,0));
 
             return itemInfo;
         }

Assets/Scripts/GameLogic/Bag/ItemInfo.cs

@@ -13,7 +13,7 @@ namespace GameLogic.Bag
 
         public ItemConfig config;
 
- 
+        public bool isSuiPian = false;
 
       
 

Assets/Scripts/GameUI/CustomStateController/CustomStateController.cs

@@ -189,7 +189,7 @@ public class CustomStateController : MonoBehaviour, ISerializationCallbackReceiv
                 stateInfo.UIStateV4Types.Add(UIStateType.TextColor);
                 stateInfo.UIStateV4Datas.Add(vector4);
             }
-            
+
             if (AllComsStateTypes[i].HasFlag(UIStateType.TmpColor))
             {
                 Vector4 vector4 = go.GetComponent<TextMeshProUGUI>().color;
@@ -200,7 +200,15 @@ public class CustomStateController : MonoBehaviour, ISerializationCallbackReceiv
 
             if (AllComsStateTypes[i].HasFlag(UIStateType.OutLineColor))
             {
-                Vector4 vector4 = go.GetComponent<Outline>().effectColor;
+                Vector4 vector4 = default;
+                if (go.GetComponent<Outline>() != null)
+                {
+                    vector4 = go.GetComponent<Outline>().effectColor;
+                }
+                else if (go.GetComponent<NicerOutline>() != null)
+                {
+                    vector4 = go.GetComponent<NicerOutline>().effectColor;
+                }
 
                 stateInfo.UIStateV4Types.Add(UIStateType.OutLineColor);
                 stateInfo.UIStateV4Datas.Add(vector4);
@@ -329,7 +337,15 @@ public class CustomStateController : MonoBehaviour, ISerializationCallbackReceiv
                             break;
                         case UIStateType.OutLineColor:
                             Color outLineColorData = keyValuePair.UIStateV4Datas[i];
-                            go.GetComponent<Outline>().effectColor = outLineColorData;
+                            if (go.GetComponent<Outline>() != null)
+                            {
+                                go.GetComponent<Outline>().effectColor = outLineColorData;
+                            }
+                            else if (go.GetComponent<NicerOutline>() != null)
+                            {
+                                go.GetComponent<NicerOutline>().effectColor = outLineColorData;
+                            }
+
                             break;
 
                         case UIStateType.CustomState:

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -692,7 +692,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     TipMessagePanel tipMessagePanel = await TipMessagePanel.OpenTipMessagePanel(
                         LanguageManager.Instance.Text(10379,
                             LanguageManager.Instance.Text(lastSmallPlacesConfig.placeName),
-                            lastSmallPlacesConfig.CompletionEventCount));
+                            lastSmallPlacesConfig.CompletionEventCount-lastSmallPlacesData.completionEventCount));
                     if (PlayerGuideManager.Instance.GuideIsCanDo(3))
                     {
                         PlayerGuideManager.Instance.SetGuid(3);

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

@@ -54,18 +54,17 @@ namespace Fort23.Mono
             if (itemInfo.config.itemTag == 11)
             {
                 csc.ChangeState(itemInfo.config.quality - 3);
-                AccountFileInfo.FaBaoData faaData = AccountFileInfo.Instance.playerData.AllFaBaoDatas.FirstOrDefault(
-                    f =>
-                        f.id == itemInfo.config.associateVlaue[1]);
-                if (faaData != null)
+
+                if (itemInfo.isSuiPian)
                 {
                     itemConfig = ConfigComponent.Instance.Get<ItemConfig>(itemInfo.config.associateVlaue[0]);
                     Icon_SuiPian.gameObject.SetActive(true);
                     count = itemInfo.config.associateVlaue[2];
-                    Text_Count.text = $"x{count}";
+                    // Text_Count.text = $"x{count}";
                 }
                 else
                 {
+                    count = 1;
                     Icon_SuiPian.gameObject.SetActive(false);
                     Icon_New.gameObject.SetActive(true);
                 }
@@ -74,20 +73,17 @@ namespace Fort23.Mono
             else if (itemInfo.config.itemTag == 13)
             {
                 csc.ChangeState(itemInfo.config.quality - 3);
-                AccountFileInfo.SkillData skillData = AccountFileInfo.Instance.playerData.AllSkillDatas.FirstOrDefault(
-                    s =>
-                        s.id == itemInfo.config.associateVlaue[1]);
-                if (skillData != null)
+
+                if (itemInfo.isSuiPian)
                 {
                     itemConfig = ConfigComponent.Instance.Get<ItemConfig>(itemInfo.config.associateVlaue[0]);
                     Icon_SuiPian.gameObject.SetActive(true);
                     count = itemInfo.config.associateVlaue[2];
-                    Text_Count.text = $"x{count}";
-                    // Text_Count.text = $"x{itemInfo.config.associateVlaue[2]}";
-                    // Icon_New.gameObject.SetActive(true);
+                    // Text_Count.text = $"x{count}";
                 }
                 else
                 {
+                    count = 1;
                     Icon_SuiPian.gameObject.SetActive(false);
                     Icon_New.gameObject.SetActive(true);
                 }
@@ -96,7 +92,7 @@ namespace Fort23.Mono
             {
                 Icon_SuiPian.gameObject.SetActive(false);
                 count = (int)(itemInfo.count.Value);
-                Text_Count.text = $"x{count}";
+                // Text_Count.text = $"x{count}";
                 csc.ChangeState(0);
             }
 
@@ -168,7 +164,8 @@ namespace Fort23.Mono
 
 
             Text_Name.text = LanguageManager.Instance.Text(itemConfig.itemName);
-
+            // count = (int)(itemInfo.count.Value);
+            Text_Count.text = $"x{count}";
             // if (itemInfo.count.Value > 0)
             // {
             //     Text_Count.gameObject.SetActive(true);

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -400,6 +400,10 @@ namespace Fort23.Mono
                 case ShowDialogueEventData.MessageShowType.Verbatim:
                     _sb.Clear();
                     _currShowMessage = m.ToCharArray();
+                    if (eventConditionConfig.step == 1 && eventConditionConfig.NPCID == 100 && PlayerManager.Instance.PlayerName != String.Empty)
+                    {
+                        _sb.Append(PlayerManager.Instance.PlayerName + ":");
+                    }
                     _sb.Append(_currShowMessage[0]);
                     showText.text = _sb.ToString();
                     _isUpdate = true;
@@ -524,7 +528,7 @@ namespace Fort23.Mono
 
             // DialgueType1.gameObject.SetActive(false);
             // DialgueType2.gameObject.SetActive(false);
-            // OptionMarsk.SetActive(false);
+            OptionMarsk.SetActive(false);
             isOver = false;
             await base.Close();
             // DialgueType1Anim.Play("DialgueType1idle");

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoBtnWidget.cs

@@ -33,9 +33,8 @@ namespace Fort23.Mono
             {
                 Icon_ItemIcon.gameObject.SetActive(false);
                 Icon_ShenIcon.gameObject.SetActive(true);
-                // Icon_ItemIcon.icon_name = ItemInfo.config.icon;
                 Text_ItemCount.text =
-                    $"<color=#EF9F32>{100 * 1}</color>/{(int)AccountFileInfo.Instance.playerData.divineSensePoint}";
+                    $"{(int)AccountFileInfo.Instance.playerData.divineSensePoint}/<color=#EF9F32>{100 * 1}</color>";
             }
             else
             {
@@ -76,14 +75,14 @@ namespace Fort23.Mono
             if (type == 1)
             {
                 Text_ItemCount.text =
-                    $"<color=#EF9F32>{100 * selectCount}</color>/{(int)AccountFileInfo.Instance.playerData.divineSensePoint}";
+                    $"{(int)AccountFileInfo.Instance.playerData.divineSensePoint}/<color=#EF9F32>{100 * selectCount}</color>";
             }
             else
             {
                 if (ItemInfo != null)
                 {
                     selectCount = selectCount > ItemInfo.count.Value ? (int)ItemInfo.count.Value : selectCount;
-                    Text_ItemCount.text = $"<color=#EF9F32>{selectCount}</color>/{ItemInfo.count.Value.ToString()}";
+                    Text_ItemCount.text = $"{ItemInfo.count.Value.ToString()}/<color=#EF9F32>{selectCount}</color>";
                 }
             }
         }

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -125,12 +125,13 @@ namespace Fort23.Mono
 
                 if (PlayerManager.Instance.myHero.powerUpConfig.ID < selectedFaBaoInfo.FabaoPowerupConfig.NeedLv)
                 {
+                    HeroPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(selectedFaBaoInfo.FabaoPowerupConfig.NeedLv);
                     string jingjie =
-                        LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig
+                        LanguageManager.Instance.Text(heroPowerUpConfig
                             .jingjieLanIDs[0]) +
-                        LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig
+                        LanguageManager.Instance.Text(heroPowerUpConfig
                             .jingjieLanIDs[1]) +
-                        LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+                        LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
                     TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(10337, jingjie));
                     AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                     return;