lzx 1 周之前
父節點
當前提交
e23dd91ba3

+ 4 - 4
Assets/Res/UI/MainHeroPanel/BtnFaBaoWidget.prefab

@@ -33,10 +33,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5438064346362230487}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -50}
-  m_SizeDelta: {x: 100, y: 100}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1573209486526979868
 CanvasRenderer:

+ 27 - 35
Assets/Res/UI/TowerPanel/TowerLevelWidget.prefab

@@ -148,7 +148,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.2688678, g: 0.22088155, b: 0.1382386, a: 1}
+  m_Color: {r: 0.2971697, g: 0.2348636, b: 0.12755865, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -521,12 +521,6 @@ MonoBehaviour:
       UIStateStrTypes: 00020000
       UIStateStrDatas:
       - dec_pata1
-    - Target: {fileID: 1907315793479001684}
-      UIStateV4Types: 04000000
-      UIStateV4Datas:
-      - {x: 0, y: 0, z: 0, w: 0}
-      UIStateStrTypes: 
-      UIStateStrDatas: []
   - StateInfos:
     - Target: {fileID: 68852666246476557}
       UIStateV4Types: 80000000
@@ -540,12 +534,6 @@ MonoBehaviour:
       UIStateStrTypes: 00020000
       UIStateStrDatas:
       - dec_pata2
-    - Target: {fileID: 1907315793479001684}
-      UIStateV4Types: 04000000
-      UIStateV4Datas:
-      - {x: 1, y: 0, z: 0, w: 0}
-      UIStateStrTypes: 
-      UIStateStrDatas: []
   - StateInfos:
     - Target: {fileID: 68852666246476557}
       UIStateV4Types: 80000000
@@ -559,18 +547,11 @@ MonoBehaviour:
       UIStateStrTypes: 00020000
       UIStateStrDatas:
       - dec_pata2
-    - Target: {fileID: 1907315793479001684}
-      UIStateV4Types: 04000000
-      UIStateV4Datas:
-      - {x: 0, y: 0, z: 0, w: 0}
-      UIStateStrTypes: 
-      UIStateStrDatas: []
   AllComs:
   - {fileID: 68852666246476557}
   - {fileID: 8557863631553482141}
-  - {fileID: 1907315793479001684}
-  AllComsStateTypes: 800000000002000004000000
-  CurrIndex: 1
+  AllComsStateTypes: 8000000000020000
+  CurrIndex: 0
 --- !u!1 &5056323184129357005
 GameObject:
   m_ObjectHideFlags: 0
@@ -793,6 +774,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: fx_ui_jiangli_loop
+    gameObject: {fileID: 6885621150441100512}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &3021692770897754924
 MonoBehaviour:
@@ -1048,7 +1034,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_pata2
+  _icon_name: dec_pata1
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -1071,7 +1057,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 2321549357837596874, guid: 325dda948a0c2de4881e1ff311b7705f, type: 3}
       propertyPath: m_Enabled
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2321549357837596874, guid: 325dda948a0c2de4881e1ff311b7705f, type: 3}
       propertyPath: m_SortingLayer
@@ -1083,11 +1069,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2894188878920519018, guid: 325dda948a0c2de4881e1ff311b7705f, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7336463706347282653, guid: 325dda948a0c2de4881e1ff311b7705f, type: 3}
       propertyPath: m_Enabled
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7336463706347282653, guid: 325dda948a0c2de4881e1ff311b7705f, type: 3}
       propertyPath: m_SortingLayer
@@ -1127,15 +1113,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7673764411000712998, guid: 325dda948a0c2de4881e1ff311b7705f, type: 3}
       propertyPath: m_LocalScale.x
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7673764411000712998, guid: 325dda948a0c2de4881e1ff311b7705f, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7673764411000712998, guid: 325dda948a0c2de4881e1ff311b7705f, type: 3}
       propertyPath: m_LocalScale.z
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7673764411000712998, guid: 325dda948a0c2de4881e1ff311b7705f, type: 3}
       propertyPath: m_LocalPosition.x
@@ -1187,7 +1173,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8613304831804360173, guid: 325dda948a0c2de4881e1ff311b7705f, type: 3}
       propertyPath: m_Enabled
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8613304831804360173, guid: 325dda948a0c2de4881e1ff311b7705f, type: 3}
       propertyPath: m_SortingLayer
