查阅建档

FGUIProject/assets/Main/StoryLevelInfoUI.xml

@@ -30,12 +30,12 @@
     </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,352" size="132,44" group="n53_rqo4" fontSize="32" color="#a28d77" text="赵钱孙李"/>
-    <component id="n56_hbio" name="btnAdditionDesc" src="hbiofi" fileName="components/Button3.xml" xy="728,341" size="68,61" group="n53_rqo4" aspect="true"/>
+    <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="hbiofj" fileName="images/dz_hz_rwdh_1.png" xy="635,212" pivot="0.5,0" size="445,131" group="n59_hbio"/>
     <text id="n58_hbio" name="txtAdditionDesc" xy="651,212" size="412,107" group="n59_hbio" fontSize="30" color="#805b38" align="center" vAlign="middle" ubb="true" autoSize="none" autoClearText="true" text="孔雀东南飞套装收集进度:(0/1)"/>
     <group id="n59_hbio" name="grpAdditionDesc" xy="635,212" size="445,131" group="n53_rqo4" advanced="true"/>
-    <group id="n53_rqo4" name="n53" xy="387,212" size="693,190" advanced="true">
+    <group id="n53_rqo4" name="n53" xy="387,212" size="693,186" 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="旋律在指尖流转，在天幕中划出一道 起伏的星轨折线谱，爱与星光于此吟 唱。参与限时活动星幕下的奏鸣！"/>

FGUIProject/assets/Main/components/Button3.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="113,102" extention="Button">
+<component size="46,46" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n3_hbio" name="n3" src="wg7t8v" fileName="images/zjm_gndj_2.png" xy="0,0">
+    <image id="n3_hbio" name="n3" src="v482fk" fileName="images/cyjd_zy.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>

FGUIProject/assets/Main/package.xml

@@ -388,6 +388,7 @@
     <image id="rkrwfh" name="dhjm_dianse.png" path="/imagesDialog/"/>
     <component id="hbiofi" name="Button3.xml" path="/components/"/>
     <image id="hbiofj" name="dz_hz_rwdh_1.png" path="/images/" scale="9grid" scale9grid="249,32,73,64"/>
+    <image id="v482fk" name="cyjd_zy.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Studio/StudioFilingUI.xml

@@ -4,27 +4,17 @@
     <loader id="n0_rqo4" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <loader id="n22_hbio" name="loaNpc" xy="275,1604" pivot="0.5,1" anchor="true" size="631,1448" fill="scaleMatchHeight">
-      <relation target="" sidePair="center-center,bottom-bottom"/>
-    </loader>
-    <component id="n21_rqo4" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="43,126">
+    <component id="n21_rqo4" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="10,61">
       <Button icon="ui://eg2y0ldpsi5zti5"/>
     </component>
-    <text id="n1_rqo4" name="txtTitle" xy="390,140" pivot="0.5,0" size="300,54" fontSize="40" vars="true" text="查阅建档-{name=邢慈静}"/>
-    <component id="n2_rqo4" name="btnChange" src="rqo41l" fileName="components/Button1.xml" xy="62,463" size="146,62">
-      <relation target="" sidePair="middle-middle,left-left"/>
-      <Button title="切换角色"/>
-    </component>
-    <component id="n3_rqo4" name="btnReward" src="rqo41m" fileName="components/Button2.xml" xy="874,1335" size="100,92">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-    </component>
-    <component id="n6_rqo4" name="btnAdd" src="rqo41o" fileName="components/Button4.xml" xy="990,1641" size="67,68">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
+    <component id="n2_rqo4" name="btnChange" src="rqo41l" fileName="components/Button1.xml" xy="0,210">
+      <Button title="邢慈静"/>
     </component>
