zhaoyang 2 лет назад
Родитель
Сommit
282c46b6b0
30 измененных файлов с 187 добавлено и 66 удалено
  1. 13 0
      FGUIProject/assets/CommonGame/components/Button22.xml
  2. BIN
      FGUIProject/assets/CommonGame/images/anniuty5.png
  3. BIN
      FGUIProject/assets/CommonGame/images/zx_jqgka_stjl.png
  4. 2 0
      FGUIProject/assets/CommonGame/package.xml
  5. 50 47
      FGUIProject/assets/Main/StoryLevelInfoUI.xml
  6. 8 0
      FGUIProject/assets/Main/components/ListRewardItem.xml
  7. BIN
      FGUIProject/assets/Main/images/zx_jq_dituditu.png
  8. BIN
      FGUIProject/assets/Main/images/zx_jq_rwbszik.png
  9. BIN
      FGUIProject/assets/Main/imagesDialog/jinbixie.png
  10. BIN
      FGUIProject/assets/Main/imagesDialog/self.png
  11. BIN
      FGUIProject/assets/Main/imagesStory/zx_jq_djtubiao_1.png
  12. BIN
      FGUIProject/assets/Main/imagesStory/zx_jqgka_anks_1.png
  13. BIN
      FGUIProject/assets/Main/imagesStory/zx_xianx.png
  14. 4 0
      FGUIProject/assets/Main/package.xml
  15. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListRewardItem.cs
  16. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListRewardItem.cs.meta
  17. 15 15
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryLevelInfoUI.cs
  18. 7 4
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs
  19. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  20. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  21. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  22. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  23. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  24. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  25. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  26. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png
  27. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png
  28. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  29. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  30. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 13 - 0
FGUIProject/assets/CommonGame/components/Button22.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="273,78" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_v95q" name="n0" src="v95qtjv" fileName="images/anniuty5.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_v95q" name="title" xy="0,-4" size="273,78" fontSize="44" color="#fdf7e8" align="center" vAlign="middle" autoSize="none" strokeColor="#d2ab60" strokeSize="2" shadowColor="#cfb36e" shadowOffset="1,1" text="挑战">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

BIN
FGUIProject/assets/CommonGame/images/anniuty5.png


BIN
FGUIProject/assets/CommonGame/images/zx_jqgka_stjl.png


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

@@ -232,6 +232,8 @@
     <component id="oqa1tjt" name="Button21.xml" path="/components/" exported="true"/>
     <component id="r9ri1h" name="ComHead.xml" path="/components/" exported="true"/>
     <image id="v95qtju" name="hc_yyy.png" path="/images/" exported="true"/>
+    <image id="v95qtjv" name="anniuty5.png" path="/images/"/>
+    <component id="v95qtjw" name="Button22.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 50 - 47
FGUIProject/assets/Main/StoryLevelInfoUI.xml

@@ -1,73 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1160" designImageOffsetX="-750">
-  <controller name="ctrlNeed" pages="0,,1,,2,,3," selected="0"/>
+<component size="1080,1299" designImageOffsetX="-750">
+  <controller name="ctrlNeed" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
-    <loader id="n44_yoe2" name="btnBg" xy="0,-153" size="1080,1414" touchable="false" url="ui://mfvz4q8kj48o94" autoSize="true"/>
-    <component id="n0_vxw5" name="btnStart" src="t8o13i" fileName="componentsLevel/ButtonStart.xml" xy="766,864">
+    <loader id="n44_yoe2" name="btnBg" xy="0,0" size="1080,1299" touchable="false" url="ui://mfvz4q8kj48o94" autoSize="true"/>
+    <component id="n0_vxw5" name="btnStart" src="t8o13i" fileName="componentsLevel/ButtonStart.xml" xy="756,969">
       <Button title="开始旅程"/>
     </component>
