Browse Source

茶艺特效

zhaoyang 2 years ago
parent
commit
35e5525765
33 changed files with 212 additions and 256 deletions
  1. 28 0
      FGUIProject/assets/League/ComSkillUp.xml
  2. 3 1
      FGUIProject/assets/League/LeagueSkillUI.xml
  3. 17 24
      FGUIProject/assets/League/LeagueSkillUpUI.xml
  4. 1 1
      FGUIProject/assets/League/ListSkillScore.xml
  5. 1 1
      FGUIProject/assets/League/components/ListSkillItem.xml
  6. 1 1
      FGUIProject/assets/League/components/ListSkillLayerItem.xml
  7. 1 0
      FGUIProject/assets/League/package.xml
  8. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComSkillUp.cs
  9. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComSkillUp.cs.meta
  10. 19 12
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueSkillUpUI.cs
  11. 49 23
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs
  12. 1 1
      GameClient/Assets/Game/HotUpdate/Views/ViewGlobal.cs
  13. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0!a.png
  14. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0.png
  15. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png
  16. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1.png
  17. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png
  18. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_2.png
  19. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_4!a.png
  20. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_4.png
  21. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_5!a.png
  22. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_5.png
  23. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_6!a.png
  24. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_6.png
  25. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_7!a.png
  26. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_7.png
  27. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png
  28. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_8.png
  29. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_9!a.png
  30. 0 96
      GameClient/Assets/ResIn/UI/League/League_atlas0_9!a.png.meta
  31. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_9.png
  32. 0 96
      GameClient/Assets/ResIn/UI/League/League_atlas0_9.png.meta
  33. BIN
      GameClient/Assets/ResIn/UI/League/League_fui.bytes

+ 28 - 0
FGUIProject/assets/League/ComSkillUp.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1035,1085">
+  <displayList>
+    <list id="n4_pvb4" name="listScore" xy="84,981" size="868,104" group="n21_idkd" layout="row" overflow="scroll" colGap="20" defaultItem="ui://tw70qm9dmiy37v" align="center" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n13_pvb4" name="list" xy="148,0" size="740,676" group="n21_idkd" layout="pagination" overflow="scroll" scroll="horizontal" scrollBarFlags="136" lineItemCount2="4" defaultItem="ui://tw70qm9dpvb45f" align="center">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n18_miy3" name="btnLeft" src="miy37w" fileName="Button124.xml" xy="0,338" pivot="0.5,0.5" group="n21_idkd" scale="-1,1"/>
+    <component id="n19_miy3" name="btnRight" src="miy37w" fileName="Button124.xml" xy="902,335" pivot="0.5,0.5" group="n21_idkd"/>
+    <group id="n21_idkd" name="n21" xy="0,0" size="1035,1085" advanced="true"/>
+  </displayList>
+</component>

+ 3 - 1
FGUIProject/assets/League/LeagueSkillUI.xml

@@ -4,7 +4,9 @@
     <loader id="n0_pvb4" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <image id="n15_miy3" name="n15" src="9jv65o" fileName="images/lm_fl_db.png" xy="-31,21" size="1144,1898"/>
+    <image id="n15_miy3" name="n15" src="9jv65o" fileName="images/lm_fl_db.png" xy="-31,21" size="1144,1898">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
     <image id="n16_miy3" name="n16" src="miy37f" fileName="images/lm_ch_zsx.png" xy="67,243"/>
     <component id="n3_pvb4" name="comValue" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,13"/>
     <component id="n1_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">

+ 17 - 24
FGUIProject/assets/League/LeagueSkillUpUI.xml

@@ -4,35 +4,28 @@
     <loader id="n0_pvb4" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <image id="n16_miy3" name="n16" src="miy37p" fileName="images/lm_ch_btk.png" xy="143,246"/>
-    <image id="n17_miy3" name="n17" src="miy37q" fileName="images/ch_jn_db.png" xy="0,314"/>
     <component id="n3_pvb4" name="comValue" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,13"/>
     <component id="n1_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <list id="n4_pvb4" name="listScore" xy="106,1498" size="868,104" layout="row" overflow="scroll" colGap="20" defaultItem="ui://tw70qm9dmiy37v" align="center" autoClearItems="true">
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <list id="n13_pvb4" name="list" xy="170,517" size="740,676" layout="pagination" overflow="scroll" scroll="horizontal" scrollBarFlags="136" lineItemCount2="4" defaultItem="ui://tw70qm9dpvb45f" align="center">
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
+    <image id="n16_miy3" name="n16" src="miy37p" fileName="images/lm_ch_btk.png" xy="143,246"/>
     <text id="n14_miy3" name="txtTitle" xy="448,251" pivot="0.5,0.5" size="184,56" font="ui://eg2y0ldpa0cftky" fontSize="42" color="#fffefa" align="center" vAlign="middle" leading="-5" autoClearText="true" text="茶艺-选茶"/>
     <text id="n15_miy3" name="txtProgress" xy="469,324" pivot="0.5,0" size="142,54" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#c3c8d8" align="center" ubb="true" vars="true" text="进度:[color=#FFE59D]{value=0}%[/color]"/>