-    <text id="n5_rqo4" name="txtNum" xy="638,1648" size="334,54" fontSize="40" vars="true" text="今日挑战次数：{count=10}">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-    </text>
-    <list id="n14_rqo4" name="list" xy="490,401" size="494,904" lineGap="80" defaultItem="ui://xz8kxrecrqo41t">
+    <image id="n23_v482" name="n23" src="v4822m" fileName="images/cyjd_di_7.png" xy="690,230" group="n24_v482"/>
+    <text id="n5_rqo4" name="txtNum" xy="715,234" size="258,46" group="n24_v482" fontSize="34" color="#9b7f59" vars="true" text="今日挑战次数:{count=10}"/>
+    <component id="n6_rqo4" name="btnAdd" src="rqo41o" fileName="components/Button4.xml" xy="992,235" group="n24_v482"/>
+    <group id="n24_v482" name="grpAdd" xy="690,230" size="364,58"/>
+    <list id="n14_rqo4" name="list" xy="540,998" pivot="0.5,0.5" anchor="true" size="960,1358" lineGap="20" defaultItem="ui://xz8kxrecv4822p" align="center" vAlign="middle" autoClearItems="true">
       <relation target="" sidePair="middle-middle"/>
       <item/>
       <item/>
@@ -32,11 +22,18 @@
       <item/>
       <item/>
     </list>
-    <component id="n4_rqo4" name="btnSuit" src="rqo41n" fileName="components/Button3.xml" xy="0,1609" size="263,102" group="n20_rqo4"/>
-    <text id="n15_rqo4" name="txtSuitName" xy="112,1611" pivot="0.5,0" size="40,54" group="n20_rqo4" fontSize="40" text=""/>
-    <text id="n19_rqo4" name="txtSuitProgress" xy="112,1677" pivot="0.5,0" size="40,54" group="n20_rqo4" fontSize="40" text=""/>
-    <group id="n20_rqo4" name="n20" xy="0,1609" size="263,122" advanced="true">
+    <component id="n3_rqo4" name="btnReward" src="rqo41m" fileName="components/Button2.xml" xy="896,1753">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </component>
+    <component id="n4_rqo4" name="btnSuit" src="rqo41n" fileName="components/Button3.xml" xy="0,1734" group="n20_rqo4"/>
+    <image id="n26_v482" name="n26" src="v4822l" fileName="images/cyjd_di_6.png" xy="150,1830" pivot="0.5,0" anchor="true" group="n20_rqo4"/>
+    <text id="n15_rqo4" name="txtSuitName" xy="150,1762" pivot="0.5,0" anchor="true" size="170,56" group="n20_rqo4" fontSize="42" color="#c7a26d" text="熔金漫纪"/>
+    <text id="n19_rqo4" name="txtSuitProgress" xy="150,1829" pivot="0.5,0" anchor="true" size="83,44" group="n20_rqo4" fontSize="32" color="#d28a79" text="1/10"/>
+    <group id="n20_rqo4" name="n20" xy="0,1734" size="276,186" advanced="true">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </group>
+    <component id="n25_v482" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="79,90">
+      <relation target="" sidePair="right-right,top-top"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/Studio/components/Button1.xml

@@ -1,19 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,20" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+<component size="398,85" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <graph id="n0_rqo4" name="n0" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#F0F0F0" touchable="false">
-      <gearDisplay controller="button" pages="0"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n1_rqo4" name="n1" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#FAFAFA" touchable="false">
-      <gearDisplay controller="button" pages="2"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n2_rqo4" name="n2" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#CCCCCC" touchable="false">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
+    <image id="n3_v482" name="n3" src="v4822c" fileName="images/cyjd_di_4.png" xy="0,0"/>
+    <image id="n4_v482" name="n4" src="v4822g" fileName="images/cyjd_qh.png" xy="305,6"/>
+    <text id="n5_v482" name="title" xy="118,11" pivot="0.5,0.5" size="143,62" font="ui://eg2y0ldpk1kha2" fontSize="46" color="#ad8a58" bold="true" text="刑慈静"/>
   </displayList>
