Browse Source

卡牌升星奖励

zhaoyang 2 năm trước cách đây
mục cha
commit
f33ea6faf6
42 tập tin đã thay đổi với 381 bổ sung42 xóa
  1. 2 2
      FGUIProject/assets/Card/CardFosterUI.xml
  2. 6 4
      FGUIProject/assets/Card/CardStarRewardUI.xml
  3. 2 13
      FGUIProject/assets/Card/components/Button1.xml
  4. 2 2
      FGUIProject/assets/Card/components/ComFosterTop.xml
  5. 10 5
      FGUIProject/assets/Card/components/ListCardStarRewardItem.xml
  6. BIN
      FGUIProject/assets/Card/images/cpjl_kdikdi_1.png
  7. BIN
      FGUIProject/assets/Card/images/cpjl_kdikdi_2.png
  8. BIN
      FGUIProject/assets/Card/images/cpjl_rkrkan.png
  9. 3 0
      FGUIProject/assets/Card/package.xml
  10. 13 0
      FGUIProject/assets/Common/components/Button23.xml
  11. 13 0
      FGUIProject/assets/Common/components/Button24.xml
  12. BIN
      FGUIProject/assets/Common/imagesExport/cpjl_anniuty_1.png
  13. BIN
      FGUIProject/assets/Common/imagesExport/cpjl_anniuty_2.png
  14. 4 0
      FGUIProject/assets/Common/package.xml
  15. 2 2
      FGUIProject/assets/CommonGame/components/ComItem.xml
  16. 8 0
      FGUIProject/assets/CommonGame/components/ComTitle.xml
  17. BIN
      FGUIProject/assets/CommonGame/imagesExport/hl_phjlk_1.png
  18. 2 0
      FGUIProject/assets/CommonGame/package.xml
  19. 6 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardStarRewardUI.cs
  20. 9 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ListCardStarRewardItem.cs
  21. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTitle.cs
  22. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTitle.cs.meta
  23. 25 8
      GameClient/Assets/Game/HotUpdate/Views/Card/CardStarRewardView.cs
  24. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0!a.png
  25. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0.png
  26. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_1!a.png
  27. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_1.png
  28. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_2!a.png
  29. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_2.png
  30. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_3!a.png
  31. 96 0
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_3!a.png.meta
  32. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_3.png
  33. 96 0
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_3.png.meta
  34. BIN
      GameClient/Assets/ResIn/UI/Card/Card_fui.bytes
  35. BIN
      GameClient/Assets/ResIn/UI/Common/Common_atlas0!a.png
  36. BIN
      GameClient/Assets/ResIn/UI/Common/Common_atlas0.png
  37. BIN
      GameClient/Assets/ResIn/UI/Common/Common_fui.bytes
  38. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  39. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  40. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  41. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  42. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes

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

@@ -30,11 +30,11 @@
   <transition name="t0">
     <item time="0" type="Scale" target="n73_sxk4" label="normal" tween="true" startValue="0.8,0.8" endValue="1,1" duration="5" label2="scale" ease="Linear"/>
     <item time="0" type="XY" target="n70_lc71" tween="true" startValue="0,211" endValue="0,1920" duration="12" ease="Linear"/>
-    <item time="0" type="XY" target="n71_lc71" tween="true" startValue="0,0" endValue="0,-266" duration="12" ease="Linear"/>
+    <item time="0" type="XY" target="n71_lc71" tween="true" startValue="0,0" endValue="0,-475" duration="8" ease="Linear"/>
   </transition>
   <transition name="t1">
     <item time="0" type="Scale" target="n73_sxk4" label="scale" tween="true" startValue="1,1" endValue="0.8,0.8" duration="6" label2="normal" ease="Linear"/>
     <item time="0" type="XY" target="n70_lc71" tween="true" startValue="0,1920" endValue="0,211" duration="3" ease="Linear"/>
-    <item time="0" type="XY" target="n71_lc71" tween="true" startValue="0,-311" endValue="0,0" duration="3" ease="Linear"/>
+    <item time="0" type="XY" target="n71_lc71" tween="true" startValue="0,-475" endValue="0,0" duration="3" ease="Linear"/>
   </transition>
 </component>