-    <text id="n4_t8o1" name="txtTitle" xy="379,99" pivot="0.5,0" size="536,64" fontSize="48" color="#fdf4cb" align="center" autoSize="none" autoClearText="true" text="关卡标题"/>
-    <text id="n38_j48o" name="n38" xy="387,199" size="184,49" group="n50_rqo4" fontSize="36" color="#9b7f61" text="最高评分:"/>
-    <text id="n7_t8o1" name="txtHighestScore" xy="580,205" size="226,57" group="n50_rqo4" fontSize="32" color="#a28d77" ubb="true" autoSize="none" autoClearText="true" text="9999"/>
-    <component id="n8_t8o1" name="flower" src="s2cc5k" fileName="components/CompFlower1.xml" xy="697,201" group="n50_rqo4">
+    <loader id="n16_t8o1" name="loaderHead" xy="209,392" pivot="0.5,0.5" anchor="true" size="362,481" group="n54_rqo4" aspect="true" scale="-1,1" url="ui://mfvz4q8kv95qhp" align="center" fill="scale" clearOnPublish="true"/>
+    <image id="n34_pal5" name="n34" src="j48o97" fileName="images/zx_jq_rwbszik.png" xy="32,228" group="n61_v95q">
+      <relation target="" sidePair="top-top"/>
+    </image>
+    <text id="n21_t8o1" name="txtTargetName" xy="53,257" pivot="0.5,0" size="32,278" group="n61_v95q" font="ui://eg2y0ldpwonotja" fontSize="32" color="#af8f6d" align="center" leading="0" autoSize="height" text="对手:走秀模特">
+      <relation target="n34_pal5" sidePair="top-top"/>
+    </text>
+    <group id="n61_v95q" name="n61" xy="32,228" size="76,362" group="n54_rqo4"/>
+    <group id="n54_rqo4" name="n54" xy="27,151" size="362,481"/>
+    <text id="n4_t8o1" name="txtTitle" xy="384,158" pivot="0.5,0" size="536,72" group="n60_v95q" fontSize="54" color="#91724a" align="center" autoSize="none" autoClearText="true" text="关卡标题"/>
+    <text id="n38_j48o" name="n38" xy="392,258" size="184,49" group="n50_rqo4" fontSize="36" color="#9e8059" text="最高评分:"/>
+    <text id="n7_t8o1" name="txtHighestScore" xy="585,258" size="226,57" group="n50_rqo4" fontSize="36" color="#d6817b" ubb="true" autoSize="none" autoClearText="true" text="9999"/>
+    <component id="n8_t8o1" name="flower" src="s2cc5k" fileName="components/CompFlower1.xml" xy="702,260" group="n50_rqo4">
       <relation target="n7_t8o1" sidePair="left-left,top-top"/>
     </component>
-    <group id="n50_rqo4" name="n50" xy="387,199" size="445,63"/>
-    <text id="n39_j48o" name="n39" xy="387,274" size="184,49" group="n51_rqo4" fontSize="36" color="#9b7f61" text="通关属性:"/>
-    <loader id="n37_d4iw" name="scoreType" xy="581,272" size="50,50" group="n51_rqo4" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <group id="n51_rqo4" name="n51" xy="387,272" size="244,51"/>
-    <text id="n40_j48o" name="n40" xy="387,349" size="184,49" group="n52_rqo4" fontSize="36" color="#9b7f61" text="通关条件:">
+    <group id="n50_rqo4" name="n50" xy="392,258" size="445,57" group="n60_v95q"/>
+    <text id="n39_j48o" name="n39" xy="392,325" size="184,49" group="n51_rqo4" fontSize="36" color="#9e8059" text="通关属性:"/>
+    <loader id="n37_d4iw" name="scoreType" xy="586,323" size="50,50" group="n51_rqo4" url="ui://eg2y0ldp842s6h" fill="scale"/>
+    <group id="n51_rqo4" name="n51" xy="392,323" size="244,51" group="n60_v95q"/>
+    <text id="n40_j48o" name="n40" xy="392,390" size="184,49" group="n52_rqo4" fontSize="36" color="#9e8059" text="通关条件:">
       <gearDisplay controller="ctrlNeed" pages="1,2"/>
       <gearText controller="ctrlNeed" pages="2" values="通关加分:" default="通关条件:"/>
     </text>
-    <richtext id="n45_rfkv" name="txtNeed" xy="580,352" size="132,44" group="n52_rqo4" fontSize="32" color="#a28d77" text="赵钱孙李">
+    <richtext id="n45_rfkv" name="txtNeed" xy="585,390" size="148,49" group="n52_rqo4" fontSize="36" color="#d6817b" text="赵钱孙李">
       <gearDisplay controller="ctrlNeed" pages="1"/>
     </richtext>