-    <component id="n18_miy3" name="btnLeft" src="miy37w" fileName="Button124.xml" xy="22,855" pivot="0.5,0.5" scale="-1,1"/>
-    <component id="n19_miy3" name="btnRight" src="miy37w" fileName="Button124.xml" xy="924,852" pivot="0.5,0.5"/>
+    <graph id="n20_idkd" name="holder" xy="540,963" size="10,10" visible="false"/>
+    <component id="n4_pvb4" name="comSkill" src="idkd80" fileName="ComSkillUp.xml" xy="22,517"/>
+    <graph id="n22_idkd" name="holderSkill" xy="486,874" size="10,10" visible="false"/>
+    <graph id="n23_idkd" name="holderScore" xy="486,874" size="10,10" visible="false"/>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n4_pvb4" value="0"/>
+    <item time="0" type="Visible" target="n20_idkd" value="true"/>
+    <item time="6" type="Alpha" target="n4_pvb4" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
+    <item time="18" type="Alpha" target="n4_pvb4" value="1"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Visible" target="n22_idkd" value="true"/>
+    <item time="0" type="Visible" target="n23_idkd" value="true"/>
+    <item time="36" type="Visible" target="n22_idkd" value="false"/>
+    <item time="36" type="Visible" target="n23_idkd" value="false"/>
+  </transition>
 </component>

+ 1 - 1
FGUIProject/assets/League/ListSkillScore.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="120,108">
+<component size="120,108" pivot="0.5,0.5">
   <displayList>
     <image id="n13_miy3" name="n13" src="miy37d" fileName="images/card_jn_db.png" xy="0,0"/>
     <loader id="n12_miy3" name="loaIcon" xy="10,10" size="88,88" aspect="true" url="ui://eg2y0ldp842s6h" fill="scale"/>

+ 1 - 1
FGUIProject/assets/League/components/ListSkillItem.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="162,162" overflow="hidden">
+<component size="162,162" pivot="0.5,0.5" overflow="hidden">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n16_gfx4" name="n16" src="miy37n" fileName="images/lm_ch_dldb.png" xy="0,0" pivot="0.5,0"/>

+ 1 - 1
FGUIProject/assets/League/components/ListSkillLayerItem.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="740,165" overflow="hidden">
   <displayList>
-    <list id="n14_pvb4" name="listSkill" xy="0,0" size="740,165" layout="row" colGap="100" defaultItem="ui://tw70qm9dpvb45d" align="center">
+    <list id="n14_pvb4" name="listSkill" xy="0,0" size="740,165" layout="row" colGap="100" defaultItem="ui://tw70qm9dpvb45d" align="center" vAlign="middle">
       <relation target="" sidePair="center-center"/>
       <item/>
       <item/>

+ 1 - 0
FGUIProject/assets/League/package.xml

@@ -200,6 +200,7 @@
     <image id="l5007x" name="tb_suo_gold.png" path="/images/"/>
     <image id="l5007y" name="yj_db_zz.png" path="/images/"/>
     <image id="l5007z" name="yj_zz.png" path="/images/"/>