+  <Button/>
 </component>

FGUIProject/assets/Studio/components/Button2.xml

@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,20" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+<component size="141,129" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <graph id="n0_rqo4" name="n0" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#F0F0F0" touchable="false">
-      <gearDisplay controller="button" pages="0"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n1_rqo4" name="n1" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#FAFAFA" touchable="false">
-      <gearDisplay controller="button" pages="2"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n2_rqo4" name="n2" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#CCCCCC" touchable="false">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
+    <image id="n3_v482" name="n3" src="v4822f" fileName="images/cyjd_pfjl.png" xy="0,0"/>
   </displayList>
+  <Button/>
 </component>

FGUIProject/assets/Studio/components/Button3.xml

@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,20" extention="Button">
+<component size="276,186" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <graph id="n0_rqo4" name="n0" xy="0,0" size="100,20" touchable="false" type="rect" lineSize="0" fillColor="#fff0f0f0">
-      <gearDisplay controller="button" pages="0"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <graph id="n1_rqo4" name="n1" xy="0,0" size="100,20" touchable="false" type="rect" lineSize="0" fillColor="#fffafafa">
-      <gearDisplay controller="button" pages="2"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <graph id="n2_rqo4" name="n2" xy="0,0" size="100,20" 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_v482" name="n3" src="v4822d" fileName="images/cyjd_di_5.png" xy="0,0"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/Studio/components/Button4.xml

@@ -1,19 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,20" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+<component size="48,48" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <graph id="n0_rqo4" name="n0" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#F0F0F0" touchable="false">
-      <gearDisplay controller="button" pages="0"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n1_rqo4" name="n1" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#FAFAFA" touchable="false">
-      <gearDisplay controller="button" pages="2"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n2_rqo4" name="n2" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#CCCCCC" touchable="false">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
+    <image id="n3_v482" name="n3" src="v4822e" fileName="images/cyjd_jia.png" xy="3,3">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
   </displayList>
+  <Button/>
 </component>

FGUIProject/assets/Studio/components/ComLevelItem.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="913,254">
+  <displayList>
+    <loader id="n12_v482" name="loaBg" xy="0,0" size="913,254" url="ui://xz8kxrecv4822a" autoSize="true"/>
+    <loader id="n13_v482" name="loaIcon" xy="38,31" size="166,190" url="ui://xz8kxrecv4822h" autoSize="true"/>
+    <text id="n9_rqo4" name="txtName" xy="355,78" pivot="0.5,0" size="190,64" font="ui://eg2y0ldprkrwti1" fontSize="48" color="#b38e5f" bold="true" text="邢慈静-1"/>
+    <component id="n7_rqo4" name="comFlower" src="rqo41r" fileName="components/CompFlower.xml" xy="581,160" size="156,45"/>
+    <image id="n8_rqo4" name="imgLock" src="rbxq4" fileName="images/zhuxian_shuoto.png" xy="421,108" size="71,37" group="n15_v482"/>
+    <image id="n14_v482" name="n14" src="v4822b" fileName="images/cyjd_di_3.png" xy="0,0" group="n15_v482"/>
+    <group id="n15_v482" name="grpLock" xy="0,0" size="913,254"/>
+  </displayList>
+</component>

FGUIProject/assets/Studio/components/CompFlower.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="135,45">
+<component size="156,45">
   <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
-    <image id="n12_s2cc" name="f1" src="rqo41s" fileName="images/zx_jq_djtubiao_1.png" xy="0,0">
+    <image id="n12_s2cc" name="f1" src="rqo41s" fileName="images/zx_jq_djtubiao_1.png" xy="2,0">
       <gearDisplay controller="c1" pages="1,2,3"/>
     </image>
-    <image id="n13_s2cc" name="f2" src="rqo41s" fileName="images/zx_jq_djtubiao_1.png" xy="47,0" size="41,45">
+    <image id="n13_s2cc" name="f2" src="rqo41s" fileName="images/zx_jq_djtubiao_1.png" xy="57,0" size="41,45">
       <gearDisplay controller="c1" pages="2,3"/>
     </image>