+ 6 - 4
FGUIProject/assets/Card/CardStarRewardUI.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1029,1043">
+<component size="1080,1504">
   <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">
+    <loader id="n74_lc71" name="bg" xy="0,0" size="1080,1504" url="ui://7l6lvkayf2bfa3" autoSize="true"/>
+    <component id="n78_f2bf" name="comTitle" src="f2bfa6" fileName="components/ComTitle.xml" pkg="eg2y0ldp" xy="311,89">
+      <property target="title" propertyId="0" value="词牌奖励"/>
+    </component>
+    <list id="n65_lc71" name="listReward" xy="84,262" size="912,1025" lineGap="30" defaultItem="ui://7l6lvkayxtmoa0">
       <item/>
       <item/>
       <item/>

+ 2 - 13
FGUIProject/assets/Card/components/Button1.xml

@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="200,200" extention="Button">
+<component size="97,101" 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>
+    <image id="n3_f2bf" name="n3" src="f2bfa5" fileName="images/cpjl_rkrkan.png" xy="0,0"/>
   </displayList>
   <Button/>
 </component>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,327">
+<component size="1080,460">
   <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"/>
+    <component id="n72_xtmo" name="btnStarReward" src="xtmoa1" fileName="components/Button1.xml" xy="35,353" aspect="true"/>
   </displayList>
 </component>

+ 10 - 5
FGUIProject/assets/Card/components/ListCardStarRewardItem.xml

@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="874,148">
+<component size="910,180">
   <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">
+    <image id="n71_lc71" name="n71" src="f2bfa4" fileName="images/cpjl_kdikdi_2.png" xy="0,0"/>
+    <text id="n67_lc71" name="txtTitle" xy="42,60" size="129,56" font="ui://eg2y0ldpwonotja" fontSize="42" color="#a38364" text="第一节"/>
+    <component id="n69_lc71" name="btnGet" src="f2bftjz" fileName="components/Button23.xml" pkg="mk0fwx0x" xy="625,48">
       <gearDisplay controller="c1" pages="0"/>
-      <Button title="前往"/>
+      <Button title="领取"/>
     </component>
+    <component id="n74_f2bf" name="btnGot" src="f2bftk0" fileName="components/Button24.xml" pkg="mk0fwx0x" xy="625,49">
+      <gearDisplay controller="c1" pages="1"/>
+      <Button title="已领取"/>
+    </component>
+    <component id="n73_f2bf" name="comItem" src="j48o98" fileName="components/ComItem.xml" pkg="eg2y0ldp" xy="380,-26" pivot="0.5,0.5" size="222,223" scale="0.65,0.65"/>
   </displayList>
 </component>

BIN
FGUIProject/assets/Card/images/cpjl_kdikdi_1.png


BIN
FGUIProject/assets/Card/images/cpjl_kdikdi_2.png


BIN
FGUIProject/assets/Card/images/cpjl_rkrkan.png


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

@@ -101,6 +101,9 @@
     <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/"/>
+    <image id="f2bfa3" name="cpjl_kdikdi_1.png" path="/images/"/>
+    <image id="f2bfa4" name="cpjl_kdikdi_2.png" path="/images/"/>
+    <image id="f2bfa5" name="cpjl_rkrkan.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Card" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 13 - 0
FGUIProject/assets/Common/components/Button23.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="250,81" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_f2bf" name="n0" src="f2bftjy" fileName="imagesExport/cpjl_anniuty_1.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_f2bf" name="n1" xy="0,-2" size="250,81" font="ui://eg2y0ldpwonotjc" fontSize="44" color="#fcf2f2" align="center" vAlign="middle" autoSize="none" strokeColor="#d89291" strokeSize="2" shadowColor="#d29292" shadowOffset="2,2" text="领取">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

+ 13 - 0
FGUIProject/assets/Common/components/Button24.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="250,81" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_f2bf" name="n0" src="f2bftjx" fileName="imagesExport/cpjl_anniuty_2.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_f2bf" name="n1" xy="0,-2" size="250,81" font="ui://eg2y0ldpwonotjc" fontSize="44" color="#f3efef" align="center" vAlign="middle" autoSize="none" strokeColor="#ac9c9c" strokeSize="2" shadowColor="#a99e9e" shadowOffset="2,2" text="领取">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