-    <list id="n42_j48o" name="listTag" xy="581,357" size="206,41" group="n52_rqo4" layout="row" colGap="10" defaultItem="ui://eg2y0ldpih7566" autoClearItems="true">
+    <list id="n42_j48o" name="listTag" xy="586,398" size="206,41" group="n52_rqo4" layout="row" colGap="10" defaultItem="ui://eg2y0ldpih7566" autoClearItems="true">
       <gearDisplay controller="ctrlNeed" pages="2"/>
       <item/>
       <item/>
     </list>
-    <group id="n52_rqo4" name="n52" xy="387,349" size="400,49"/>
-    <text id="n48_rqo4" name="n48" xy="387,349" size="184,49" group="n53_rqo4" fontSize="36" color="#9b7f61" text="套装增益:"/>
-    <richtext id="n49_rqo4" name="txtAddition" xy="580,348" size="148,49" group="n53_rqo4" fontSize="36" color="#c67c6b" text="赵钱孙李"/>
-    <component id="n56_hbio" name="btnAdditionDesc" src="hbiofi" fileName="components/Button3.xml" xy="749,350" group="n53_rqo4"/>
-    <image id="n57_hbio" name="n57" src="v482fl" fileName="images/cyjd_tsts.png" xy="513,254" pivot="0.5,0" group="n59_hbio"/>
-    <text id="n58_hbio" name="txtAdditionDesc" xy="514,265" size="507,46" group="n59_hbio" fontSize="34" color="#fdf3df" align="center" vAlign="middle" ubb="true" autoSize="height" autoClearText="true" text="孔雀东南飞套装收集进度:(0/1)"/>
-    <group id="n59_hbio" name="grpAdditionDesc" xy="513,254" size="512,71" group="n53_rqo4" advanced="true"/>
-    <group id="n53_rqo4" name="n53" xy="387,254" size="638,144" advanced="true">
+    <group id="n52_rqo4" name="n52" xy="392,390" size="400,49" group="n60_v95q"/>
+    <text id="n48_rqo4" name="n48" xy="392,389" size="184,49" group="n53_rqo4" fontSize="36" color="#9e8059" text="套装增益:"/>
+    <richtext id="n49_rqo4" name="txtAddition" xy="585,388" size="148,49" group="n53_rqo4" fontSize="36" color="#c67c6b" text="赵钱孙李"/>
+    <component id="n56_hbio" name="btnAdditionDesc" src="hbiofi" fileName="components/Button3.xml" xy="754,390" group="n53_rqo4"/>
+    <image id="n57_hbio" name="n57" src="v482fl" fileName="images/cyjd_tsts.png" xy="518,294" pivot="0.5,0" group="n59_hbio"/>
+    <text id="n58_hbio" name="txtAdditionDesc" xy="519,305" size="507,46" group="n59_hbio" fontSize="34" color="#fdf3df" align="center" vAlign="middle" ubb="true" autoSize="height" autoClearText="true" text="孔雀东南飞套装收集进度:(0/1)"/>
+    <group id="n59_hbio" name="grpAdditionDesc" xy="518,294" size="512,71" group="n53_rqo4" advanced="true"/>
+    <group id="n53_rqo4" name="n53" xy="392,294" size="638,144" group="n60_v95q" advanced="true">
       <gearDisplay controller="ctrlNeed" pages="3"/>
     </group>