-    <image id="n14_s2cc" name="f3" src="rqo41s" fileName="images/zx_jq_djtubiao_1.png" xy="94,0" size="41,45">
+    <image id="n14_s2cc" name="f3" src="rqo41s" fileName="images/zx_jq_djtubiao_1.png" xy="112,0" size="41,45">
       <gearDisplay controller="c1" pages="3"/>
     </image>
   </displayList>

FGUIProject/assets/Studio/components/ListLevel.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="400,114">
-  <controller name="c1" pages="0,,1," selected="1"/>
-  <displayList>
-    <image id="n8_rqo4" name="imgLock" src="rbxq4" fileName="images/zhuxian_shuoto.png" xy="67,0" group="n10_rqo4"/>
-    <component id="n7_rqo4" name="comFlower" src="rqo41r" fileName="components/CompFlower.xml" xy="35,69" group="n10_rqo4"/>
-    <text id="n9_rqo4" name="txtName" xy="20,27" pivot="0.5,0" size="165,54" group="n10_rqo4" fontSize="40" text="邢慈静-1"/>
-    <group id="n10_rqo4" name="grpComLevel" xy="20,0" size="165,114" advanced="true">
-      <gearXY controller="c1" pages="0,1" values="200,0|20,0"/>
-    </group>
-  </displayList>
-</component>

FGUIProject/assets/Studio/components/ListLevelItem.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="960,254">
+  <controller name="c1" pages="0,,1," selected="1"/>
+  <displayList>
+    <loader id="n29_v482" name="loaBg" xy="47,0" pivot="0.5,0" size="913,254" group="n42_v482" scale="-1,1" url="ui://xz8kxrecv4822a" autoSize="true">
+      <gearXY controller="c1" pages="1" values="47,0" default="0,0"/>
+      <gearSize controller="c1" pages="1" values="913,254,-1,1" default="913,254,1,1"/>
+    </loader>
+    <loader id="n30_v482" name="loaIcon" xy="744,32" size="166,190" group="n42_v482" url="ui://xz8kxrecv4822h" autoSize="true">
+      <gearXY controller="c1" pages="0,1" values="38,32|744,32"/>
+    </loader>
+    <text id="n31_v482" name="txtName" xy="408,78" pivot="0.5,0" size="190,64" group="n42_v482" font="ui://eg2y0ldprkrwti1" fontSize="48" color="#b38e5f" bold="true" text="邢慈静-1">
+      <gearXY controller="c1" pages="1" values="408,78" default="355,78"/>
+    </text>
+    <component id="n32_v482" name="comFlower" src="rqo41r" fileName="components/CompFlower.xml" xy="212,160" size="156,45" group="n42_v482">
+      <gearXY controller="c1" pages="1" values="212,160" default="581,160"/>
+    </component>
+    <image id="n33_v482" name="imgLock" src="rbxq4" fileName="images/zhuxian_shuoto.png" xy="468,108" size="71,37" group="n35_v482"/>
+    <image id="n34_v482" name="n34" src="v4822b" fileName="images/cyjd_di_3.png" xy="47,0" pivot="0.5,0" group="n35_v482" scale="-1,1">
+      <gearSize controller="c1" pages="1" values="913,254,-1,1" default="913,254,1,1"/>
+    </image>
+    <group id="n35_v482" name="grpLock" xy="47,0" size="913,254" group="n42_v482" advanced="true">
+      <gearXY controller="c1" pages="1" values="47,0" default="0,0"/>
+    </group>
+    <group id="n42_v482" name="n42" xy="47,0" size="913,254"/>
+  </displayList>
+</component>

FGUIProject/assets/Studio/package.xml