BIN
FGUIProject/assets/Common/imagesExport/cpjl_anniuty_1.png


BIN
FGUIProject/assets/Common/imagesExport/cpjl_anniuty_2.png


+ 4 - 0
FGUIProject/assets/Common/package.xml

@@ -50,6 +50,10 @@
     <image id="r9ritjk" name="tc_tydikua_1.png" path="/components/" scale="9grid" scale9grid="240,281,480,562"/>
     <image id="si5ztie" name="tc_tydikua_3.png" path="/components/"/>
     <image id="si5ztif" name="tc_tydikua_52.png" path="/components/"/>
+    <image id="f2bftjx" name="cpjl_anniuty_2.png" path="/imagesExport/"/>
+    <image id="f2bftjy" name="cpjl_anniuty_1.png" path="/imagesExport/"/>
+    <component id="f2bftjz" name="Button23.xml" path="/components/" exported="true"/>
+    <component id="f2bftk0" name="Button24.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Common" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 2 - 2
FGUIProject/assets/CommonGame/components/ComItem.xml

@@ -2,10 +2,10 @@
 <component size="222,254" overflow="hidden" opaque="false">
   <displayList>
     <component id="n25_pu55" name="comItemIcon" src="ng0itiz" fileName="components/ComItemIcon.xml" xy="0,0" pivot="0.5,0.5" size="222,222" aspect="true"/>
-    <text id="n15_ehs9" name="txtCount" xy="205,178" pivot="1,0" anchor="true" size="76,42" fontSize="30" color="#fbf6eb" align="right" vars="true" strokeColor="#8c7358" strokeSize="2" text="x{count=200}">
+    <text id="n15_ehs9" name="txtCount" xy="205,178" pivot="1,0" anchor="true" size="78,42" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6eb" align="right" vars="true" strokeColor="#8c7358" strokeSize="2" text="x{count=200}">
       <relation target="n25_pu55" sidePair="right-right,top-top"/>
     </text>
-    <text id="n26_r9ri" name="txtName" xy="111,215" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">
+    <text id="n26_r9ri" name="txtName" xy="111,215" pivot="0.5,0" anchor="true" size="59,39" fontSize="28" color="#a78d67" text="江南">
       <relation target="n25_pu55" sidePair="bottom-bottom"/>
     </text>
   </displayList>

+ 8 - 0
FGUIProject/assets/CommonGame/components/ComTitle.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="458,68">
+  <displayList>
+    <image id="n76_f2bf" name="n76" src="f2bfa2" fileName="imagesExport/hl_phjlk_1.png" xy="0,0"/>
+    <text id="n77_f2bf" name="title" xy="131,1" pivot="0.5,0" size="196,64" font="ui://eg2y0ldpwonotja" fontSize="48" color="#a98151" text="排名奖励"/>
+  </displayList>
+  <customProperty target="title" propertyId="0"/>
+</component>

BIN
FGUIProject/assets/CommonGame/imagesExport/hl_phjlk_1.png


+ 2 - 0
FGUIProject/assets/CommonGame/package.xml

@@ -225,6 +225,8 @@
     <image id="uyuxzx" name="xc_xzdik.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="137,19,274,38"/>
     <font id="weoktkb" name="ALIBABAPUHUITI-2-55-REGULAR.ttf" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <image id="nasrtkc" name="tangyuan.png" path="/imgItemIcon/" exported="true"/>
+    <image id="f2bfa2" name="hl_phjlk_1.png" path="/imagesExport/" exported="true"/>
+    <component id="f2bfa6" name="ComTitle.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 6 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardStarRewardUI.cs