-    <text id="n15_t8o1" name="txtLevelDesc" xy="387,419" size="638,140" fontSize="32" color="#a28d77" leading="10" ubb="true" autoSize="none" autoClearText="true" text="旋律在指尖流转,在天幕中划出一道 起伏的星轨折线谱,爱与星光于此吟 唱。参与限时活动星幕下的奏鸣!"/>
-    <loader id="n16_t8o1" name="loaderHead" xy="167,2" pivot="0.5,0" anchor="true" size="420,558" group="n54_rqo4" autoSize="true" clearOnPublish="true"/>
-    <image id="n34_pal5" name="n34" src="j48o97" fileName="images/zx_jq_rwbszik.png" xy="17,152" size="54,421" group="n54_rqo4">
-      <relation target="" sidePair="top-top"/>
-    </image>
-    <text id="n21_t8o1" name="txtTargetName" xy="26,167" pivot="0.5,0" size="32,395" group="n54_rqo4" fontSize="32" color="#dcc7b3" align="center" leading="0" autoSize="height" text="挑战对手·走秀模特">
-      <relation target="n34_pal5" sidePair="top-top"/>
-    </text>
-    <group id="n54_rqo4" name="n54" xy="-43,2" size="420,571"/>
-    <loader id="n47_m1l9" name="loaCost" xy="812,1101" size="60,60" group="n55_rqo4" visible="false" url="ui://eg2y0ldpq08x4" autoSize="true"/>
-    <text id="n18_t8o1" name="txtPowerDesc" xy="806,1110" size="161,39" group="n55_rqo4" fontSize="28" color="#b19270" align="center" vAlign="middle" vars="true" autoSize="none" text="消耗体力:{power=5}"/>
-    <group id="n55_rqo4" name="n55" xy="806,1101" size="161,60"/>
-    <component id="n19_t8o1" name="btnFightOnce" src="pal5w" fileName="components/Button4.xml" pkg="eg2y0ldp" xy="50,934" group="n23_t8o1">
-      <Button title="挑战一次"/>
-    </component>
-    <component id="n20_t8o1" name="btnFightTimes" src="pal5w" fileName="components/Button4.xml" pkg="eg2y0ldp" xy="396,934" group="n23_t8o1">
-      <Button title="挑战十次"/>
-    </component>
-    <group id="n23_t8o1" name="groupPass" xy="50,934" size="660,105" advanced="true" layout="hz" colGap="32" excludeInvisibles="true">
-      <relation target="n0_vxw5" sidePair="right-right"/>
-    </group>
-    <list id="n33_t8o1" name="listBonus" xy="43,592" pivot="0.5,0" size="992,281" scale="0.95,0.95" layout="row" overflow="scroll" scroll="horizontal" colGap="15" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
+    <image id="n62_v95q" name="n62" src="v95qhm" fileName="imagesStory/zx_xianx.png" xy="375,465" group="n60_v95q"/>
+    <text id="n15_t8o1" name="txtLevelDesc" xy="391,492" size="638,140" group="n60_v95q" fontSize="32" color="#bda891" leading="10" ubb="true" autoSize="none" autoClearText="true" text="旋律在指尖流转,在天幕中划出一道 起伏的星轨折线谱,爱与星光于此吟 唱。参与限时活动星幕下的奏鸣!"/>
+    <group id="n60_v95q" name="n60" xy="375,158" size="655,474"/>
+    <list id="n33_t8o1" name="listBonus" xy="43,706" pivot="0.5,0" size="992,285" scale="0.95,0.95" layout="row" overflow="scroll" scroll="horizontal" colGap="62" defaultItem="ui://mfvz4q8kv95qhn" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
+    <component id="n19_t8o1" name="btnFightOnce" src="v95qtjw" fileName="components/Button22.xml" pkg="eg2y0ldp" xy="102,1046" group="n23_t8o1">
+      <Button title="挑战一次"/>
+    </component>
+    <component id="n20_t8o1" name="btnFightTimes" src="v95qtjw" fileName="components/Button22.xml" pkg="eg2y0ldp" xy="425,1046" group="n23_t8o1">
+      <Button title="挑战十次"/>
+    </component>
+    <group id="n23_t8o1" name="groupPass" xy="102,1046" size="596,78" advanced="true" layout="hz" colGap="50" excludeInvisibles="true">
+      <relation target="n0_vxw5" sidePair="right-right"/>
+    </group>
     <loader id="n46_kzvk" name="btnGuide" xy="480,1455" size="120,120"/>
-    <text id="n22_t8o1" name="txtUnpassTips" xy="295,968" pivot="0.5,0" size="364,49" group="n24_t8o1" fontSize="36" color="#fde3bc" align="center" vars="true" singleLine="true" text="{count=二}星及以上可快速通关"/>
-    <group id="n24_t8o1" name="groupUnpass" xy="295,968" size="364,49" advanced="true"/>
+    <text id="n22_t8o1" name="txtUnpassTips" xy="220,1061" pivot="0.5,0" size="364,49" group="n24_t8o1" fontSize="36" color="#fde3bc" align="center" vars="true" singleLine="true" text="{count=二}星及以上可快速通关"/>
+    <group id="n24_t8o1" name="groupUnpass" xy="220,1061" size="364,49" advanced="true"/>
+    <loader id="n47_m1l9" name="loaCost" xy="587,1141" size="60,60" group="n55_rqo4" visible="false" url="ui://eg2y0ldpq08x4" autoSize="true"/>
+    <text id="n18_t8o1" name="txtPowerDesc" xy="581,1150" size="161,39" group="n55_rqo4" fontSize="28" color="#b19270" align="center" vAlign="middle" vars="true" autoSize="none" text="消耗体力:{power=5}"/>
+    <group id="n55_rqo4" name="n55" xy="581,1141" size="161,60"/>
   </displayList>
 </component>

