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.14322487
+    - _MainTexOffsetV: -0.3
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5

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.10230732
+    - _Alpha: 0.16710803
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _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.22741568
+    - _Alpha: 0.25927776
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.17961335
+    - _MainTexOffsetU: 0.1433127
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -1217,6 +1217,15 @@ MonoBehaviour:
     - gameObject: {fileID: 4649527201698735611}
     - gameObject: {fileID: 6899362910355405383}
     - gameObject: {fileID: 2266735464070336714}
+  - key: Btn_UpGradeOkLongPress
+    gameObject: {fileID: 8781498258286952923}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
   isAssetBundle: 1
 --- !u!1 &2864693667708896535
 GameObject:
@@ -4939,6 +4948,9 @@ PrefabInstance:
     - {fileID: 353489762227060455, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
     m_AddedGameObjects: []
     m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 6681106713277912565, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 8781498258286952923}
     - targetCorrespondingSourceObject: {fileID: 2289986991244638643, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       insertIndex: -1
       addedObject: {fileID: 7346192043931465632}
@@ -5007,7 +5019,7 @@ MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1114264307383380045, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
   m_PrefabInstance: {fileID: 1997473576992753959}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
+  m_GameObject: {fileID: 5116226112120790226}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
@@ -5018,6 +5030,26 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
   m_PrefabInstance: {fileID: 1997473576992753959}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &5116226112120790226 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6681106713277912565, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+  m_PrefabInstance: {fileID: 1997473576992753959}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &8781498258286952923
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5116226112120790226}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b2313d4d59614a4aa1c04a1a07b28213, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  startTime: 0.5
+  intervalTime: 0.05
+  isPressd: 0
 --- !u!1001 &2049131876637579995
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -150,6 +150,11 @@ namespace GameLogic.Hero
         public void ComputeHeroInfo()
         {
             attributeBlValue.Clear();
+            Metal = 100;
+            Wood = 100;
+            Water = 100;
+            Fire = 100;
+            Earth = 100;
             CalAttribute();
 
             GetDaoLvBl();

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

@@ -73,6 +73,8 @@ namespace Fort23.Mono
 
             Btn_UpStar.onClick.AddListener(() => { UpStarClick(); });
             Btn_UpStarOk.onClick.AddListener(() => { UpStarClick(); });
+
+            Btn_UpGradeOkLongPress.longPress = () => { UpgradeClick(); };
         }
 
         private void UpStarClick()

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

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