@@ -8,7 +8,8 @@ namespace UI.Card
     {
         public GComponent target;
         public GLoader m_bg;
-        public GList m_listStarReward;
+        public GComponent m_comTitle;
+        public GList m_listReward;
         public const string URL = "ui://7l6lvkayxtmo9z";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "CardStarRewardUI";
@@ -57,12 +58,14 @@ namespace UI.Card
         private void Init(GComponent comp)
         {
             m_bg = (GLoader)comp.GetChild("bg");
-            m_listStarReward = (GList)comp.GetChild("listStarReward");
+            m_comTitle = (GComponent)comp.GetChild("comTitle");
+            m_listReward = (GList)comp.GetChild("listReward");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
-            m_listStarReward = null;
+            m_comTitle = null;
+            m_listReward = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 9 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ListCardStarRewardItem.cs

@@ -9,7 +9,9 @@ namespace UI.Card
         public GComponent target;
         public Controller m_c1;
         public GTextField m_txtTitle;
-        public GButton m_btnGo;
+        public GButton m_btnGet;
+        public GButton m_btnGot;
+        public GComponent m_comItem;
         public const string URL = "ui://7l6lvkayxtmoa0";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "ListCardStarRewardItem";
@@ -59,13 +61,17 @@ namespace UI.Card
         {
             m_c1 = comp.GetController("c1");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
-            m_btnGo = (GButton)comp.GetChild("btnGo");
+            m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_btnGot = (GButton)comp.GetChild("btnGot");
+            m_comItem = (GComponent)comp.GetChild("comItem");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_txtTitle = null;
-            m_btnGo = null;
+            m_btnGet = null;
+            m_btnGot = null;
+            m_comItem = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTitle.cs

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

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTitle.cs.meta

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

+ 25 - 8
GameClient/Assets/Game/HotUpdate/Views/Card/CardStarRewardView.cs

@@ -29,32 +29,49 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
-            _ui.m_listStarReward.itemRenderer = RenderListStarRewardItem;
+            _ui.m_listReward.itemRenderer = RenderListStarRewardItem;
         }
         protected override void OnShown()
         {
             base.OnShown();
             _viewData = this.viewData as CardData;
-            _ui.m_listStarReward.numItems = CardStarCfgArray.Instance.GetCfgsBycardId(_viewData.itemCfg.id).Count;
+            _ui.m_listReward.numItems = CardStarCfgArray.Instance.GetCfgsBycardId(_viewData.itemCfg.id).Count;
         }
         private void RenderListStarRewardItem(int index, GObject obj)
         {
+            UI_ListCardStarRewardItem item = UI_ListCardStarRewardItem.Proxy(obj);
             CardStarCfg cardStoryCfg = CardStarCfgArray.Instance.GetCfgsBycardId(_viewData.itemCfg.id)[index];
-            UI_ListCardStoryItem listItem = UI_ListCardStoryItem.Proxy(obj);
             if (index == 0)
             {
-                listItem.m_txtTitle.text = "激活词牌";
+                item.m_txtTitle.text = "激活词牌";
             }
             else
             {
-                listItem.m_txtTitle.text = string.Format("词牌星级达到{0}星", NumberUtil.GetChiniseNumberText(index + 1));
+                item.m_txtTitle.text = string.Format("词牌星级达到{0}星", NumberUtil.GetChiniseNumberText(index + 1));
             }
+            RedDotController.Instance.SetComRedDot(item.m_btnGet, true);
+            if (item.m_btnGet.data == null)
+            {
+                item.m_btnGet.onClick.Add(OnClickBtnGet);
+            }
+            item.m_btnGet.data = index;
+
+            ItemData reward = ItemUtil.createItemData(cardStoryCfg.rewardsArr[0]);
+            if (item.m_comItem.data == null)
+            {
+                item.m_comItem.data = new ItemView(item.m_comItem);
+            }
+            (item.m_comItem.data as ItemView).SetData(reward);
+
 
-            UI_ListCardStoryItem.ProxyEnd();
+
+            UI_ListCardStarRewardItem.ProxyEnd();
         }
-        private void OnClickBtnGo(CardStoryCfg cardStoryCfg)
+        private void OnClickBtnGet(EventContext context)
         {
-            StoryController.ShowCardStoryDialog(cardStoryCfg, _viewData);
+            GObject obj = context.sender as GObject;
+            int index = (int)obj.data;
+
         }
         protected override void OnHide()
         {

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_atlas0_2!a.png


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


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


+ 96 - 0
GameClient/Assets/ResIn/UI/Card/Card_atlas0_3!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: b8d63117111846347932e0cb2daf16ac
+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/Card/Card_atlas0_3.png


+ 96 - 0
GameClient/Assets/ResIn/UI/Card/Card_atlas0_3.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: e9e4b460ac7acf04eab55fb982e230ef
+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/Card/Card_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Common/Common_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Common/Common_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Common/Common_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_fui.bytes