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

Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat

@@ -139,7 +139,7 @@ Material:
     - _MainSpeedU: 0
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: -0.3
+    - _MainTexOffsetV: 0.25601506
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5

Assets/Res/Config/EventConfig.json

@@ -2913,6 +2913,12 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
+      "PrizeIDs": [
+        20004
+      ],
+      "PrizeNums": [
+        1
+      ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 2,

Assets/Res/Config/ReddotConfig.json

@@ -85,6 +85,20 @@
       "EnableForTarget": 0,
       "Layer": 1,
       "Enable": 1
+    },
+    {
+      "ID": 12,
+      "GroupID": 2,
+      "EnableForTarget": 0,
+      "Layer": 1,
+      "Enable": 1
+    },
+    {
+      "ID": 13,
+      "GroupID": 2,
+      "EnableForTarget": 0,
+      "Layer": 1,
+      "Enable": 1
     }
   ]
 }

Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -2311,7 +2311,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -1226,6 +1226,15 @@ MonoBehaviour:
     - gameObject: {fileID: 4649527201698735611}
     - gameObject: {fileID: 6899362910355405383}
     - gameObject: {fileID: 2266735464070336714}
+  - key: RedDotComType02
+    gameObject: {fileID: 5305337877491270007}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
   isAssetBundle: 1
 --- !u!1 &2864693667708896535
 GameObject:
@@ -1263,6 +1272,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2225020066323674626}
+  - {fileID: 2570494198685939881}
   m_Father: {fileID: 1617875011636537765}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -4153,6 +4163,127 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!1001 &206093230499851597
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 4804840102154087274}
+    m_Modifications:
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_Pivot.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 3.9634461
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -13.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -15
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2789586574518551789, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3073202858500431554, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_Name
+      value: RedDotComType01 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 5439336813456305210, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: RedDotConfigId
+      value: 2
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+--- !u!224 &2570494198685939881 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+  m_PrefabInstance: {fileID: 206093230499851597}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &5305337877491270007 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5439336813456305210, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+  m_PrefabInstance: {fileID: 206093230499851597}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8faa9321e9f040f42aa76599adb76143, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &412690506438247466
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Res/UI/SkillSelectPanel/SkillWidget.prefab

@@ -177,9 +177,9 @@ RectTransform:
   - {fileID: 271321759498699397}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 69, y: -84.99994}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 172, y: 236}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8011248716651228647

Assets/Res/UI/TowerPanel/TowerLevelWidget.prefab

@@ -533,7 +533,7 @@ MonoBehaviour:
       UIStateV4Datas: []
       UIStateStrTypes: 00020000
       UIStateStrDatas:
-      - dec_pata2
+      - dec_pata3
   - StateInfos:
     - Target: {fileID: 68852666246476557}
       UIStateV4Types: 80000000

Assets/Res/UIAtlas/battle.spriteatlasv2.meta

@@ -20,12 +20,12 @@ SpriteAtlasImporter:
     padding: 4
     blockOffset: 1
     allowAlphaSplitting: 0
-    enableRotation: 0
-    enableTightPacking: 0
-    enableAlphaDilation: 1
+    enableRotation: 1
+    enableTightPacking: 1
+    enableAlphaDilation: 0
   secondaryTextureSettings: {}
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: battle
+  assetBundleName: 
   assetBundleVariant: 

Assets/Scripts/Core/BRG/BRGRender.cs

@@ -45,11 +45,6 @@ namespace Core.BRG
                 new NativeArray<MetadataValue>(m_samples.AllShaderValues.Count, Allocator.Temp,
                     NativeArrayOptions.UninitializedMemory);
             m_batchShaderBinds.Clear();