@@ -42,7 +42,6 @@
     <component id="rqo41q" name="Button5.xml" path="/components/"/>
     <component id="rqo41r" name="CompFlower.xml" path="/components/"/>
     <image id="rqo41s" name="zx_jq_djtubiao_1.png" path="/images/"/>
-    <component id="rqo41t" name="ListLevel.xml" path="/components/"/>
     <component id="hbio1u" name="ListNpcItem.xml" path="/components/"/>
     <component id="hbio1v" name="ComNpcItemSelect.xml" path="/components/" exported="true"/>
     <image id="orst1w" name="dndn_dih.png" path="/images/"/>
@@ -57,6 +56,23 @@
     <image id="pu5525" name="dndn_xzk.png" path="/components/"/>
     <component id="pu5526" name="ComIcon.xml" path="/components/"/>
     <image id="ng0i27" name="xunxiang.png" path="/images/"/>
+    <image id="v48228" name="xingcijing_4.png" path="/images/" exported="true"/>
+    <image id="v48229" name="cyjd_di_1.png" path="/images/" exported="true"/>
+    <image id="v4822a" name="cyjd_di_2.png" path="/images/" exported="true"/>
+    <image id="v4822b" name="cyjd_di_3.png" path="/images/"/>
+    <image id="v4822c" name="cyjd_di_4.png" path="/images/"/>
+    <image id="v4822d" name="cyjd_di_5.png" path="/images/"/>
+    <image id="v4822e" name="cyjd_jia.png" path="/images/"/>
+    <image id="v4822f" name="cyjd_pfjl.png" path="/images/"/>
+    <image id="v4822g" name="cyjd_qh.png" path="/images/"/>
+    <image id="v4822h" name="xingcijing_0.png" path="/images/" exported="true"/>
+    <image id="v4822i" name="xingcijing_1.png" path="/images/" exported="true"/>
+    <image id="v4822j" name="xingcijing_2.png" path="/images/" exported="true"/>
+    <image id="v4822k" name="xingcijing_3.png" path="/images/" exported="true"/>
+    <image id="v4822l" name="cyjd_di_6.png" path="/images/"/>
+    <image id="v4822m" name="cyjd_di_7.png" path="/images/"/>
+    <component id="v4822n" name="ComLevelItem.xml" path="/components/"/>
+    <component id="v4822p" name="ListLevelItem.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Studio" packageCount="2" genCode="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListLevel.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListLevelItem.cs