@@ -1198,13 +1184,19 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 325dda948a0c2de4881e1ff311b7705f, type: 3}
---- !u!1 &1907315793479001684 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2894188878920519018, guid: 325dda948a0c2de4881e1ff311b7705f, type: 3}
-  m_PrefabInstance: {fileID: 3625992434090994494}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &6353643369952183320 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 7673764411000712998, guid: 325dda948a0c2de4881e1ff311b7705f, type: 3}
   m_PrefabInstance: {fileID: 3625992434090994494}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &6885621150441100512 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7916412372960034782, guid: 325dda948a0c2de4881e1ff311b7705f, type: 3}
+  m_PrefabInstance: {fileID: 3625992434090994494}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

+ 2 - 0
Assets/Scripts/GameUI/UI/MainHeroPnael/BtnFaBaoWidget.cs

@@ -1,4 +1,5 @@
 using GameLogic.Hero;
+using UnityEngine;
 
 namespace Fort23.Mono
 {
@@ -34,6 +35,7 @@ namespace Fort23.Mono
             {
                 faBaoWidget = await UIManager.Instance.CreateGComponent<FaBaoWidget>(null, FaBaoRoot);
                 faBaoWidget.CustomInit(faBaoInfo, false);
+                faBaoWidget.transform.anchoredPosition = Vector2.zero;
             }
             else
             {

+ 8 - 8
Assets/Scripts/GameUI/UI/TowerPanel/TowerLevelWidget.cs

@@ -76,20 +76,20 @@ namespace Fort23.Mono
                 if (towerLevelData != null && towerLevelData.finish)
                 {
                     Csc.ChangeState(2);
-                    // DianianCsc.ChangeState(0);
 
                     //可以领取奖励
                     if (towerLevelData != null && !towerLevelData.reward)
                     {
                         Icon_Item.transform.parent.transform.RecoverColor();
-                        // awardCsc.ChangeState(1);
+                        fx_ui_jiangli_loop.gameObject.SetActive(true);
+                        fx_ui_jiangli_loop.Play();
                         Check.SetActive(false);
                     }
                     //领了奖励
                     else if (towerLevelData != null && towerLevelData.reward)
                     {
                         Icon_Item.transform.parent.transform.RecoverColor();
-                        // awardCsc.ChangeState(0);
+                        fx_ui_jiangli_loop.gameObject.SetActive(false);
                         Check.SetActive(true);
                         GetWard.transform.Gray();
                     }
@@ -97,23 +97,23 @@ namespace Fort23.Mono
                     else
                     {
                         Icon_Item.transform.parent.transform.Gray();
-                        // awardCsc.ChangeState(0);
+                        fx_ui_jiangli_loop.gameObject.SetActive(false);
                         Check.SetActive(false);
                     }
                 }
                 else
                 {
                     Csc.ChangeState(1);
-                    // awardCsc.ChangeState(0);
-                    // DianianCsc.ChangeState(1);
+                    Check.SetActive(false);
+                    fx_ui_jiangli_loop.gameObject.SetActive(false);
                 }
             }
             else
             {
                 isLock = false;
-                // awardCsc.ChangeState(0);
                 Csc.ChangeState(0);
-                // DianianCsc.ChangeState(2);
+                Check.SetActive(false);
+                fx_ui_jiangli_loop.gameObject.SetActive(false);
             }
         }
     }

+ 13 - 0
Assets/Scripts/GameUI/UI/TowerPanel/TowerLevelWidgetData.cs

@@ -3,6 +3,8 @@ using Fort23.UTool;
 using UnityEngine.UI;
 using UnityEngine;
 using System.Collections.Generic;
+using Coffee.UIExtensions;
+
 namespace Fort23.Mono
 {
 	public partial class TowerLevelWidget 
@@ -107,6 +109,17 @@ namespace Fort23.Mono
 	      return _GetWard;
 	     }
 	   }
+	  private UIParticle _fx_ui_jiangli_loop;
+	  public UIParticle fx_ui_jiangli_loop
+	   {
+	   get{
+	      if (_fx_ui_jiangli_loop == null)
+	       {
+	         _fx_ui_jiangli_loop  = GetUIUnit<UIParticle>("fx_ui_jiangli_loop"); 
+	       }
+	      return _fx_ui_jiangli_loop;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{