+    <component id="idkd80" name="ComSkillUp.xml" path="/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComSkillUp.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_ComSkillUp
+    {
+        public GComponent target;
+        public GList m_listScore;
+        public GList m_list;
+        public GButton m_btnLeft;
+        public GButton m_btnRight;
+        public const string URL = "ui://tw70qm9didkd80";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ComSkillUp";
+        private static UI_ComSkillUp _proxy;
+
+        public static UI_ComSkillUp Create(GObject gObject = null)
+        {
+            var ui = new UI_ComSkillUp();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComSkillUp Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComSkillUp();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_listScore = (GList)comp.GetChild("listScore");
+            m_list = (GList)comp.GetChild("list");
+            m_btnLeft = (GButton)comp.GetChild("btnLeft");
+            m_btnRight = (GButton)comp.GetChild("btnRight");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_listScore = null;
+            m_list = null;
+            m_btnLeft = null;
+            m_btnRight = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComSkillUp.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cc7af52bef82a7d4d95d91a8cab77d77
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 19 - 12
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueSkillUpUI.cs

@@ -10,12 +10,14 @@ namespace UI.League
         public GLoader m_loaBg;
         public GComponent m_comValue;
         public GButton m_btnBack;
-        public GList m_listScore;
-        public GList m_list;
         public GTextField m_txtTitle;
         public GTextField m_txtProgress;
-        public GButton m_btnLeft;
-        public GButton m_btnRight;
+        public GGraph m_holder;
+        public UI_ComSkillUp m_comSkill;
+        public GGraph m_holderSkill;
+        public GGraph m_holderScore;
+        public Transition m_t0;
+        public Transition m_t1;
         public const string URL = "ui://tw70qm9dpvb45c";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueSkillUpUI";
@@ -66,24 +68,29 @@ namespace UI.League
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_comValue = (GComponent)comp.GetChild("comValue");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_listScore = (GList)comp.GetChild("listScore");
-            m_list = (GList)comp.GetChild("list");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtProgress = (GTextField)comp.GetChild("txtProgress");
-            m_btnLeft = (GButton)comp.GetChild("btnLeft");
-            m_btnRight = (GButton)comp.GetChild("btnRight");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_comSkill = (UI_ComSkillUp)UI_ComSkillUp.Create(comp.GetChild("comSkill"));
+            m_holderSkill = (GGraph)comp.GetChild("holderSkill");
+            m_holderScore = (GGraph)comp.GetChild("holderScore");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_comValue = null;
             m_btnBack = null;
-            m_listScore = null;
-            m_list = null;
             m_txtTitle = null;
             m_txtProgress = null;
-            m_btnLeft = null;
-            m_btnRight = null;
+            m_holder = null;
+            m_comSkill.Dispose();
+            m_comSkill = null;
+            m_holderSkill = null;
+            m_holderScore = null;
+            m_t0 = null;
+            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 49 - 23
GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs

@@ -13,10 +13,19 @@ namespace GFGGame
     {
         private UI_LeagueSkillUpUI _ui;
         private ValueBarController _valueBarController;
+        private GameObject _gameObject0;
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GoWrapper _wrapper0;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
         private int _pageCount;
         private int _type;
         public override void Dispose()
         {
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
             if (_valueBarController != null)
             {
                 _valueBarController.Dispose();
@@ -39,16 +48,23 @@ namespace GFGGame
             isfullScreen = true;
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
-            _ui.m_listScore.itemRenderer = RenderListScoreItem;
-            _ui.m_list.itemRenderer = RenderListItem;
-            _ui.m_list.SetVirtual();
-            _ui.m_list.scrollPane.decelerationRate = 0.8f;
-            _ui.m_btnLeft.onClick.Add(OnBtnLeftClick);
-            _ui.m_btnRight.onClick.Add(OnBtnRightClick);
+            _ui.m_comSkill.m_listScore.itemRenderer = RenderListScoreItem;
+            _ui.m_comSkill.m_list.itemRenderer = RenderListItem;
+            _ui.m_comSkill.m_list.SetVirtual();
+            _ui.m_comSkill.m_list.scrollPane.decelerationRate = 0.8f;
+            _ui.m_comSkill.m_btnLeft.onClick.Add(OnBtnLeftClick);
+            _ui.m_comSkill.m_btnRight.onClick.Add(OnBtnRightClick);
 
             _valueBarController = new ValueBarController(_ui.m_comValue);
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_ch_jnbg");
+
+            string resPath = ResPathUtil.GetViewEffectPath("ui_league", "TEA");
+            SceneController.AddObjectToView(null, null, _ui.m_holder, resPath, out _gameObject0, out _wrapper0);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_league", "tea_unlock");
+            SceneController.AddObjectToView(null, null, _ui.m_holderSkill, resPath1, out _gameObject1, out _wrapper1);
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_league", "tea_unlock");
+            SceneController.AddObjectToView(null, null, _ui.m_holderScore, resPath2, out _gameObject2, out _wrapper2, 90);
         }
         protected override void AddEventListener()
         {
@@ -61,8 +77,8 @@ namespace GFGGame
             _type = (int)this.viewData;
             _valueBarController.OnShown();
             _valueBarController.Controller(11);
-            _ui.m_list.numItems = LeagueSkillCountCfgArray.Instance.GetCfg(_type).layerCount;
-
+            _ui.m_comSkill.m_list.numItems = LeagueSkillCountCfgArray.Instance.GetCfg(_type).layerCount;
+            _ui.m_t0.Play();
             UpdateView();
         }
 
@@ -70,7 +86,9 @@ namespace GFGGame
         {
             base.OnHide();
             _valueBarController.OnHide();
-            if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
+            if (_ui.m_comSkill.m_list.numItems > 0) _ui.m_comSkill.m_list.ScrollToView(0);
+            _ui.m_t0.Stop();
+            _ui.m_t1.Stop();
         }
 
         protected override void RemoveEventListener()
@@ -85,21 +103,21 @@ namespace GFGGame
         }
         private void OnBtnRightClick()
         {
-            int index = _ui.m_list.GetFirstChildInView();
-            int curPage = index / _ui.m_list.lineCount;
+            int index = _ui.m_comSkill.m_list.GetFirstChildInView();
+            int curPage = index / _ui.m_comSkill.m_list.lineCount;
             int nextPage = curPage + 1;
-            if (nextPage * _ui.m_list.lineCount > _ui.m_list.numItems - 1) return;
-            _ui.m_list.ScrollToView(nextPage * _ui.m_list.lineCount, true);
+            if (nextPage * _ui.m_comSkill.m_list.lineCount > _ui.m_comSkill.m_list.numItems - 1) return;
+            _ui.m_comSkill.m_list.ScrollToView(nextPage * _ui.m_comSkill.m_list.lineCount, true);
             Debug.Log("curPage:" + nextPage);
 
         }
         private void OnBtnLeftClick()
         {
-            int index = _ui.m_list.GetFirstChildInView();
-            int curPage = index / _ui.m_list.lineCount;
+            int index = _ui.m_comSkill.m_list.GetFirstChildInView();
+            int curPage = index / _ui.m_comSkill.m_list.lineCount;
             int lastPage = curPage - 1;
-            if (lastPage * _ui.m_list.lineCount < 0) return;
-            _ui.m_list.ScrollToView(lastPage * _ui.m_list.lineCount, true);
+            if (lastPage * _ui.m_comSkill.m_list.lineCount < 0) return;
+            _ui.m_comSkill.m_list.ScrollToView(lastPage * _ui.m_comSkill.m_list.lineCount, true);
             Debug.Log("curPage:" + lastPage);
 
         }
@@ -107,9 +125,9 @@ namespace GFGGame
         {
             if (LeagueDataManager.Instance.GetSkillProgressByType(_type) < 100 && LeagueDataManager.Instance.GetSkillProgressByType(_type) > 0)
             {
-                if (LeagueDataManager.Instance.CurLayer == _ui.m_list.numItems)
+                if (LeagueDataManager.Instance.CurLayer == _ui.m_comSkill.m_list.numItems)
                 {
-                    _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);
+                    _ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);
                 }
                 else
                 {
@@ -125,17 +143,17 @@ namespace GFGGame
                     }
                     if (isActive)
                     {
-                        _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer);
+                        _ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer);
                     }
                     else
                     {
-                        _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);
+                        _ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);
                     }
                 }
                 // _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);
             }