@@ -4,22 +4,24 @@ using FairyGUI;
 
 namespace UI.Studio
 {
-    public partial class UI_ListLevel
+    public partial class UI_ListLevelItem
     {
         public GComponent target;
         public Controller m_c1;
-        public GImage m_imgLock;
-        public UI_CompFlower m_comFlower;
+        public GLoader m_loaBg;
+        public GLoader m_loaIcon;
         public GTextField m_txtName;
-        public GGroup m_grpComLevel;
-        public const string URL = "ui://xz8kxrecrqo41t";
+        public UI_CompFlower m_comFlower;
+        public GImage m_imgLock;
+        public GGroup m_grpLock;
+        public const string URL = "ui://xz8kxrecv4822p";
         public const string PACKAGE_NAME = "Studio";
-        public const string RES_NAME = "ListLevel";
-        private static UI_ListLevel _proxy;
+        public const string RES_NAME = "ListLevelItem";
+        private static UI_ListLevelItem _proxy;
 
-        public static UI_ListLevel Create(GObject gObject = null)
+        public static UI_ListLevelItem Create(GObject gObject = null)
         {
-            var ui = new UI_ListLevel();
+            var ui = new UI_ListLevelItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -28,11 +30,11 @@ namespace UI.Studio
             return ui;
         }
 
-        public static UI_ListLevel Proxy(GObject gObject = null)
+        public static UI_ListLevelItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListLevel();
+                _proxy = new UI_ListLevelItem();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -60,19 +62,23 @@ namespace UI.Studio
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_imgLock = (GImage)comp.GetChild("imgLock");
-            m_comFlower = (UI_CompFlower)UI_CompFlower.Create(comp.GetChild("comFlower"));
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_grpComLevel = (GGroup)comp.GetChild("grpComLevel");
+            m_comFlower = (UI_CompFlower)UI_CompFlower.Create(comp.GetChild("comFlower"));
+            m_imgLock = (GImage)comp.GetChild("imgLock");
+            m_grpLock = (GGroup)comp.GetChild("grpLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_imgLock = null;
+            m_loaBg = null;
+            m_loaIcon = null;
+            m_txtName = null;
             m_comFlower.Dispose();
             m_comFlower = null;
-            m_txtName = null;
-            m_grpComLevel = null;
+            m_imgLock = null;
+            m_grpLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListLevel.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListLevelItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 79a23737d949391499308f7b888fd73b
+guid: 986b3dc77d6d72a489b1bc56a30ce90d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioFilingUI.cs

@@ -8,17 +8,16 @@ namespace UI.Studio
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GLoader m_loaNpc;
         public GButton m_btnBack;
-        public GTextField m_txtTitle;
         public GButton m_btnChange;
-        public GButton m_btnReward;
-        public GButton m_btnAdd;
         public GTextField m_txtNum;
+        public GButton m_btnAdd;
         public GList m_list;
+        public GButton m_btnReward;
         public GButton m_btnSuit;
         public GTextField m_txtSuitName;
         public GTextField m_txtSuitProgress;
+        public GComponent m_comValueBar;
         public const string URL = "ui://xz8kxrecrqo41i";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioFilingUI";
@@ -67,32 +66,30 @@ namespace UI.Studio
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_loaNpc = (GLoader)comp.GetChild("loaNpc");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_btnChange = (GButton)comp.GetChild("btnChange");
-            m_btnReward = (GButton)comp.GetChild("btnReward");
-            m_btnAdd = (GButton)comp.GetChild("btnAdd");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
+            m_btnAdd = (GButton)comp.GetChild("btnAdd");
             m_list = (GList)comp.GetChild("list");
+            m_btnReward = (GButton)comp.GetChild("btnReward");
             m_btnSuit = (GButton)comp.GetChild("btnSuit");
             m_txtSuitName = (GTextField)comp.GetChild("txtSuitName");
             m_txtSuitProgress = (GTextField)comp.GetChild("txtSuitProgress");
+            m_comValueBar = (GComponent)comp.GetChild("comValueBar");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_loaNpc = null;
             m_btnBack = null;
-            m_txtTitle = null;
             m_btnChange = null;
-            m_btnReward = null;
-            m_btnAdd = null;
             m_txtNum = null;
+            m_btnAdd = null;
             m_list = null;
+            m_btnReward = null;
             m_btnSuit = null;
             m_txtSuitName = null;
             m_txtSuitProgress = null;
+            m_comValueBar = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -9,11 +9,17 @@ namespace GFGGame
     public class StudioFilingView : BaseWindow
     {
         private UI_StudioFilingUI _ui;
+        private ValueBarController _valueBarController;
         private StudioCfg _filingCfg;
         private List<StoryLevelCfg> _storyLevelCfgs;
 
         public override void Dispose()
         {
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -29,6 +35,7 @@ namespace GFGGame
             _ui = UI_StudioFilingUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.onClickItem.Add(OnListItemClick);
@@ -39,7 +46,6 @@ namespace GFGGame
             _ui.m_btnAdd.onClick.Add(OnBtnAddClick);
             _ui.m_btnSuit.onClick.Add(OnBtnSuitClick);
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tc_bjbj");
 
         }
         protected override void AddEventListener()
@@ -55,12 +61,16 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _valueBarController.OnShown();
+
             UpdateView();
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            _valueBarController.OnHide();
+
             ViewManager.GoBackFrom(typeof(StudioFilingView).FullName);
         }
 
@@ -80,8 +90,8 @@ namespace GFGGame
             StudioData studioData = StudioDataManager.Instance.GetStudioDataById(StudioDataManager.Instance.filingChapterId);
 
             _filingCfg = StudioCfgArray.Instance.GetCfg(StudioDataManager.Instance.filingChapterId);
-            _ui.m_txtTitle.SetVar("name", _filingCfg.name).FlushVars();
-            _ui.m_loaNpc.url = ResPathUtil.GetNpcPicFPath(_filingCfg.res);
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_filingCfg.res);
+            _ui.m_btnChange.title = _filingCfg.name;
             _ui.m_txtNum.text = string.Format("剩余次数：{0}/{1}", studioData.TotalPlayTimes - studioData.PlayTimes, _filingCfg.num);
 
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_filingCfg.suitId);
@@ -98,15 +108,19 @@ namespace GFGGame
 
         private void RenderListItem(int index, GObject obj)
         {
-            int _index = _storyLevelCfgs.Count - index - 1;
-            UI_ListLevel item = UI_ListLevel.Proxy(obj);
-            item.m_c1.selectedIndex = _index % 2;
-            item.m_txtName.text = _storyLevelCfgs[_index].name;
-            item.m_imgLock.visible = _index > 0 && !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[_index - 1].id);
-            item.m_comFlower.m_c1.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(_storyLevelCfgs[_index].id);
-            item.target.data = _index;// _storyLevelCfgs[_index];
-            UI_ListLevel.ProxyEnd();
+            // int _index = _storyLevelCfgs.Count - index - 1;
+            UI_ListLevelItem item = UI_ListLevelItem.Proxy(obj);
+            item.m_c1.selectedIndex = index % 2 == 0 ? 0 : 1;
+            item.m_txtName.text = _storyLevelCfgs[index].name;
+            string resBg = string.IsNullOrEmpty(_storyLevelCfgs[index].storyStartID) ? "cyjd_di_1" : "cyjd_di_2";
+            item.m_loaBg.url = string.Format("ui://Studio/{0}", resBg);
+            item.m_loaIcon.url = string.Format("ui://Studio/{0}_{1}", _filingCfg.res, index);
+            item.m_grpLock.visible = index > 0 && !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index - 1].id);
+            item.m_comFlower.m_c1.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(_storyLevelCfgs[index].id);
+            item.target.data = index;// _storyLevelCfgs[_index];
+            UI_ListLevelItem.ProxyEnd();
         }
