Bläddra i källkod

图鉴显示两个星星

huangxiaoyue 1 år sedan
förälder
incheckning
cc4886ac7e
50 ändrade filer med 65 tillägg och 535 borttagningar
  1. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComDodgeStar.cs.meta
  2. 8 12
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComFosterBottom.cs
  3. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCardMask.cs
  4. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCardMask.cs.meta
  5. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComDodgeStar.cs
  6. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComDodgeStar.cs.meta
  7. 6 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListCardItem.cs
  8. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListCardItem.cs.meta
  9. 0 77
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_CardGuideComDodgeStar.cs
  10. 0 71
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ComCardMask.cs
  11. 0 106
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ListCardGuideItem.cs
  12. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ListCardGuideItem.cs.meta
  13. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDodgeFightStar.cs
  14. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDodgeFightStar.cs.meta
  15. 15 15
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardFightItem.cs
  16. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardFightItem.cs.meta
  17. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardItem.cs.meta
  18. 6 4
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/CardGuideView.cs
  19. 4 4
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs
  20. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0!a.png
  21. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0.png
  22. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_1!a.png
  23. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_1.png
  24. BIN
      GameClient/Assets/ResIn/UI/Card/Card_fui.bytes
  25. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  26. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  27. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  28. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  29. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png
  30. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png
  31. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3!a.png
  32. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3.png
  33. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4!a.png
  34. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4.png
  35. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5!a.png
  36. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5.png
  37. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  38. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0!a.png
  39. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0.png
  40. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1!a.png
  41. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1.png
  42. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_2!a.png
  43. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_2.png
  44. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_3!a.png
  45. 0 96
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_3!a.png.meta
  46. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_3.png
  47. 0 96
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_3.png.meta
  48. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_fui.bytes
  49. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes
  50. 8 0
      GameClient/Assets/StreamingAssets/Bundles.meta

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComDodgeStar.cs.meta

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

+ 8 - 12
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComFosterBottom.cs

@@ -37,10 +37,10 @@ namespace UI.Card
         public GButton m_btnRule;
         public GButton m_btnCheckAuto;
         public UI_ComStarItem m_comStarItem;
-        public UI_ComDodgeStar m_dodgeStar0;
-        public UI_ComDodgeStar m_dodgeStar1;
-        public UI_ComDodgeStar m_dodgeStar2;
-        public UI_ComDodgeStar m_dodgeStar3;
+        public GComponent m_dodgeStar0;
+        public GComponent m_dodgeStar1;
+        public GComponent m_dodgeStar2;
+        public GComponent m_dodgeStar3;
         public GList m_listShowCard;
         public GGroup m_grpStar;
         public GList m_listSkill;
@@ -135,10 +135,10 @@ namespace UI.Card
             m_btnRule = (GButton)comp.GetChild("btnRule");
             m_btnCheckAuto = (GButton)comp.GetChild("btnCheckAuto");
             m_comStarItem = (UI_ComStarItem)UI_ComStarItem.Create(comp.GetChild("comStarItem"));
-            m_dodgeStar0 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar0"));
-            m_dodgeStar1 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar1"));
-            m_dodgeStar2 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar2"));
-            m_dodgeStar3 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar3"));
+            m_dodgeStar0 = (GComponent)comp.GetChild("dodgeStar0");
+            m_dodgeStar1 = (GComponent)comp.GetChild("dodgeStar1");
+            m_dodgeStar2 = (GComponent)comp.GetChild("dodgeStar2");
+            m_dodgeStar3 = (GComponent)comp.GetChild("dodgeStar3");
             m_listShowCard = (GList)comp.GetChild("listShowCard");
             m_grpStar = (GGroup)comp.GetChild("grpStar");
             m_listSkill = (GList)comp.GetChild("listSkill");
@@ -190,13 +190,9 @@ namespace UI.Card
             m_btnCheckAuto = null;
             m_comStarItem.Dispose();
             m_comStarItem = null;
