Browse Source

升星奖励

zhaoyang 2 years ago
parent
commit
a0a15a9edd

+ 1 - 1
FGUIProject/assets/Card/CardFosterUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" overflow="hidden" scroll="horizontal">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <loader id="n80_gbqo" 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"/>

+ 14 - 0
FGUIProject/assets/Card/CardStarRewardUI.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1029,1043">
+  <displayList>
+    <loader id="n74_lc71" name="bg" xy="0,0" size="1029,1043" url="ui://7l6lvkaylc718f" autoSize="true"/>
+    <image id="n75_lc71" name="n75" src="lc718d" fileName="images/kp_cp_zi.png" xy="29,-64"/>
+    <list id="n65_lc71" name="listStarReward" xy="77,120" size="887,852" overflow="scroll" lineGap="20" defaultItem="ui://7l6lvkayxtmoa0">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

+ 19 - 0
FGUIProject/assets/Card/components/Button1.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="200,200" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <graph id="n0_xtmo" name="n0" xy="0,0" size="200,200" touchable="false" type="rect" lineSize="0" fillColor="#fff0f0f0">
+      <gearDisplay controller="button" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <graph id="n1_xtmo" name="n1" xy="0,0" size="200,200" touchable="false" type="rect" lineSize="0" fillColor="#fffafafa">
+      <gearDisplay controller="button" pages="2"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <graph id="n2_xtmo" name="n2" xy="0,0" size="200,200" touchable="false" type="rect" lineSize="0" fillColor="#ffcccccc">
+      <gearDisplay controller="button" pages="1,3"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+  </displayList>
+  <Button/>
+</component>

+ 2 - 1
FGUIProject/assets/Card/components/ComFosterTop.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,266">
+<component size="1080,327">
   <displayList>
     <image id="n71_lc71" name="n71" src="842s6d" fileName="images/kp_bj_1.png" xy="0,0"/>
     <component id="n69_lc71" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n68_lc71" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,6"/>
+    <component id="n72_xtmo" name="btnStarReward" src="xtmoa1" fileName="components/Button1.xml" xy="28,203" size="120,120" aspect="true" visible="false"/>
   </displayList>
 </component>

+ 12 - 0
FGUIProject/assets/Card/components/ListCardStarRewardItem.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="874,148">
+  <controller name="c1" exported="true" pages="0,,1," selected="0"/>
+  <displayList>
+    <image id="n71_lc71" name="n71" src="lc718g" fileName="images/kp_cp_di_2.png" pkg="eg2y0ldp" xy="0,0" size="874,148"/>
+    <text id="n67_lc71" name="txtTitle" xy="53,48" size="115,51" fontSize="38" color="#a8895c" text="第一节"/>
+    <component id="n69_lc71" name="btnGo" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="588,34" size="232,70">
+      <gearDisplay controller="c1" pages="0"/>
+      <Button title="前往"/>
+    </component>
+  </displayList>
+</component>

+ 2 - 2
FGUIProject/assets/Card/components/ListCardStoryItem.xml

@@ -6,8 +6,8 @@
     <image id="n72_lc71" name="n72" src="lc718c" fileName="images/kp_cp_xian_1.png" xy="189,67">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <text id="n67_lc71" name="txtTitle" xy="53,48" size="117,51" fontSize="38" color="#a8895c" text="第一节"/>
-    <text id="n70_lc71" name="txtDescribe" xy="316,49" size="373,49" fontSize="36" color="#c9b79e" text="词牌等级达到10级解锁">
+    <text id="n67_lc71" name="txtTitle" xy="53,48" size="115,51" fontSize="38" color="#a8895c" text="第一节"/>
+    <text id="n70_lc71" name="txtDescribe" xy="316,49" size="364,49" fontSize="36" color="#c9b79e" text="词牌等级达到10级解锁">
       <gearDisplay controller="c1" pages="1"/>
     </text>
     <component id="n69_lc71" name="btnGo" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="588,34" size="232,70">

+ 3 - 0
FGUIProject/assets/Card/package.xml

@@ -98,6 +98,9 @@
     <image id="94m19w" name="kp_kuang_4.png" path="/images/" exported="true"/>
     <image id="r9ri9x" name="kp_mudan.jpg" path="/images/"/>
     <image id="ysx99y" name="cpcp_ziti.png" path="/images/"/>