+
         private void OnListItemClick(EventContext context)
         {
             GObject obj = context.data as GObject;

GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_1.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 03746e8506b4e2e4f9ea1ee6340c0561
+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: 

GameClient/Assets/ThirdParty/Live2D/Cubism/Core/CubismModel.cs

@@ -402,7 +402,7 @@ namespace Live2D.Cubism.Core
         }
 #endif
 
-#region Unity Event Handling
+        #region Unity Event Handling
 
         /// <summary>
         /// Called by Unity. Triggers <see langword="this"/> to update.
@@ -445,7 +445,7 @@ namespace Live2D.Cubism.Core
             TaskableModel.TryReadParameters(Parameters);
 
             // restore last frame parameters value and parts opacity.
-            if(_parameterStore != null)
+            if (_parameterStore != null)
             {
                 _parameterStore.RestoreParameters();
             }
@@ -576,6 +576,6 @@ namespace Live2D.Cubism.Core
             OnEnable();
         }
 
-#endregion
+        #endregion
     }
 }

GameClient/ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: gfg
-  productName: "\u4E07\u4E16\u955C_local"
+  productName: "\u4E07\u4E16\u955C_Debug"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1}
@@ -164,7 +164,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.shenyou.gfg.local
+    Android: com.shenyou.gfg.local1
     Standalone: com.DefaultCompany.GFGClient
   buildNumber:
     Standalone: 0