+ 8 - 0
FGUIProject/assets/Main/components/ListRewardItem.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="201,270">
+  <displayList>
+    <component id="n63_v95q" name="comItem" src="j48o98" fileName="components/ComItem.xml" pkg="eg2y0ldp" xy="0,0" size="222,224" scale="0.9,0.9"/>
+    <text id="n64_v95q" name="txtName" xy="66,195" pivot="0.5,0" size="68,44" fontSize="32" color="#8d6f50" text="道具"/>
+    <text id="n65_v95q" name="txtOwner" xy="43,239" pivot="0.5,0" size="115,34" fontSize="24" color="#b8a087" text="已拥有:0"/>
+  </displayList>
+</component>

BIN
FGUIProject/assets/Main/images/zx_jq_dituditu.png


BIN
FGUIProject/assets/Main/images/zx_jq_rwbszik.png


BIN
FGUIProject/assets/Main/imagesDialog/jinbixie.png


BIN
FGUIProject/assets/Main/imagesDialog/self.png


BIN
FGUIProject/assets/Main/imagesStory/zx_jq_djtubiao_1.png


BIN
FGUIProject/assets/Main/imagesStory/zx_jqgka_anks_1.png


BIN
FGUIProject/assets/Main/imagesStory/zx_xianx.png


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

@@ -415,6 +415,10 @@
     <image id="r9rihk" name="zd_tzhdkua_1.png" path="/images/"/>
     <image id="r9rihl" name="zd_wctsxs.png" path="/images/"/>
     <component id="q08x0" name="MainUI.xml" path="/" exported="true"/>
+    <image id="v95qhm" name="zx_xianx.png" path="/imagesStory/"/>
+    <component id="v95qhn" name="ListRewardItem.xml" path="/components/"/>
+    <image id="v95qho" name="self.png" path="/imagesDialog/"/>
+    <image id="v95qhp" name="jinbixie.png" path="/imagesDialog/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListRewardItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ListRewardItem
+    {
+        public GComponent target;
+        public GComponent m_comItem;
+        public GTextField m_txtName;
+        public GTextField m_txtOwner;
+        public const string URL = "ui://mfvz4q8kv95qhn";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ListRewardItem";
+        private static UI_ListRewardItem _proxy;
+
+        public static UI_ListRewardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListRewardItem();
+            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_ListRewardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListRewardItem();
+            }
+            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_comItem = (GComponent)comp.GetChild("comItem");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtOwner = (GTextField)comp.GetChild("txtOwner");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comItem = null;
+            m_txtName = null;
+            m_txtOwner = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 15 - 15
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryLevelInfoUI.cs

@@ -10,6 +10,8 @@ namespace UI.Main
         public Controller m_ctrlNeed;
         public GLoader m_btnBg;
         public GButton m_btnStart;
+        public GLoader m_loaderHead;
+        public GTextField m_txtTargetName;
         public GTextField m_txtTitle;
         public GTextField m_txtHighestScore;
         public UI_CompFlower1 m_flower;
@@ -21,17 +23,15 @@ namespace UI.Main
         public GTextField m_txtAdditionDesc;
         public GGroup m_grpAdditionDesc;
         public GTextField m_txtLevelDesc;
-        public GLoader m_loaderHead;
-        public GTextField m_txtTargetName;
-        public GLoader m_loaCost;
-        public GTextField m_txtPowerDesc;
+        public GList m_listBonus;
         public GButton m_btnFightOnce;
         public GButton m_btnFightTimes;
         public GGroup m_groupPass;
-        public GList m_listBonus;
         public GLoader m_btnGuide;
         public GTextField m_txtUnpassTips;
         public GGroup m_groupUnpass;
+        public GLoader m_loaCost;
+        public GTextField m_txtPowerDesc;
         public const string URL = "ui://mfvz4q8kvxw538";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryLevelInfoUI";
