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

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -831,6 +831,159 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2643577657068640080}
   m_CullTransparentMesh: 1
+--- !u!1 &2679299554753557332
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1737448580674146482}
+  - component: {fileID: 661607412772170253}
+  - component: {fileID: 4480866929502877836}
+  - component: {fileID: 3386890817598155822}
+  - component: {fileID: 1199107481916881420}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Quality
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1737448580674146482
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2679299554753557332}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1062516556747891371}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -9, y: -8}
+  m_SizeDelta: {x: 0, y: 71.377686}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &661607412772170253
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2679299554753557332}
+  m_CullTransparentMesh: 1
+--- !u!114 &4480866929502877836
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2679299554753557332}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.59607846, g: 0.3647059, b: 0.90196085, 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_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 37
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 5
+    m_MaxSize: 76
+    m_Alignment: 8
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7532\u7EA7"
+--- !u!114 &3386890817598155822
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2679299554753557332}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &1199107481916881420
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2679299554753557332}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef7878ea2dacc454894d556c1d97bca0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - StateInfos:
+    - Target: {fileID: 2679299554753557332}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.32156864, y: 0.6313726, z: 0.80784315, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 4731082921620160257}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.32156864, y: 0.6313726, z: 0.80784315, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 2679299554753557332}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.59607846, y: 0.3647059, z: 0.90196085, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 4731082921620160257}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.59607846, y: 0.3647059, z: 0.9019608, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 2679299554753557332}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.8431373, y: 0.45882356, z: 0.32156864, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 4731082921620160257}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.84313726, y: 0.45882353, z: 0.32156864, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  AllComs:
+  - {fileID: 2679299554753557332}
+  - {fileID: 4731082921620160257}
+  AllComsStateTypes: 8000000080000000
+  CurrIndex: 1
 --- !u!1 &2841900498943777658
 GameObject:
   m_ObjectHideFlags: 0
@@ -1234,6 +1387,24 @@ MonoBehaviour:
     - gameObject: {fileID: 4649527201698735611}
     - gameObject: {fileID: 6899362910355405383}
     - gameObject: {fileID: 2266735464070336714}
+  - key: Text_Quality
+    gameObject: {fileID: 4480866929502877836}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
+  - key: QualityCsc
+    gameObject: {fileID: 1199107481916881420}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
   isAssetBundle: 1
 --- !u!1 &2864693667708896535
 GameObject:
@@ -1773,7 +1944,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.37254903, g: 0.1137255, b: 0.027450982, a: 1}
+  m_Color: {r: 0.59607846, g: 0.3647059, b: 0.9019608, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2639,7 +2810,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9803922, g: 0.43921572, b: 0.4431373, a: 1}
+  m_Color: {r: 0.8235294, g: 0.23137255, b: 0.8980392, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3572,7 +3743,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9803922, g: 0.43921572, b: 0.4431373, a: 1}
+  m_Color: {r: 0.8233183, g: 0.2325116, b: 0.8962264, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3816,6 +3987,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 1737448580674146482}
   - {fileID: 5142448662693722814}
   - {fileID: 7374263567999719867}
   - {fileID: 7957023652684022640}
@@ -3955,11 +4127,24 @@ MonoBehaviour:
       - {x: 0.68235296, y: 0.58431375, z: 0.4901961, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 7313999456231797816}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.8233183, y: 0.2325116, z: 0.8962264, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 5830136030932177828}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.8235294, y: 0.23137255, z: 0.8980392, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
   AllComs:
   - {fileID: 7313999456231797816}
   - {fileID: 5830136030932177828}
   AllComsStateTypes: 4000000040000000
-  CurrIndex: 3
+  CurrIndex: 5
 --- !u!1 &9037322324124605775
 GameObject:
   m_ObjectHideFlags: 0
@@ -5636,6 +5821,10 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 3463779066689076305, guid: f74072bbef8daf94f9dbb1f7e5833453, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5736098756703481896, guid: f74072bbef8daf94f9dbb1f7e5833453, type: 3}
       propertyPath: m_Name
       value: fx_ui_gongfa_shengji