-            _ui.m_listScore.numItems = 4;
-            _ui.m_list.RefreshVirtualList();
+            _ui.m_comSkill.m_listScore.numItems = 4;
+            _ui.m_comSkill.m_list.RefreshVirtualList();
             _ui.m_txtTitle.text = "茶艺-" + LeagueSkillCountCfgArray.Instance.GetCfg(_type).name;
             double progress = LeagueDataManager.Instance.GetSkillProgressByType(_type);
             _ui.m_txtProgress.SetVar("value", progress.ToString()).FlushVars();
@@ -215,6 +233,14 @@ namespace GFGGame
             bool result = await SkillSProxy.ReqActiveSkill(SkillType.LeagueSkill, skillId);
             if (result)
             {
+                Vector2 posInSkill = obj.TransformPoint(new Vector2(obj.width / 2, obj.height / 2), _ui.target);
+                _ui.m_holderSkill.position = posInSkill;
+
+                GObject scoreObj = _ui.m_comSkill.m_listScore.GetChildAt(skillCfg.score - 1);
+                Vector2 posInScore = scoreObj.TransformPoint(new Vector2(scoreObj.width / 2, scoreObj.height / 2), _ui.target);
+                _ui.m_holderScore.position = posInScore;
+
+                _ui.m_t1.Play();
                 UpdateView();
             }
         }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ViewGlobal.cs

@@ -19,7 +19,7 @@ namespace GFGGame
                 ViewManager.AddChildToFloatLayer(comHolder.target);
                 comHolder.target.SetPosition(-100, -100, 0);
 
-                string resPath = ResPathUtil.GetViewEffectPath("ui_dj", "ui_dj");
+                string resPath = ResPathUtil.GetViewEffectPath("ui_dj", "DJ");
                 SceneController.AddObjectToView(_gameObj, _wrapper, comHolder.m_holder, resPath, out _gameObj, out _wrapper);
 
                 GRoot.inst.onTouchBegin.Add(SetClickPos);

BIN
GameClient/Assets/ResIn/UI/League/League_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_4!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_5.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_6!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_6.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_7!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_7.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_8.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_9!a.png


+ 0 - 96
GameClient/Assets/ResIn/UI/League/League_atlas0_9!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 7995c9f0beb000b4b849a516b4928fb9
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_9.png


+ 0 - 96
GameClient/Assets/ResIn/UI/League/League_atlas0_9.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: c4beae15429d4d147989297e88c6ea68
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/League/League_fui.bytes