@@ -82,6 +82,8 @@ namespace UI.Main
             m_ctrlNeed = comp.GetController("ctrlNeed");
             m_btnBg = (GLoader)comp.GetChild("btnBg");
             m_btnStart = (GButton)comp.GetChild("btnStart");
+            m_loaderHead = (GLoader)comp.GetChild("loaderHead");
+            m_txtTargetName = (GTextField)comp.GetChild("txtTargetName");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtHighestScore = (GTextField)comp.GetChild("txtHighestScore");
             m_flower = (UI_CompFlower1)UI_CompFlower1.Create(comp.GetChild("flower"));
@@ -93,23 +95,23 @@ namespace UI.Main
             m_txtAdditionDesc = (GTextField)comp.GetChild("txtAdditionDesc");
             m_grpAdditionDesc = (GGroup)comp.GetChild("grpAdditionDesc");
             m_txtLevelDesc = (GTextField)comp.GetChild("txtLevelDesc");
-            m_loaderHead = (GLoader)comp.GetChild("loaderHead");
-            m_txtTargetName = (GTextField)comp.GetChild("txtTargetName");
-            m_loaCost = (GLoader)comp.GetChild("loaCost");
-            m_txtPowerDesc = (GTextField)comp.GetChild("txtPowerDesc");
+            m_listBonus = (GList)comp.GetChild("listBonus");
             m_btnFightOnce = (GButton)comp.GetChild("btnFightOnce");
             m_btnFightTimes = (GButton)comp.GetChild("btnFightTimes");
             m_groupPass = (GGroup)comp.GetChild("groupPass");
-            m_listBonus = (GList)comp.GetChild("listBonus");
             m_btnGuide = (GLoader)comp.GetChild("btnGuide");
             m_txtUnpassTips = (GTextField)comp.GetChild("txtUnpassTips");
             m_groupUnpass = (GGroup)comp.GetChild("groupUnpass");
+            m_loaCost = (GLoader)comp.GetChild("loaCost");
+            m_txtPowerDesc = (GTextField)comp.GetChild("txtPowerDesc");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_ctrlNeed = null;
             m_btnBg = null;
             m_btnStart = null;
+            m_loaderHead = null;
+            m_txtTargetName = null;
             m_txtTitle = null;
             m_txtHighestScore = null;
             m_flower.Dispose();
@@ -122,17 +124,15 @@ namespace UI.Main
             m_txtAdditionDesc = null;
             m_grpAdditionDesc = null;
             m_txtLevelDesc = null;
-            m_loaderHead = null;
-            m_txtTargetName = null;
-            m_loaCost = null;
-            m_txtPowerDesc = null;
+            m_listBonus = null;
             m_btnFightOnce = null;
             m_btnFightTimes = null;
             m_groupPass = null;
-            m_listBonus = null;
             m_btnGuide = null;
             m_txtUnpassTips = null;
             m_groupUnpass = null;
+            m_loaCost = null;
+            m_txtPowerDesc = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using UI.CommonGame;
 using System;
 using ET;
+using UI_ListRewardItem = UI.Main.UI_ListRewardItem;
 
 namespace GFGGame
 {
@@ -162,16 +163,18 @@ namespace GFGGame
         private void UpdateBonusItem(int index, GObject item)
         {
             ItemData itemData = _bonusList[index] as ItemData;
-            UI_ComItem listItem = UI_ComItem.Proxy(item);
-
+            UI_ListRewardItem listItem = UI_ListRewardItem.Proxy(item);
+            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(itemData.id);
+            listItem.m_txtName.text = cfg.name;
+            listItem.m_txtOwner.text = string.Format("已拥有:{0}", ItemDataManager.GetItemNum(itemData.id));
             if (item.data == null)
             {
-                item.data = new ItemView(item as GComponent);
+                item.data = new ItemView(listItem.m_comItem as GComponent);
             }
             (item.data as ItemView).SetData(itemData);
             List<ItemData> bonusOnceData = StoryBonusDataCache.GetBonusData(_levelID).bonusOnce;
             (item.data as ItemView).ImgShouTongVisable = !InstanceZonesDataManager.CheckLevelPass(_levelID) && index < bonusOnceData.Count;
-            UI_ComItem.ProxyEnd();
+            UI_ListRewardItem.ProxyEnd();
         }
 
         private void UpdateBtnFightTimes()

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_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png


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