@@ -5648,10 +5837,18 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 8186051112788896574, guid: f74072bbef8daf94f9dbb1f7e5833453, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8603636847010368685, guid: f74072bbef8daf94f9dbb1f7e5833453, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 8603636847010368685, guid: f74072bbef8daf94f9dbb1f7e5833453, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Res/UI/SkillSelectPanel/SkillWidget.prefab

@@ -315,10 +315,17 @@ MonoBehaviour:
       - {x: 0.6745281, y: 0.6083005, z: 0.47089696, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 4044849639734904529}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.8235294, y: 0.23137255, z: 0.8980392, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
   AllComs:
   - {fileID: 4044849639734904529}
   AllComsStateTypes: 40000000
-  CurrIndex: 0
+  CurrIndex: 5
 --- !u!1 &1269921678863901166
 GameObject:
   m_ObjectHideFlags: 0
@@ -989,7 +996,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9481131, g: 0.81000423, b: 0.15205573, a: 1}
+  m_Color: {r: 0.8235294, g: 0.23137255, b: 0.8980392, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Scripts/GameUI/UI/CombatPanel/SkillWidget.cs

@@ -89,6 +89,13 @@ namespace Fort23.Mono
             {
                 ShuXingCsc.ChangeState(4);
             }
+            
+            //土
+            if (skillConfigId.skillConfig.attribute == 0)
+            {
+                ShuXingCsc.ChangeState(5);
+            }
+       
 
 
             // for (var i = 0; i < StarRoot.Count; i++)

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

@@ -128,6 +128,7 @@ namespace Fort23.Mono
                     break;
                 }
             }
+
             AudioManager.Instance.PlayAudio("ui_tycg.wav");
             AccountFileInfo.Instance.SavePlayerData();
         }
@@ -212,6 +213,25 @@ namespace Fort23.Mono
 
             Text_SkillCd.text = LanguageManager.Instance.Text(10208, skillConfig.addcd);
 
+            ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(skillConfig.PieceID);
+
+            if (itemConfig.quality == 3)
+            {
+                QualityCsc.ChangeState(0);
+                
+                Text_Quality.text = LanguageManager.Instance.Text(10795);
+            }
+            else if (itemConfig.quality == 4)
+            {
+                QualityCsc.ChangeState(1);
+                Text_Quality.text = LanguageManager.Instance.Text(10796);
+            }
+            else if (itemConfig.quality == 5)
+            {
+                QualityCsc.ChangeState(2);
+                Text_Quality.text = LanguageManager.Instance.Text(10797);
+            }
+
             // skillConstant = ConfigComponent.Instance.Get<SkillConstant>(1);
 
 
@@ -246,6 +266,11 @@ namespace Fort23.Mono
                     csc.ChangeState(4);
                     Icon_Attribute.icon_name = "dec_tu2";
                     break;
+                
+                case 0:
+                    csc.ChangeState(5);
+                    Icon_Attribute.icon_name = "dec_tu2";
+                    break;
             }
 
             for (var i = 0; i < StarRoot.Count; i++)

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

@@ -318,6 +318,28 @@ namespace Fort23.Mono
 	      return _RedDotComType02;
 	     }
 	   }
+	  private Text _Text_Quality;
+	  public Text Text_Quality
+	   {
+	   get{
+	      if (_Text_Quality == null)
+	       {
+	         _Text_Quality  = GetUIUnit<Text>("Text_Quality"); 
+	       }
+	      return _Text_Quality;
+	     }
+	   }
+	  private CustomStateController _QualityCsc;
+	  public CustomStateController QualityCsc
+	   {
+	   get{
+	      if (_QualityCsc == null)
+	       {
+	         _QualityCsc  = GetUIUnit<CustomStateController>("QualityCsc"); 
+	       }
+	      return _QualityCsc;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{