-            // BatchShaderBind transformBind = new BatchShaderBind();
-            // transformBind.shaderValue = new BRGShaderValue()
-            // {
-            //     key = "_Object2World",
-            // };
             for (int i = 0; i < m_samples.AllShaderValues.Count; i++)
             {
                 BRGShaderValue shaderValue = m_samples.AllShaderValues[i];

Assets/Scripts/GameLogic/Combat/Skill/S2009.cs

@@ -7,6 +7,7 @@ using GameLogic.Combat.Hero;
 
 namespace GameLogic.Combat.Skill
 {
+    
     /// <summary>
     /// 青莲净体诀  前方槽位功法在命中目标时会获得青莲之气，青莲气体达到{0}层时清除自己{1}个随机debuff,并恢复{2}%最大生命
     /// 后方槽位也能获得青莲之气

Assets/Scripts/GameLogic/Combat/Skill/SkillBasic.cs

@@ -623,6 +623,11 @@ namespace GameLogic.Combat.Skill
             {
                 int configIndex = (int)SelfSkillConfig.PromoteLanPara_1[i];
                 int currIndex = (configIndex + index) % 10;
+                if (currIndex < 0)
+                {
+                    currIndex = currIndex + 10;
+                }
+
                 if (targetSkillBasic.index == currIndex)
                 {
                     return true;

Assets/Scripts/GameLogic/Hero/SkillInfo.cs

@@ -102,7 +102,8 @@ namespace GameLogic.Hero
                     // int index = skillConfig.intensifierIndex[i] ;
                     if (index >= 0 && index < effectValue.Length)
                     {
-                        effectValue[index] = effectValue[index] * SkillPowerupConfig.SkillPower1 * 0.01f;
+                        float value = 100+(SkillPowerupConfig.SkillPower1 - 100) * skillConfig.effectUpK * 0.01f;
+                        effectValue[index] = effectValue[index] * value * 0.01f;
                     }
                 }
             }

Assets/Scripts/GameLogic/RedDot/RedDotManager.cs

@@ -233,6 +233,17 @@ public class RedDotManager : Singleton<RedDotManager>
         switch (redDotGroupID)
         {
             case 2:
+                SkillInfo skillInfo = value as SkillInfo;
+                if (isSkillStar(skillInfo))
+                {
+                    return true;
+                }
+
+                if (!PlayerManager.Instance.GongFaControl.allUseSkill.Contains(skillInfo))
+                {
+                    return false;
+                }
+
                 return isSkillUpgrade(value as SkillInfo);
             case 9:
                 object[] objects = value as object[];
@@ -250,16 +261,14 @@ public class RedDotManager : Singleton<RedDotManager>
     {
         if (_skillInfo == null)
             return false;
+
+
         var _skillPowerupConfigs = ConfigComponent.Instance.GetAll<SkillPowerupConfig>();
         if (_skillInfo.SkillData.level >= _skillPowerupConfigs.Length)
         {
             return false;
         }
-
-        if (PlayerManager.Instance.myHero.level.Value < _skillInfo.SkillPowerupConfig.PlayerLevelLimit)
-        {
-            return false;
-        }
+        
 
         for (var i = 0; i < _skillInfo.SkillPowerupConfig.LevelupItem.Length; i++)
         {
@@ -273,6 +282,32 @@ public class RedDotManager : Singleton<RedDotManager>
         return true;
     }
 
+    public bool isSkillStar(SkillInfo _skillInfo)
+    {
+        if (_skillInfo == null)
+            return false;
+        List<SkillConfig> allSkillConfigs = ConfigComponent.Instance.GetAll<SkillConfig>().ToList();
+        var configs = allSkillConfigs.Where(s => s.IDGroup == _skillInfo.skillConfig.IDGroup).ToList();
+
+        if (_skillInfo.SkillData.star > configs.Count)
+        {
+            return false;
+        }
+
+        ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(_skillInfo.skillConfig.PieceID);
+
+        SkillConstant skillConstant = ConfigComponent.Instance.Get<SkillConstant>(itemConfig.quality);
+
+        int count = skillConstant.SkillPromoteNeedPieceNum[_skillInfo.skillConfig.level - 1];
+
+        if (!PlayerManager.Instance.BagController.DeductItem(_skillInfo.skillConfig.PieceID, count))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
     public bool IsFabaoUpgrade(FaBaoInfo faBaoInfo)
     {
         if (faBaoInfo == null)

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -196,7 +196,8 @@ namespace Fort23.Mono
 
             _gongFaUpgradeInfoWidgets.Clear();
             _skillInfo = skillInfo;
-            RedDotComType01.CustomInit(2, _skillInfo);
+            RedDotComType02.CustomInit(13, _skillInfo);
+            RedDotComType01.CustomInit(12, _skillInfo);
             _skillPowerupConfigs = ConfigComponent.Instance.GetAll<SkillPowerupConfig>().ToList();
             SkillConfig skillConfig = _skillInfo.skillConfig;
             Icon_GongFaIcon.icon_name = skillConfig.icon;

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanelData.cs

@@ -307,6 +307,17 @@ namespace Fort23.Mono
 	      return _Btn_UpGradeOkLongPress;
 	     }
 	   }
+	  private RedDotWidgetType01 _RedDotComType02;
+	  public RedDotWidgetType01 RedDotComType02
+	   {
+	   get{
+	      if (_RedDotComType02 == null)
+	       {
+	         _RedDotComType02  = GetUIUnit<RedDotWidgetType01>("RedDotComType02"); 
+	       }
+	      return _RedDotComType02;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/TowerPanel/TowerLevelWidget.cs

@@ -73,9 +73,10 @@ namespace Fort23.Mono
                 || _towerInfoConfig.level == 1)
             {
                 isLock = true;
+                // if()
                 if (towerLevelData != null && towerLevelData.finish)
                 {
-                    Csc.ChangeState(2);
+                    Csc.ChangeState(0);
 
                     //可以领取奖励
                     if (towerLevelData != null && !towerLevelData.reward)
@@ -83,14 +84,14 @@ namespace Fort23.Mono
                         Icon_Item.transform.parent.transform.RecoverColor();
                         fx_ui_jiangli_loop.gameObject.SetActive(true);
                         fx_ui_jiangli_loop.Play();
-                        Check.SetActive(false);
+                        GetWard.transform.RecoverColor();
+                      
                     }
                     //领了奖励
                     else if (towerLevelData != null && towerLevelData.reward)
                     {
                         Icon_Item.transform.parent.transform.RecoverColor();
                         fx_ui_jiangli_loop.gameObject.SetActive(false);
-                        Check.SetActive(true);
                         GetWard.transform.Gray();
                     }
                     //通关了但是没有完成时间
@@ -98,21 +99,21 @@ namespace Fort23.Mono
                     {
                         Icon_Item.transform.parent.transform.Gray();
                         fx_ui_jiangli_loop.gameObject.SetActive(false);
-                        Check.SetActive(false);
+                        GetWard.transform.RecoverColor();
                     }
                 }
                 else
                 {
                     Csc.ChangeState(1);
-                    Check.SetActive(false);
+                    GetWard.transform.RecoverColor();
                     fx_ui_jiangli_loop.gameObject.SetActive(false);
                 }
             }
             else
             {
                 isLock = false;
-                Csc.ChangeState(0);
-                Check.SetActive(false);
+                Csc.ChangeState(2);
+                GetWard.transform.RecoverColor();
                 fx_ui_jiangli_loop.gameObject.SetActive(false);
             }
         }