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.9895201
+    - _Alpha: 0.0012691617
     - _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.9541826
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Res/UI/BattleSettlementPanel.prefab

@@ -293,6 +293,7 @@ GameObject:
   - component: {fileID: 6318358308651211038}
   - component: {fileID: 2609827546376049157}
   - component: {fileID: 3475133236629777593}
+  - component: {fileID: 526914427563340992}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_cxtz
@@ -300,7 +301,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6766092608426705305
 RectTransform:
   m_ObjectHideFlags: 0
@@ -384,6 +385,50 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!114 &526914427563340992
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1862396927629131563}
+  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: 2609827546376049157}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &2696130358514886593
 GameObject:
   m_ObjectHideFlags: 0
@@ -402,7 +447,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &9138207573109554942
 RectTransform:
   m_ObjectHideFlags: 0
@@ -582,7 +627,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 25}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &4603564870567916663
 MonoBehaviour:
@@ -1639,6 +1684,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_cxtz
+    gameObject: {fileID: 526914427563340992}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &7117668935224744481
 GameObject:
@@ -1984,7 +2034,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -170.6539, y: -152.58527}
+  m_AnchoredPosition: {x: 0, y: -152.58527}
   m_SizeDelta: {x: 222.7944, y: 61.739}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &33079179799988925

Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab

@@ -2379,7 +2379,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  id: 10232
+  id: 10450
 --- !u!1 &4243376540668156147
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanel.cs

@@ -39,6 +39,11 @@ namespace Fort23.Mono
                 callBack?.Invoke();
                 callBack = null;
             });
+            
+            Btn_cxtz.onClick.AddListener(() =>
+            {
+                
+            });
         }
 
         public async void CustomInit(bool isWin, System.Action callBack)
@@ -51,9 +56,6 @@ namespace Fort23.Mono
                 AudioManager.Instance.PlayAudio("combat_win.wav");
                 WinRoot.SetActive(true);
                 FailRoot.SetActive(false);
-                // f
-                // Text_Desc.gameObject.SetActive(false);
-                // Text_Settlement.text = "胜利";
             }
             else
             {
@@ -61,15 +63,6 @@ namespace Fort23.Mono
                 AudioManager.Instance.PlayAudio("shibai.wav");
                 WinRoot.SetActive(false);
                 FailRoot.SetActive(true);
-
-                // SkipToWidget skipToWidget =
-                //     await UIManager.Instance.CreateGComponentForObject<SkipToWidget>(SkipToWidgetGam, null,
-                //         SkipToContent);
-                // skipToWidget.CustonInit(1);
-                // skipToWidgets.Add(skipToWidget);
-                // skipToWidget.OnClick = OnClick;
-                // Text_Desc.gameObject.SetActive(true);
-                // Text_Settlement.text = "失败";
             }
         }
 

Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanelData.cs

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