+    <component id="xtmo9z" name="CardStarRewardUI.xml" path="/" exported="true"/>
+    <component id="xtmoa0" name="ListCardStarRewardItem.xml" path="/components/"/>
+    <component id="xtmoa1" name="Button1.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Card" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardStarRewardUI.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Card
+{
+    public partial class UI_CardStarRewardUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GList m_listStarReward;
+        public const string URL = "ui://7l6lvkayxtmo9z";
+        public const string PACKAGE_NAME = "Card";
+        public const string RES_NAME = "CardStarRewardUI";
+        private static UI_CardStarRewardUI _proxy;
+
+        public static UI_CardStarRewardUI Create(GObject gObject = null)
+        {
+            var ui = new UI_CardStarRewardUI();
+            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_CardStarRewardUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_CardStarRewardUI();
+            }
+            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_bg = (GLoader)comp.GetChild("bg");
+            m_listStarReward = (GList)comp.GetChild("listStarReward");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_listStarReward = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComFosterTop.cs

@@ -9,6 +9,7 @@ namespace UI.Card
         public GComponent target;
         public GButton m_btnback;
         public GComponent m_comValueBar;
+        public GButton m_btnStarReward;
         public const string URL = "ui://7l6lvkayj4c69e";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "ComFosterTop";
@@ -58,11 +59,13 @@ namespace UI.Card
         {
             m_btnback = (GButton)comp.GetChild("btnback");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
+            m_btnStarReward = (GButton)comp.GetChild("btnStarReward");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_btnback = null;
             m_comValueBar = null;
+            m_btnStarReward = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ListCardStarRewardItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Card
+{
+    public partial class UI_ListCardStarRewardItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GTextField m_txtTitle;
+        public GButton m_btnGo;
+        public const string URL = "ui://7l6lvkayxtmoa0";
+        public const string PACKAGE_NAME = "Card";
+        public const string RES_NAME = "ListCardStarRewardItem";
+        private static UI_ListCardStarRewardItem _proxy;
+
+        public static UI_ListCardStarRewardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListCardStarRewardItem();
+            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_ListCardStarRewardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListCardStarRewardItem();
+            }
+            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_c1 = comp.GetController("c1");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_btnGo = (GButton)comp.GetChild("btnGo");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_txtTitle = null;
+            m_btnGo = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 6 - 0
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -69,6 +69,7 @@ namespace GFGGame
 
             //公共组件:返回,页签,属性列表
             _ui.m_ComFosterTop.m_btnback.onClick.Add(OnClickBtnBack);
+            _ui.m_ComFosterTop.m_btnStarReward.onClick.Add(OnBtnStarRewardClick);
             _ui.m_ComFosterBottom.m_ctrlTab.onChanged.Add(OnChangeCtrlTab);
             _ui.m_ComFosterBottom.m_listProperty.itemRenderer = RenderListPropertyItem;
 
@@ -97,6 +98,7 @@ namespace GFGGame
             _ui.m_loaListener.onClick.Add(OnClickComCard);
             _ui.m_comCard.target.onClick.Add(OnClickComCard);
 
+
         }
 
 
@@ -790,6 +792,10 @@ namespace GFGGame
 
             this.UpdateUpSkillView();
         }
+        private void OnBtnStarRewardClick()
+        {
+            ViewManager.Show<CardStarRewardView>(_cardData);
+        }
         private void OnClickBtnBack()
         {
             ViewManager.GoBackFrom(ViewName.CARD_FOSTER_VIEW);

+ 64 - 0
GameClient/Assets/Game/HotUpdate/Views/Card/CardStarRewardView.cs

@@ -0,0 +1,64 @@
+using FairyGUI;
+using System.Collections;
+using UI.Card;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class CardStarRewardView : BaseWindow
+    {
+        private UI_CardStarRewardUI _ui;
+        private CardData _viewData;
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_CardStarRewardUI.PACKAGE_NAME;
+            _ui = UI_CardStarRewardUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_listStarReward.itemRenderer = RenderListStarRewardItem;
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _viewData = this.viewData as CardData;
+            _ui.m_listStarReward.numItems = CardStarCfgArray.Instance.GetCfgsBycardId(_viewData.itemCfg.id).Count;
+        }
+        private void RenderListStarRewardItem(int index, GObject obj)
+        {
+            CardStarCfg cardStoryCfg = CardStarCfgArray.Instance.GetCfgsBycardId(_viewData.itemCfg.id)[index];
+            UI_ListCardStoryItem listItem = UI_ListCardStoryItem.Proxy(obj);
+            if (index == 0)
+            {
+                listItem.m_txtTitle.text = "激活词牌";
+            }
+            else
+            {
+                listItem.m_txtTitle.text = string.Format("词牌星级达到{0}星", NumberUtil.GetChiniseNumberText(index + 1));
+            }
+
+            UI_ListCardStoryItem.ProxyEnd();
+        }
+        private void OnClickBtnGo(CardStoryCfg cardStoryCfg)
+        {
+            StoryController.ShowCardStoryDialog(cardStoryCfg, _viewData);
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/Card/CardStarRewardView.cs.meta

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

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


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