-            m_dodgeStar0.Dispose();
             m_dodgeStar0 = null;
-            m_dodgeStar1.Dispose();
             m_dodgeStar1 = null;
-            m_dodgeStar2.Dispose();
             m_dodgeStar2 = null;
-            m_dodgeStar3.Dispose();
             m_dodgeStar3 = null;
             m_listShowCard = null;
             m_grpStar = null;

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComCardMask.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCardMask.cs

@@ -2,14 +2,14 @@
 
 using FairyGUI;
 
-namespace UI.Card
+namespace UI.CommonGame
 {
     public partial class UI_ComCardMask
     {
         public GComponent target;
         public GLoader m_loaCard;
-        public const string URL = "ui://7l6lvkayjzrr8n";
-        public const string PACKAGE_NAME = "Card";
+        public const string URL = "ui://eg2y0ldpjzrr8n";
+        public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComCardMask";
         private static UI_ComCardMask _proxy;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ComCardMask.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCardMask.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 90199ba5152ffee4d8e29452117cc5c4
+guid: b33d8b2d3d674424498ba79bbe292000
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComDodgeStar.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComDodgeStar.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Card
+namespace UI.CommonGame
 {
     public partial class UI_ComDodgeStar
     {
@@ -10,8 +10,8 @@ namespace UI.Card
         public Controller m_lightType;
         public GGraph m_holderStarLight;
         public GGraph m_holderUpStarMove;
-        public const string URL = "ui://7l6lvkaym6batls";
-        public const string PACKAGE_NAME = "Card";
+        public const string URL = "ui://eg2y0ldpm6batls";
+        public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComDodgeStar";
         private static UI_ComDodgeStar _proxy;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDodgeStar.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComDodgeStar.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 41d45960cdebe2249a524f1a969628f4
+guid: 1b65e5636e9da424bb0845644b769882
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 6 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ListCardItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListCardItem.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Card
+namespace UI.CommonGame
 {
     public partial class UI_ListCardItem
     {
@@ -18,8 +18,9 @@ namespace UI.Card
         public UI_ComDodgeStar m_dodgeStar1;
         public UI_ComDodgeStar m_dodgeStar2;
         public UI_ComDodgeStar m_dodgeStar3;
-        public const string URL = "ui://7l6lvkayojlzi";
-        public const string PACKAGE_NAME = "Card";
+        public GImage m_unlockMask;
+        public const string URL = "ui://eg2y0ldpojlzi";
+        public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ListCardItem";
         private static UI_ListCardItem _proxy;
 
@@ -76,6 +77,7 @@ namespace UI.Card
             m_dodgeStar1 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar1"));
             m_dodgeStar2 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar2"));
             m_dodgeStar3 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar3"));
+            m_unlockMask = (GImage)comp.GetChild("unlockMask");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -95,6 +97,7 @@ namespace UI.Card
             m_dodgeStar2 = null;
             m_dodgeStar3.Dispose();
             m_dodgeStar3 = null;
+            m_unlockMask = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ListCardItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListCardItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6a8067523248e34498eb792b8fe5490a
+guid: 0fcd49ee8f267d04883b1cf7aee7c180
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 77
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_CardGuideComDodgeStar.cs

@@ -1,77 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.FieldGuide
-{
-    public partial class UI_CardGuideComDodgeStar
-    {
-        public GComponent target;
-        public Controller m_lightType;
-        public GGraph m_holderStarLight;
-        public GGraph m_holderUpStarMove;
-        public const string URL = "ui://vqq9h9h493pb4j";
-        public const string PACKAGE_NAME = "FieldGuide";
-        public const string RES_NAME = "CardGuideComDodgeStar";
-        private static UI_CardGuideComDodgeStar _proxy;
-
-        public static UI_CardGuideComDodgeStar Create(GObject gObject = null)
-        {
-            var ui = new UI_CardGuideComDodgeStar();
-            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_CardGuideComDodgeStar Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_CardGuideComDodgeStar();
-            }
-            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_lightType = comp.GetController("lightType");
-            m_holderStarLight = (GGraph)comp.GetChild("holderStarLight");
-            m_holderUpStarMove = (GGraph)comp.GetChild("holderUpStarMove");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_lightType = null;
-            m_holderStarLight = null;
-            m_holderUpStarMove = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 0 - 71
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ComCardMask.cs

@@ -1,71 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.FieldGuide
-{
-    public partial class UI_ComCardMask
-    {
-        public GComponent target;
-        public GLoader m_loaCard;
-        public const string URL = "ui://vqq9h9h493pb4h";
-        public const string PACKAGE_NAME = "FieldGuide";
-        public const string RES_NAME = "ComCardMask";
-        private static UI_ComCardMask _proxy;
-
-        public static UI_ComCardMask Create(GObject gObject = null)
-        {
-            var ui = new UI_ComCardMask();
-            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_ComCardMask Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComCardMask();
-            }
-            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_loaCard = (GLoader)comp.GetChild("loaCard");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaCard = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 0 - 106
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ListCardGuideItem.cs

@@ -1,106 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.FieldGuide
-{
-    public partial class UI_ListCardGuideItem
-    {
-        public GComponent target;
-        public UI_ComCardMask m_comCard;
-        public GLoader m_loaBorder;
-        public GLoader m_loaRarity;
-        public GTextField m_txtLv;
-        public GTextField m_txtName;
-        public GLoader m_loaMainScore;
-        public UI_CardGuideComDodgeStar m_dodgeStar0;
-        public UI_CardGuideComDodgeStar m_dodgeStar1;
-        public UI_CardGuideComDodgeStar m_dodgeStar2;
-        public UI_CardGuideComDodgeStar m_dodgeStar3;
-        public GImage m_unlockMask;
-        public const string URL = "ui://vqq9h9h4nt1l5l";
-        public const string PACKAGE_NAME = "FieldGuide";
-        public const string RES_NAME = "ListCardGuideItem";
-        private static UI_ListCardGuideItem _proxy;
-
-        public static UI_ListCardGuideItem Create(GObject gObject = null)
-        {
-            var ui = new UI_ListCardGuideItem();
-            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_ListCardGuideItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ListCardGuideItem();
-            }
-            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_comCard = (UI_ComCardMask)UI_ComCardMask.Create(comp.GetChild("comCard"));
-            m_loaBorder = (GLoader)comp.GetChild("loaBorder");
-            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
-            m_txtLv = (GTextField)comp.GetChild("txtLv");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_loaMainScore = (GLoader)comp.GetChild("loaMainScore");
-            m_dodgeStar0 = (UI_CardGuideComDodgeStar)UI_CardGuideComDodgeStar.Create(comp.GetChild("dodgeStar0"));
-            m_dodgeStar1 = (UI_CardGuideComDodgeStar)UI_CardGuideComDodgeStar.Create(comp.GetChild("dodgeStar1"));
-            m_dodgeStar2 = (UI_CardGuideComDodgeStar)UI_CardGuideComDodgeStar.Create(comp.GetChild("dodgeStar2"));
-            m_dodgeStar3 = (UI_CardGuideComDodgeStar)UI_CardGuideComDodgeStar.Create(comp.GetChild("dodgeStar3"));
-            m_unlockMask = (GImage)comp.GetChild("unlockMask");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_comCard.Dispose();
-            m_comCard = null;
-            m_loaBorder = null;
-            m_loaRarity = null;
-            m_txtLv = null;
-            m_txtName = null;
-            m_loaMainScore = null;
-            m_dodgeStar0.Dispose();
-            m_dodgeStar0 = null;
-            m_dodgeStar1.Dispose();
-            m_dodgeStar1 = null;
-            m_dodgeStar2.Dispose();
-            m_dodgeStar2 = null;
-            m_dodgeStar3.Dispose();
-            m_dodgeStar3 = null;
-            m_unlockMask = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ListCardGuideItem.cs.meta

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

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDodgeStar.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDodgeFightStar.cs

@@ -4,18 +4,18 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_ComDodgeStar
+    public partial class UI_ComDodgeFightStar
     {
         public GComponent target;
         public Controller m_lightType;
         public const string URL = "ui://mfvz4q8km3wmftp";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComDodgeStar";
-        private static UI_ComDodgeStar _proxy;
+        public const string RES_NAME = "ComDodgeFightStar";
+        private static UI_ComDodgeFightStar _proxy;
 
-        public static UI_ComDodgeStar Create(GObject gObject = null)
+        public static UI_ComDodgeFightStar Create(GObject gObject = null)
         {
-            var ui = new UI_ComDodgeStar();
+            var ui = new UI_ComDodgeFightStar();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +24,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ComDodgeStar Proxy(GObject gObject = null)
+        public static UI_ComDodgeFightStar Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComDodgeStar();
+                _proxy = new UI_ComDodgeFightStar();
             }
             var ui = _proxy;
             if(gObject == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComCardMask.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDodgeFightStar.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b8ce7373cfaaf5a42bbc87b9d88cbe34
+guid: 90f7640f20ad36441a246a4cebfdc023
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 15 - 15
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardFightItem.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_ListCardItem
+    public partial class UI_ListCardFightItem
     {
         public GButton target;
         public Controller m_starNumType;
@@ -14,18 +14,18 @@ namespace UI.Main
         public GLoader m_loaRarity;
         public GTextField m_txtName;
         public GTextField m_txtLv;
-        public UI_ComDodgeStar m_dodgeStar0;
-        public UI_ComDodgeStar m_dodgeStar1;
-        public UI_ComDodgeStar m_dodgeStar2;
-        public UI_ComDodgeStar m_dodgeStar3;
+        public UI_ComDodgeFightStar m_dodgeStar0;
+        public UI_ComDodgeFightStar m_dodgeStar1;
+        public UI_ComDodgeFightStar m_dodgeStar2;
+        public UI_ComDodgeFightStar m_dodgeStar3;
         public const string URL = "ui://mfvz4q8kr1a99f";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ListCardItem";
-        private static UI_ListCardItem _proxy;
+        public const string RES_NAME = "ListCardFightItem";
+        private static UI_ListCardFightItem _proxy;
 
-        public static UI_ListCardItem Create(GObject gObject = null)
+        public static UI_ListCardFightItem Create(GObject gObject = null)
         {
-            var ui = new UI_ListCardItem();
+            var ui = new UI_ListCardFightItem();
             if(gObject == null)
             	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -34,11 +34,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ListCardItem Proxy(GObject gObject = null)
+        public static UI_ListCardFightItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListCardItem();
+                _proxy = new UI_ListCardFightItem();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -72,10 +72,10 @@ namespace UI.Main
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
-            m_dodgeStar0 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar0"));
-            m_dodgeStar1 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar1"));
-            m_dodgeStar2 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar2"));
-            m_dodgeStar3 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar3"));
+            m_dodgeStar0 = (UI_ComDodgeFightStar)UI_ComDodgeFightStar.Create(comp.GetChild("dodgeStar0"));
+            m_dodgeStar1 = (UI_ComDodgeFightStar)UI_ComDodgeFightStar.Create(comp.GetChild("dodgeStar1"));
+            m_dodgeStar2 = (UI_ComDodgeFightStar)UI_ComDodgeFightStar.Create(comp.GetChild("dodgeStar2"));
+            m_dodgeStar3 = (UI_ComDodgeFightStar)UI_ComDodgeFightStar.Create(comp.GetChild("dodgeStar3"));
         }
         public void Dispose(bool disposeTarget = false)
         {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_CardGuideComDodgeStar.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardFightItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d24f4fbda0505f24982ba557826750ce
+guid: 362deba4f94f61543aff5478e411c219
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardItem.cs.meta

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

+ 6 - 4
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/CardGuideView.cs

@@ -85,7 +85,7 @@ namespace GFGGame
         private void RenderCardListItem(int index, GObject obj)
         {
             CardData data = CardDataManager.GetCardDataById(_cardList[index]);
-            UI_ListCardGuideItem listItem = UI_ListCardGuideItem.Proxy(obj);
+            UI_ListCardItem listItem = UI_ListCardItem.Proxy(obj);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_cardList[index]);
 
             // Have
@@ -94,11 +94,13 @@ namespace GFGGame
                 listItem.m_unlockMask.visible = false;
                 listItem.m_comCard.m_loaCard.url = ResPathUtil.GetCardIconPath(data.resources[data.resIndex]);
                 int starLevelDodge = data.star / 5;
+                listItem.m_starNumType.selectedIndex = data.itemCfg.starDescArr.Length - 1;
+                listItem.m_txtLv.visible = false;
                 for (int i = 0; i < 4; i++)
                 {
-                    UI_CardGuideComDodgeStar dodgeStar = UI_CardGuideComDodgeStar.Proxy(listItem.target.GetChild("dodgeStar" + i));
+                    UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(listItem.target.GetChild("dodgeStar" + i));
                     dodgeStar.m_lightType.selectedIndex = (starLevelDodge > i) ? 1 : 0;
-                    UI_CardGuideComDodgeStar.ProxyEnd();
+                    UI_ComDodgeStar.ProxyEnd();
                 }
                 listItem.target.data = data;
             }
@@ -114,7 +116,7 @@ namespace GFGGame
             listItem.m_loaBorder.url = "ui://CommonGame/kp_kuang_" + itemCfg.rarity;//ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
             listItem.m_txtName.text = itemCfg.name;
 
-            UI_ListCardGuideItem.ProxyEnd();
+            UI_ListCardItem.ProxyEnd();
         }
 
         private void OnClickListCardItem(EventContext context)

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -185,7 +185,7 @@ namespace GFGGame
         private void RenderListCardItem(int index, GObject obj)
         {
             CardData cardData = cardList[index];
-            UI_ListCardItem item = UI_ListCardItem.Proxy(obj); // obj as GButton;
+            UI_ListCardFightItem item = UI_ListCardFightItem.Proxy(obj); // obj as GButton;
             item.m_txtName.text = cardData.itemCfg.name;
             item.m_comCardMask.m_loaCard.asLoader.url =
                 ResPathUtil.GetCardIconPath(cardData.resources[cardData.resIndex]);
@@ -201,9 +201,9 @@ namespace GFGGame
             item.m_starNumType.selectedIndex = cardData.itemCfg.starDescArr.Length - 1;
             for (int i = 0; i < 4; i++)
             {
-                UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(item.target.GetChild("dodgeStar" + i));
+                UI_ComDodgeFightStar dodgeStar = UI_ComDodgeFightStar.Proxy(item.target.GetChild("dodgeStar" + i));
                 dodgeStar.m_lightType.selectedIndex = (starLevelDodge > i) ? 1 : 0;
-                UI_ComDodgeStar.ProxyEnd();
+                UI_ComDodgeFightStar.ProxyEnd();
             }
 
             // comStar.m_c1.selectedIndex = cardData.star;
@@ -213,7 +213,7 @@ namespace GFGGame
                 // _effects.Add(_effectUI);
             }
 
-            UI_ListCardItem.ProxyEnd();
+            UI_ListCardFightItem.ProxyEnd();
             // UI_ComStar.ProxyEnd();
         }
 

BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Card/Card_fui.bytes


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_3!a.png


+ 0 - 96
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_3!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 7a68d7d95bb345048a147820cda47d3d
-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/FieldGuide/FieldGuide_atlas0_3.png


+ 0 - 96
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_3.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: c6ac938cc4099f242970e77c176d88fd
-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/FieldGuide/FieldGuide_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes


+ 8 - 0
GameClient/Assets/StreamingAssets/Bundles.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a71d610f561efe84fb231488f4db759b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: