Merge remote-tracking branch 'remotes/origin/master' into zhaoyang

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
#	GameClient/Assets/ResIn/UI/Main/Main_fui.bytes
#	GameClient/Assets/Scenes/GameLauncher.unity

FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1709" overflow="hidden" opaque="false">
-  <controller name="ctrlFullStar" pages="0,,1," selected="0"/>
+  <controller name="ctrlFullStar" pages="0,,1," selected="1"/>
   <controller name="ctrlFullLv" pages="0,,1," selected="0"/>
-  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="2"/>
+  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="1"/>
   <displayList>
     <image id="n70_lc71" name="n70" src="842s6e" fileName="images/kp_bj_2.png" xy="0,209"/>
     <component id="n67_lc71" name="btnStory" src="ojlzl" fileName="components/btnStory.xml" xy="791,621"/>
@@ -16,15 +16,16 @@
       <property target="title" propertyId="0" value="升级"/>
     </component>
     <component id="n18_ojlz" name="btnStar" src="ojlzr" fileName="components/btnTab.xml" xy="422,1044" group="n22_842s">
-      <Button controller="ctrlTab" page="1"/>
+      <Button checked="true" controller="ctrlTab" page="1"/>
       <property target="title" propertyId="0" value="升星"/>
     </component>
     <component id="n19_ojlz" name="btnSkill" src="ojlzr" fileName="components/btnTab.xml" xy="708,1044" group="n22_842s">
-      <Button checked="true" controller="ctrlTab" page="2"/>
+      <Button controller="ctrlTab" page="2"/>
       <property target="title" propertyId="0" value="技能"/>
     </component>
     <group id="n22_842s" name="grpTab" xy="136,1044" size="808,66" advanced="true" layout="hz" colGap="50" excludeInvisibles="true"/>
-    <list id="n4_ojlz" name="listProperty" xy="169,1148" size="819,68" layout="row" colGap="10" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
+    <list id="n4_ojlz" name="listProperty" xy="169,1120" size="819,68" layout="row" colGap="10" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
+      <gearDisplay controller="ctrlTab" pages="0,1"/>
       <item/>
       <item/>
       <item/>
@@ -70,34 +71,45 @@
     <group id="n38_842s" name="grpLv" xy="117,1224" size="902,423" advanced="true">
       <gearDisplay controller="ctrlTab" pages="0"/>
     </group>
-    <image id="n48_wr9a" name="n48" src="a7137b" fileName="images/kp_dikuang_7.png" xy="78,1221" size="924,72" group="n55_l2by"/>
-    <component id="n50_wr9a" name="comStar" src="wr9a85" fileName="components/ComBigStar.xml" xy="339,1226" group="n55_l2by"/>
-    <text id="n59_l2by" name="n59" xy="540,1325" pivot="0.5,0" anchor="true" size="319,54" group="n55_l2by" fontSize="40" color="#736b64" text="已提升至最高等级">
-      <gearDisplay controller="ctrlFullStar" pages="1"/>
-    </text>
-    <list id="n47_wr9a" name="listStarConsume" xy="102,1307" size="876,196" group="n57_l2by" layout="row" colGap="166" defaultItem="ui://7l6lvkaywr9a82" align="center">
-      <item/>
+    <component id="n88_v461" name="comStarItem0" src="v461ad" fileName="components/ComStarItem.xml" xy="71,1224" group="n92_v461"/>
+    <component id="n89_v461" name="comStarItem1" src="v461ad" fileName="components/ComStarItem.xml" xy="225,1224" group="n92_v461"/>
+    <component id="n90_v461" name="comStarItem2" src="v461ad" fileName="components/ComStarItem.xml" xy="379,1224" group="n92_v461"/>
+    <component id="n91_v461" name="comStarItem3" src="v461ad" fileName="components/ComStarItem.xml" xy="533,1224" group="n92_v461"/>
+    <group id="n92_v461" name="n92" xy="71,1224" size="596,416" group="n55_l2by" advanced="true" layout="hz" colGap="20" excludeInvisibles="true">
+      <gearDisplay controller="ctrlFullStar" pages="0"/>
+    </group>
+    <text id="n82_v461" name="n82" xy="710,1217" size="152,42" group="n85_v461" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#ffebc1" text="当前星级："/>
+    <text id="n83_v461" name="txtCurStar" xy="863,1218" size="23,42" group="n85_v461" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#c5645a" text="0"/>
+    <text id="n84_v461" name="txtAllStar" xy="887,1218" size="57,42" group="n85_v461" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#ffebc1" vars="true" text="/{value=20}"/>
+    <image id="n81_v461" name="n81" src="wr9a7z" fileName="images/kp_xingx.png" xy="952,1210" group="n85_v461"/>
+    <group id="n85_v461" name="n85" xy="710,1210" size="304,56" group="n93_v461" advanced="true"/>
+    <list id="n47_wr9a" name="listStarConsume" xy="672,1288" pivot="0.5,0" size="378,196" group="n57_l2by" scale="0.8,0.8" layout="row" colGap="40" defaultItem="ui://7l6lvkaywr9a82" align="center">
       <item/>
       <item/>
     </list>
-    <component id="n51_l2by" name="comStarCousumeGold" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="395,1506" size="289,42" group="n57_l2by"/>
-    <component id="n52_l2by" name="btnUpStar" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="405,1573" size="270,74" group="n57_l2by">
+    <component id="n51_l2by" name="comStarCousumeGold" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="717,1478" size="289,42" group="n79_v461"/>
+    <component id="n52_l2by" name="btnUpStar" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="727,1533" size="270,74" group="n79_v461">
       <Button title="升星"/>
     </component>
-    <component id="n56_l2by" name="comTips" src="l2by86" fileName="components/ComTips.xml" pkg="eg2y0ldp" xy="622,1546" group="n57_l2by"/>
-    <group id="n57_l2by" name="n57" xy="102,1307" size="876,340" group="n55_l2by" advanced="true">
+    <component id="n56_l2by" name="comTips" src="l2by86" fileName="components/ComTips.xml" pkg="eg2y0ldp" xy="826,1504" group="n79_v461"/>
+    <group id="n79_v461" name="n79" xy="717,1478" size="289,129" group="n57_l2by"/>
+    <group id="n57_l2by" name="n57" xy="672,1288" size="378,319" group="n93_v461"/>
+    <group id="n93_v461" name="n93" xy="672,1210" size="378,397" group="n55_l2by" advanced="true">
       <gearDisplay controller="ctrlFullStar" pages="0"/>
     </group>
+    <text id="n59_l2by" name="n59" xy="540,1325" pivot="0.5,0" anchor="true" size="319,54" group="n55_l2by" fontSize="40" color="#736b64" text="已提升至最高等级">
+      <gearDisplay controller="ctrlFullStar" pages="1"/>
+    </text>
     <list id="n64_l2by" name="listShowCard" xy="11,1382" size="1056,274" group="n55_l2by" layout="row" colGap="100" defaultItem="ui://7l6lvkayl2by89" align="center">
       <gearDisplay controller="ctrlFullStar" pages="1"/>
       <item/>
       <item/>
       <item/>
     </list>
-    <group id="n55_l2by" name="grpStar" xy="11,1221" size="1056,435" advanced="true">
+    <group id="n55_l2by" name="grpStar" xy="11,1210" size="1056,446" advanced="true">
       <gearDisplay controller="ctrlTab" pages="1"/>
     </group>
-    <list id="n77_rhha" name="listSkill" xy="76,1241" size="928,412" overflow="scroll" lineGap="25" defaultItem="ui://7l6lvkayrhha9k">
+    <list id="n77_rhha" name="listSkill" xy="76,1140" size="928,505" lineGap="25" defaultItem="ui://7l6lvkayrhha9k">
       <gearDisplay controller="ctrlTab" pages="2"/>
       <item/>
       <item/>

FGUIProject/assets/Card/components/ComSkill.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="170,170" mask="n75_rhha">
+<component size="124,124" mask="n79_v461">
   <displayList>
-    <loader id="n78_rhha" name="loaSkill" xy="-32,-61" size="234,432" url="ui://7l6lvkayr9ri9x" autoSize="true">
+    <loader id="n78_rhha" name="loaSkill" xy="-55,-61" size="234,432" url="ui://7l6lvkayr9ri9x" autoSize="true">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n75_rhha" name="n75" src="wr9a7r" fileName="images/kp_jnkuang_1.png" xy="10,10" size="150,150" aspect="true">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
+    <graph id="n79_v461" name="n79" xy="0,0" size="124,124" type="eclipse" lineSize="0"/>
   </displayList>
 </component>

FGUIProject/assets/Card/components/ComStarItem.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="134,416">
+  <controller name="c1" pages="0,,1,,2,,3,,4,,5," selected="5"/>
+  <displayList>
+    <image id="n86_v461" name="n86" src="v461a8" fileName="images/kpkp_cipziddi.png" xy="0,-22" size="134,530">
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <text id="n93_v461" name="txtContent" xy="42,5" size="51,401" font="ui://eg2y0ldpwonotj9" fontSize="47" color="#9a7957" leading="0" autoSize="height" text="春眠不觉晓春眠"/>
+    <image id="n91_v461" name="n91" src="v461a7" fileName="images/kpkp_cipziz_5.png" xy="29,0" size="76,416" group="n92_v461">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <image id="n87_v461" name="n87" src="v461a9" fileName="images/kpkp_cipziz_1.png" xy="29,24" size="76,392" group="n92_v461">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <image id="n88_v461" name="n88" src="v461aa" fileName="images/kpkp_cipziz_2.png" xy="29,24" size="76,392" group="n92_v461">
+      <gearDisplay controller="c1" pages="2"/>
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <image id="n89_v461" name="n89" src="v461ab" fileName="images/kpkp_cipziz_3.png" xy="29,24" size="76,392" group="n92_v461">
+      <gearDisplay controller="c1" pages="3"/>
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <image id="n90_v461" name="n90" src="v461ac" fileName="images/kpkp_cipziz_4.png" xy="29,28" size="76,388" group="n92_v461">
+      <gearDisplay controller="c1" pages="4"/>
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <group id="n92_v461" name="n92" xy="29,0" size="76,416"/>
+  </displayList>
+  <relation target="n93_v461" sidePair="height-height"/>
+</component>

FGUIProject/assets/Card/components/ListCardItem.xml

@@ -5,9 +5,10 @@
     <image id="n20_pq5x" name="n20" src="pq5x60" fileName="images/kp_dikuang_1.png" xy="2,342"/>
     <loader id="n23_94m1" name="loaBorder" xy="-2,-2" size="242,441" url="ui://7l6lvkay94m19w" autoSize="true"/>
     <loader id="n19_pq5x" name="loaRarity" xy="178,14" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <text id="n8_ojlz" name="txtLv" xy="170,387" size="58,34" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30级"/>
-    <text id="n9_ojlz" name="txtName" xy="45,432" pivot="0.5,0" size="148,49" fontSize="36" color="#6a5d56" text="赵钱孙里"/>
-    <component id="n18_ojlz" name="comStar" src="ojlzh" fileName="components/ComStar.xml" pkg="eg2y0ldp" xy="10,397" controller="c1,2"/>
+    <text id="n8_ojlz" name="txtLv" xy="170,394" size="55,34" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30级"/>
+    <text id="n9_ojlz" name="txtName" xy="46,432" pivot="0.5,0" size="146,49" fontSize="36" color="#6a5d56" text="赵钱孙里"/>
     <loader id="n24_qr4e" name="loaMainScore" xy="20,21" size="46,46" aspect="true" url="ui://eg2y0ldp842s6h" fill="scaleMatchWidth"/>
+    <image id="n25_v461" name="n25" src="pq5x64" fileName="imagesExport/kp_xingx.png" pkg="eg2y0ldp" xy="200,373"/>
+    <text id="n26_v461" name="txtStarLv" xy="170,369" pivot="1,0" size="32,34" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30"/>
   </displayList>
 </component>

FGUIProject/assets/Card/components/ListSkillItem.xml

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="928,163">
+<component size="928,151">
   <displayList>
-    <image id="n74_rhha" name="n74" src="wr9a7q" fileName="images/kp_jndik_1.png" xy="0,0" size="928,163"/>
+    <image id="n74_rhha" name="n74" src="v461a6" fileName="images/kp_jnditptp.png" xy="0,0"/>
     <component id="n76_rhha" name="btnUp" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="659,46" size="230,70">
       <Button title="升级"/>
     </component>
-    <text id="n81_rhha" name="txtName" xy="247,58" size="146,49" fontSize="36" color="#60544e" align="center" vAlign="middle" text="名字名字"/>
-    <component id="n75_rhha" name="comSkill" src="rhha9l" fileName="components/ComSkill.xml" xy="38,6" size="165,165" group="n82_f2bf" scale="0.91,0.91"/>
-    <image id="n79_rhha" name="n79" src="wr9a7r" fileName="images/kp_jnkuang_1.png" xy="38,5" size="150,150" group="n82_f2bf" aspect="true"/>
-    <image id="n77_rhha" name="n77" src="wr9a7o" fileName="images/kp_dengj_1.png" xy="114,125" group="n82_f2bf"/>
-    <text id="n80_rhha" name="txtLv" xy="131,125" pivot="0.5,0" size="41,34" group="n82_f2bf" fontSize="24" color="#fdf9e7" align="center" text="1级"/>
-    <group id="n82_f2bf" name="n82" xy="38,5" size="165,166"/>
+    <text id="n81_rhha" name="txtName" xy="197,21" size="132,44" font="ui://eg2y0ldpwonotjc" fontSize="32" color="#554a45" align="center" vAlign="middle" text="名字名字"/>
+    <component id="n75_rhha" name="comSkill" src="rhha9l" fileName="components/ComSkill.xml" xy="40,18" group="n82_f2bf" scale="0.91,0.91"/>
+    <image id="n79_rhha" name="n79" src="wr9a7r" fileName="images/kp_jnkuang_1.png" xy="35,12" size="124,124" group="n82_f2bf" aspect="true"/>
+    <image id="n77_rhha" name="n77" src="wr9a7o" fileName="images/kp_dengj_1.png" xy="93,114" group="n82_f2bf"/>
+    <text id="n80_rhha" name="txtLv" xy="107,111" pivot="0.5,0" size="41,34" group="n82_f2bf" fontSize="24" color="#fdf9e7" align="center" text="1级"/>
+    <group id="n82_f2bf" name="n82" xy="35,12" size="130,133"/>
+    <text id="n83_v461" name="txtDesc" xy="200,65" size="431,73" font="ui://eg2y0ldpwonotjc" fontSize="26" color="#71635d" vAlign="middle" autoSize="none" text="每回合结束均有4.5%概率立即获得主属性22.2%的分数"/>
   </displayList>
 </component>

FGUIProject/assets/Card/package.xml

@@ -104,6 +104,14 @@
     <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/"/>
+    <image id="v461a6" name="kp_jnditptp.png" path="/images/"/>
+    <image id="v461a7" name="kpkp_cipziz_5.png" path="/images/" scale="9grid" scale9grid="19,90,38,180"/>
+    <image id="v461a8" name="kpkp_cipziddi.png" path="/images/" scale="9grid" scale9grid="33,118,66,236"/>
+    <image id="v461a9" name="kpkp_cipziz_1.png" path="/images/" scale="9grid" scale9grid="19,247,38,46"/>
+    <image id="v461aa" name="kpkp_cipziz_2.png" path="/images/" scale="9grid" scale9grid="19,275,38,29"/>
+    <image id="v461ab" name="kpkp_cipziz_3.png" path="/images/" scale="9grid" scale9grid="19,273,38,34"/>
+    <image id="v461ac" name="kpkp_cipziz_4.png" path="/images/" scale="9grid" scale9grid="18,299,38,12"/>
+    <component id="v461ad" name="ComStarItem.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Card" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/components/ComCostCurrencyWithHas.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="280,42">
   <displayList>
-    <text id="n2_ojlz" name="n2" xy="7,0" size="65,42" group="n12_nasr" fontSize="30" color="#7d634a" autoSize="none" text="消耗"/>
+    <text id="n2_ojlz" name="n2" xy="7,1" size="65,42" group="n12_nasr" fontSize="30" color="#ebdfcb" autoSize="none" text="消耗"/>
     <loader id="n1_ojlz" name="loaIcon" xy="82,-9" size="60,60" group="n12_nasr" url="ui://eg2y0ldpq08x3" autoSize="true"/>
-    <text id="n11_r9ri" name="txtCount" xy="152,0" size="121,42" group="n12_nasr" fontSize="30" color="#fdeed4" vAlign="middle" ubb="true" autoClearText="true" text="999/999"/>
+    <text id="n11_r9ri" name="txtCount" xy="152,1" size="121,41" group="n12_nasr" fontSize="30" color="#fdeed4" vAlign="middle" ubb="true" autoClearText="true" text="999/999"/>
     <group id="n12_nasr" name="n12" xy="7,-9" size="266,60" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>

FGUIProject/assets/CommonGame/components/ComTips.xml

@@ -5,7 +5,7 @@
       <relation target="" sidePair="left-left"/>
       <relation target="n54_l2by" sidePair="width-width,height-height"/>
     </image>
-    <text id="n54_l2by" name="txtTips" xy="4,2" size="160,34" fontSize="24" color="#a27b56" vars="true" text="花费{v1=1000}{v2=金币}">
+    <text id="n54_l2by" name="txtTips" xy="4,2" size="154,34" fontSize="24" color="#a27b56" vars="true" text="花费{v1=1000}{v2=金币}">
       <relation target="" sidePair="left-left"/>
     </text>
   </displayList>

FGUIProject/assets/CommonGame/components/ListPropertyItem.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="170,58" overflow="hidden">
   <displayList>
-    <text id="n5_ojlz" name="txtProperty" xy="59,7" size="103,44" fontSize="32" color="#7d6956" ubb="true" text="66666"/>
+    <text id="n5_ojlz" name="txtProperty" xy="59,7" size="96,44" fontSize="32" color="#7d6956" ubb="true" text="66666"/>
     <loader id="n6_ojlz" name="loaIcon" xy="0,0" size="58,58" url="ui://eg2y0ldp842s6h" autoSize="true"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ListCardItem.xml

@@ -4,15 +4,18 @@
   <displayList>
     <component id="n9_wzce" name="comCardMask" src="wzce9v" fileName="components/ComCardMask.xml" xy="0,1"/>
     <image id="n8_sx2v" name="n8" src="sx2v9s" fileName="imagesStory/zd_tctcdikugn_1.png" xy="1,154"/>
-    <text id="n3_r1a9" name="txtName" xy="55,228" size="105,46" fontSize="34" color="#6a5d56" text="赵钱孙"/>
+    <text id="n3_r1a9" name="txtName" xy="55,228" size="103,46" fontSize="34" color="#6a5d56" text="赵钱孙"/>
     <component id="n11_wzce" name="comStar" src="ojlzh" fileName="components/ComStar.xml" pkg="eg2y0ldp" xy="10,196"/>
-    <text id="n12_wzce" name="txtLv" xy="169,170" pivot="0.5,0" size="39,56" fontSize="24" color="#fff9f1" leading="-8" ubb="true" vars="true" text="Lv.&#xA;30"/>
+    <text id="n12_wzce" name="txtLv" xy="170,170" pivot="0.5,0" size="36,56" fontSize="24" color="#fff9f1" leading="-8" ubb="true" vars="true" text="Lv.&#xA;30"/>
     <loader id="n7_sx2v" name="loaRarity" xy="162,10" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <loader id="n16_qr4e" name="loaMainScore" xy="9,11" size="46,46" aspect="true" url="ui://eg2y0ldp842s6h" fill="scaleMatchHeight"/>
     <image id="n15_dcro" name="n15" src="sx2v9t" fileName="imagesStory/zd_tctcdikugn_2.png" xy="-1,0"/>
     <graph id="n13_dcro" name="holder" xy="107,114" size="1,1" touchable="false" type="rect">
       <gearDisplay controller="button" pages="1"/>
     </graph>
+    <image id="n17_v461" name="n17" src="pq5x64" fileName="imagesExport/kp_xingx.png" pkg="eg2y0ldp" xy="4,197" group="n19_v461"/>
+    <text id="n18_v461" name="txtStarLv" xy="30,193" pivot="1,0" size="32,34" group="n19_v461" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30"/>
+    <group id="n19_v461" name="n19" xy="4,193" size="58,34" advanced="true" layout="hz" excludeInvisibles="true"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

GameClient/Assets/Editor/ArtsRes/DeleteFileHelper.cs

@@ -0,0 +1,45 @@
+using System.Collections.Generic;
+using UnityEngine;
+using GFGGame;
+using System.IO;
+using System.Text;
+using UnityEditor;
+
+namespace GFGEditor
+{
+    public class DeleteFileHelper
+    {
+        private static List<string> DeleteList = new List<string>();
+
+        public static void AddFile(string path)
+        {
+            DeleteList.Add(path);
+        }
+
+        public static void TrySvnRemoveDeleteFile()
+        {
+            var stringBuilder = new StringBuilder();
+            //Debug.Log("svnDelteFile");
+            foreach (var deleteFile in DeleteList)
+            {
+                if(File.Exists(deleteFile))
+                {
+                    continue;
+                }
+                string deleteFile1 = deleteFile.Replace($"{ResPathUtil.RES_ROOT_DIR_PATH}/", "");
+                //Debug.Log($"deleteFile1 {deleteFile1}");
+                stringBuilder.AppendLine($"svn rm {deleteFile1}");
+                stringBuilder.AppendLine($"svn rm {deleteFile1}.meta");
+            }
+            //stringBuilder.AppendLine("pause");
+
+            var batFileName = "removeFiles.bat";
+            var batDirPath = ResPathUtil.RES_ROOT_DIR_PATH + "/";
+            var batFile = batDirPath + batFileName;
+            File.WriteAllText(batFile, stringBuilder.ToString());
+            AssetDatabase.Refresh();
+            ProcessUtil.ExcuteBat(batDirPath, batFileName);
+            DeleteList.Clear();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComBigStar.cs.meta → GameClient/Assets/Editor/ArtsRes/DeleteFileHelper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 448169b58a009534ca621e5cf44da1fc
+guid: 75286febcf975a7469a9005d3a62142f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Editor/FileUtil.cs → GameClient/Assets/Editor/ArtsRes/FileUtil.cs

@@ -253,7 +253,7 @@ namespace GFGEditor
         }
 
         //清除无资源的Md5数据
-        public static void DeleteUnnecessaryImageMD5(string[] saveNames)
+        private static void DeleteUnnecessaryImageMD5(string[] saveNames)
         {
             for (int j = 0; j < saveNames.Length; j++)
             {
@@ -276,7 +276,7 @@ namespace GFGEditor
                 ImagesClip.WriteSourceImagesMD5(sourceResMD5, saveName);
             }
         }
-        public static void DeleteUnnecessaryImageRes(string targetPath, string[] saveNames)
+        private static void DeleteUnnecessaryImageRes(string targetPath, string[] saveNames)
         {
             string[] includeExtensionNames = new string[] { ".png", ".jpg" };
             if (!Directory.Exists(targetPath))
@@ -318,12 +318,19 @@ namespace GFGEditor
                     }
 
                 }
-                if (!has) File.Delete(targetPath + fileName);
+                if (!has)
+                {
+                    var deleteFile = targetPath + fileName;
+                    File.Delete(targetPath + fileName);
+
+                    //写入删除文件脚本
+                    DeleteFileHelper.AddFile(deleteFile);
+                }
             }
             Debug.Log(targetPath + "清除完成！");
         }
         //清除冗余位置文件
-        public static void DeleteUnnecessaryImagePos(string targetPath)
+        private static void DeleteUnnecessaryImagePos(string targetPath)
         {
             string[] includeExtensionNames = new string[] { ".png", ".jpg" };
             var files = Directory.GetFiles(targetPath);
@@ -339,8 +346,11 @@ namespace GFGEditor
                 string targetFilePath = targetPath + fileName;
                 if (extensionName == ".bytes" && !File.Exists(targetFilePath + includeExtensionNames[0]) && !File.Exists(targetFilePath + includeExtensionNames[1]))
                 {
-                    File.Delete(targetPath + Path.GetFileName(file));
+                    var deleteFile = targetPath + Path.GetFileName(file);
+                    File.Delete(deleteFile);
 
+                    //写入删除文件脚本
+                    DeleteFileHelper.AddFile(deleteFile);
                 }
             }
 
@@ -371,6 +381,8 @@ namespace GFGEditor
                     if (!existFile)
                     {
                         File.Delete(lfile);
+                        //写入删除文件脚本
+                        DeleteFileHelper.AddFile(lfile);
                     }
                 }
                 foreach (var lDir in localDirs)
@@ -390,6 +402,9 @@ namespace GFGEditor
                     if (!needDelete)
                     {
                         Directory.Delete(lDir, true);
+
+                        //写入删除文件脚本
+                        DeleteFileHelper.AddFile(lDir);
                     }
                 }
             }

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -15,7 +15,7 @@ namespace GFGEditor
         public static string ResRootPathDressUp { get { return $"../../../gfg/{ResRootDirNameDressUp}/"; } }
 
         public static string ragule = @"^[0-9a-zA-Z_.]{1,}$";
-        public static string Md5FilePath = "Assets/Res/MD5";
+        public static string Md5FilePath = $"{ResPathUtil.RES_ROOT_DIR_PATH}/MD5";
 
         private static string[] FieldGuideIconSrcPaths { get { return new string[] { ResRootPath + "图鉴/" }; } }
         public static string FieldGuideIconTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/FieldGuide/Icon/";

GameClient/Assets/Editor/Bat/updateArtRes.bat

@@ -1,5 +1,3 @@
 echo %1
 cd ../../../../../../gfg/%1
 svn up --force --accept tc
-
-pause

GameClient/Assets/Editor/Bat/updateGame.bat

@@ -1,7 +1,4 @@
-cd ../../../Assets/Res
-svn up --force --accept tc
-
-cd ../../../
+cd ../../../../
 git clean -df
 git reset --hard
 git status

GameClient/Assets/Editor/Bat/updateGameRes.bat

@@ -0,0 +1,2 @@
+cd ../../../Assets/Res
+svn up --force --accept tc

GameClient/Assets/Editor/Bat/updateGameRes.bat.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 12c58c93f9b3883429c64694e499eee1
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Editor/Excel/ExcelReader.cs

@@ -122,6 +122,7 @@ namespace GFGEditor
                         ExcelWorksheet worksheet = Worksheets[j];
                         string[] names = worksheet.Name.Split('_');
                         if (names.Length < 2) continue;
+
                         ExcelWorksheet newWorksheet = null;
                         for (int k = 1; k <= newWorksheets.Count; k++)
                         {
@@ -177,7 +178,7 @@ namespace GFGEditor
                 for (int j = 1; j <= newColumnNum; j++)
                 {
                     string newName = newWorksheet.Cells[3, j].Text.Trim();
-                    string newType = newWorksheet.Cells[2, i].Text.Trim();
+                    string newType = newWorksheet.Cells[2, j].Text.Trim();
                     if (name == newName && type == newType)
                     {
                         needWriteColumn = false;
@@ -212,11 +213,13 @@ namespace GFGEditor
                 for (int j = 1; j <= columnNum; j++)
                 {
                     string title = worksheet.Cells[3, j].Text.Trim();
+                    string type = worksheet.Cells[2, j].Text.Trim();
                     if (string.IsNullOrEmpty(title)) continue;
-                    for (int k = column + 1; k <= newColumnNum; k++)
+                    for (int k = 1; k <= newColumnNum; k++)
                     {
                         string newTitle = newWorksheet.Cells[3, k].Text.Trim();
-                        if (newTitle == title)
+                        string newType = newWorksheet.Cells[2, k].Text.Trim();
+                        if (newTitle == title && newType == type)
                         {
                             column = k;
                             break;

GameClient/Assets/Editor/ToolsMenu.cs

@@ -66,6 +66,7 @@ namespace GFGEditor
         [MenuItem("策划/更新并导入美术资源", false, (int)TOOL_MENU_PRIORITY.UpdateAndImportArtRes)]
         static void UpdateAndImportArtResAndCommit()
         {
+            UpdateProjectRes();
             UpdateAndImportArtRes();
             if (CommitWhenRelease)
             {
@@ -94,6 +95,7 @@ namespace GFGEditor
             Thread.Sleep(1000);
             EditorUtility.DisplayProgressBar("进度", "正在更新项目", 1);
             ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateGame.bat");
+            UpdateProjectRes();
             EditorUtility.ClearProgressBar();
         }
 
@@ -125,6 +127,11 @@ namespace GFGEditor
         }
 #endif
 
+        private static void UpdateProjectRes()
+        {
+            ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateGameRes.bat");
+        }
+
         public static void UpdateExcel()
         {
             EditorUtility.DisplayProgressBar("进度", "正在更新表格", 1);
@@ -147,6 +154,7 @@ namespace GFGEditor
         static void CommitProject()
         {
             EditorUtility.DisplayProgressBar("进度", "正在提交项目", 1);
+            DeleteFileHelper.TrySvnRemoveDeleteFile();
             ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "commitGame.bat");
             EditorUtility.ClearProgressBar();
         }
@@ -278,8 +286,8 @@ namespace GFGEditor
 
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TextureTargetPath, new string[] { ImportArtResTool.EffectTextureMd5FileSaveName });
 
+            DeleteFileHelper.TrySvnRemoveDeleteFile();
             EditorUtility.ClearProgressBar();
-
         }
 
         [MenuItem("Tools/List Player Assemblies in Console")]

GameClient/Assets/Editor/Xasset/Builds/BuildTask.cs

@@ -9,7 +9,7 @@ namespace VEngine.Editor.Builds
 {
     public class BuildTask
     {
-        private readonly string[] EXCLUDE_EXTS = new string[] { ".meta" };
+        private readonly string[] EXCLUDE_EXTS = new string[] { ".meta", ".bat" };
         private readonly string[] EXCLUDE_DIRS = new string[] { "Assets/Res/.svn", ImportArtResTool.Md5FilePath };
         private readonly BuildAssetBundleOptions buildAssetBundleOptions;
         private readonly List<Asset> bundledAssets = new List<Asset>();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComFosterBottom.cs

@@ -27,7 +27,12 @@ namespace UI.Card
         public GButton m_btnAll;
         public GButton m_btnUpLv;
         public GGroup m_grpLv;
-        public UI_ComBigStar m_comStar;
+        public UI_ComStarItem m_comStarItem0;
+        public UI_ComStarItem m_comStarItem1;
+        public UI_ComStarItem m_comStarItem2;
+        public UI_ComStarItem m_comStarItem3;
+        public GTextField m_txtCurStar;
+        public GTextField m_txtAllStar;
         public GList m_listStarConsume;
         public GComponent m_comStarCousumeGold;
         public GButton m_btnUpStar;
@@ -102,7 +107,12 @@ namespace UI.Card
             m_btnAll = (GButton)comp.GetChild("btnAll");
             m_btnUpLv = (GButton)comp.GetChild("btnUpLv");
             m_grpLv = (GGroup)comp.GetChild("grpLv");
-            m_comStar = (UI_ComBigStar)UI_ComBigStar.Create(comp.GetChild("comStar"));
+            m_comStarItem0 = (UI_ComStarItem)UI_ComStarItem.Create(comp.GetChild("comStarItem0"));
+            m_comStarItem1 = (UI_ComStarItem)UI_ComStarItem.Create(comp.GetChild("comStarItem1"));
+            m_comStarItem2 = (UI_ComStarItem)UI_ComStarItem.Create(comp.GetChild("comStarItem2"));
+            m_comStarItem3 = (UI_ComStarItem)UI_ComStarItem.Create(comp.GetChild("comStarItem3"));
+            m_txtCurStar = (GTextField)comp.GetChild("txtCurStar");
+            m_txtAllStar = (GTextField)comp.GetChild("txtAllStar");
             m_listStarConsume = (GList)comp.GetChild("listStarConsume");
             m_comStarCousumeGold = (GComponent)comp.GetChild("comStarCousumeGold");
             m_btnUpStar = (GButton)comp.GetChild("btnUpStar");
@@ -133,8 +143,16 @@ namespace UI.Card
             m_btnAll = null;
             m_btnUpLv = null;
             m_grpLv = null;
-            m_comStar.Dispose();
-            m_comStar = null;
+            m_comStarItem0.Dispose();
+            m_comStarItem0 = null;
+            m_comStarItem1.Dispose();
+            m_comStarItem1 = null;
+            m_comStarItem2.Dispose();
+            m_comStarItem2 = null;
+            m_comStarItem3.Dispose();
+            m_comStarItem3 = null;
+            m_txtCurStar = null;
+            m_txtAllStar = null;
             m_listStarConsume = null;
             m_comStarCousumeGold = null;
             m_btnUpStar = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComBigStar.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComStarItem.cs

@@ -4,19 +4,19 @@ using FairyGUI;
 
 namespace UI.Card
 {
-    public partial class UI_ComBigStar
+    public partial class UI_ComStarItem
     {
         public GComponent target;
         public Controller m_c1;
-        public Controller m_c2;
-        public const string URL = "ui://7l6lvkaywr9a85";
+        public GTextField m_txtContent;
+        public const string URL = "ui://7l6lvkayv461ad";
         public const string PACKAGE_NAME = "Card";
-        public const string RES_NAME = "ComBigStar";
-        private static UI_ComBigStar _proxy;
+        public const string RES_NAME = "ComStarItem";
+        private static UI_ComStarItem _proxy;
 
-        public static UI_ComBigStar Create(GObject gObject = null)
+        public static UI_ComStarItem Create(GObject gObject = null)
         {
-            var ui = new UI_ComBigStar();
+            var ui = new UI_ComStarItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +25,11 @@ namespace UI.Card
             return ui;
         }
 
-        public static UI_ComBigStar Proxy(GObject gObject = null)
+        public static UI_ComStarItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComBigStar();
+                _proxy = new UI_ComStarItem();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,12 +57,12 @@ namespace UI.Card
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_c2 = comp.GetController("c2");
+            m_txtContent = (GTextField)comp.GetChild("txtContent");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_c2 = null;
+            m_txtContent = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComStarItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ListCardItem.cs

@@ -12,8 +12,8 @@ namespace UI.Card
         public GLoader m_loaRarity;
         public GTextField m_txtLv;
         public GTextField m_txtName;
-        public GComponent m_comStar;
         public GLoader m_loaMainScore;
+        public GTextField m_txtStarLv;
         public const string URL = "ui://7l6lvkayojlzi";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "ListCardItem";
@@ -66,8 +66,8 @@ namespace UI.Card
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_comStar = (GComponent)comp.GetChild("comStar");
             m_loaMainScore = (GLoader)comp.GetChild("loaMainScore");
+            m_txtStarLv = (GTextField)comp.GetChild("txtStarLv");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -77,8 +77,8 @@ namespace UI.Card
             m_loaRarity = null;
             m_txtLv = null;
             m_txtName = null;
-            m_comStar = null;
             m_loaMainScore = null;
+            m_txtStarLv = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ListSkillItem.cs

@@ -11,6 +11,7 @@ namespace UI.Card
         public GTextField m_txtName;
         public UI_ComSkill m_comSkill;
         public GTextField m_txtLv;
+        public GTextField m_txtDesc;
         public const string URL = "ui://7l6lvkayrhha9k";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "ListSkillItem";
@@ -62,6 +63,7 @@ namespace UI.Card
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_comSkill = (UI_ComSkill)UI_ComSkill.Create(comp.GetChild("comSkill"));
             m_txtLv = (GTextField)comp.GetChild("txtLv");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -70,6 +72,7 @@ namespace UI.Card
             m_comSkill.Dispose();
             m_comSkill = null;
             m_txtLv = null;
+            m_txtDesc = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardItem.cs

@@ -14,6 +14,7 @@ namespace UI.Main
         public GLoader m_loaRarity;
         public GLoader m_loaMainScore;
         public GGraph m_holder;
+        public GTextField m_txtStarLv;
         public const string URL = "ui://mfvz4q8kr1a99f";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ListCardItem";
@@ -68,6 +69,7 @@ namespace UI.Main
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_loaMainScore = (GLoader)comp.GetChild("loaMainScore");
             m_holder = (GGraph)comp.GetChild("holder");
+            m_txtStarLv = (GTextField)comp.GetChild("txtStarLv");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -79,6 +81,7 @@ namespace UI.Main
             m_loaRarity = null;
             m_loaMainScore = null;
             m_holder = null;
+            m_txtStarLv = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -5,20 +5,24 @@ namespace GFGGame
         public const string RESIN_TXT_DIR_PATH = "Assets/ResIn/Txt";
 
         public const string FONT_DIR_PATH = "Assets/ResIn/Font";
-        public const string MUSIC_DIR_PATH = "Assets/Res/Music";
-        public const string SOUND_DIR_PATH = "Assets/Res/Sound";
-        public const string UI_DIR_PATH = "Assets/ResIn/UI";
-        public const string TEXTURE_DIR_PATH = "Assets/Res/Texture";
-        public const string PREFAB_DIR_PATH = "Assets/ResIn/Prefab";
-        public const string TEXTURE_FIGHT_DIR_PATH = "Assets/ResIn/Fight";
-        public const string CONFIG_DIR_PATH = "Assets/ResIn/Config";
-        public const string ANIMATION_DIR_PATH = "Assets/Res/Animation";
-        public const string EFFECT_DIR_PATH = "Assets/Res/Effect";
-        public const string Material_DIR_PATH = "Assets/Res/Material";
-        public const string Shader_DIR_PATH = "Assets/Res/Shader";
-        public const string Texture_DIR_PATH = "Assets/Res/Texture";
+        public static readonly string UI_DIR_PATH = "Assets/ResIn/UI";
+        public static readonly string PREFAB_DIR_PATH = "Assets/ResIn/Prefab";
+        public static readonly string TEXTURE_FIGHT_DIR_PATH = "Assets/ResIn/Fight";
+        public static readonly string CONFIG_DIR_PATH = "Assets/ResIn/Config";
 
-        public const string SQLITE_FILE_PATH = CONFIG_DIR_PATH + "/" + LauncherConfig.SQL_FILE_NAME;
+
+        public const string RES_ROOT_DIR_PATH = "Assets/Res";
+
+        public static readonly string MUSIC_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Music";
+        public static readonly string SOUND_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Sound";
+        public static readonly string TEXTURE_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Texture";
+        public static readonly string ANIMATION_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Animation";
+        public static readonly string EFFECT_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Effect";
+        public static readonly string Material_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Material";
+        public static readonly string Shader_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Shader";
+        public static readonly string Texture_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Texture";
+
+        public  static readonly string SQLITE_FILE_PATH = CONFIG_DIR_PATH + "/" + LauncherConfig.SQL_FILE_NAME;
 
         public static string GetUIPackagePath(string res)
         {
@@ -147,5 +151,9 @@ namespace GFGGame
             if (string.IsNullOrEmpty(res)) return "";
             return $"{TEXTURE_DIR_PATH}/Head/HeadBorder/{res}.{extName}";
         }
+        public static string GetShaderPath(string res)
+        {
+            return $"{Shader_DIR_PATH}/{res}.shader";
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -107,9 +107,10 @@ namespace GFGGame
             listItem.m_txtName.text = data.itemCfg.name;
             RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetCardSkillsRed(data.id) || RedDotDataManager.Instance.GetCardStarReward(data.id), "", 10, -4);
 
-            UI_ComStar comStar = UI_ComStar.Proxy(listItem.m_comStar);
-            comStar.m_c1.selectedIndex = data.star;
-            UI_ComStar.ProxyEnd();
+            listItem.m_txtStarLv.text = data.star.ToString();
+            //           UI_ComStar comStar = UI_ComStar.Proxy(listItem.m_comStar);
+            // comStar.m_c1.selectedIndex = data.star;
+            // UI_ComStar.ProxyEnd();
             UI_ListCardItem.ProxyEnd();
         }
         private void OnClickListCardItem(EventContext context)

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -302,7 +302,6 @@ namespace GFGGame
 
                 if (ItemDataManager.GetItemNum(itemId) == 0)
                 {
-                    // ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } });
                     object[] sourceDatas = new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } };
                     GoodsItemTipsController.ShowItemTips(itemId, sourceDatas);
                 }
@@ -340,7 +339,6 @@ namespace GFGGame
         }
         private void OnClickItemLvConsumsEnd()
         {
-            //_timer.Stop();
             Timers.inst.Remove(OnTimedEvent);
             _selectTimeCount = 0;
             if (_consumeSelectIndex == 0)
@@ -349,8 +347,6 @@ namespace GFGGame
             }
             else
             {
-                // if (IsUpLvLimit(false)) return;
-
                 this.OnClickBtnPlusLvConsume(_consumeSelectItem);
             }
         }
@@ -358,7 +354,7 @@ namespace GFGGame
         private bool OnClickBtnPlusLvConsume(GObject obj, bool showTips = true)
         {
             UI_ComConsume listItem = UI_ComConsume.Proxy(obj);
-            // ItemCfg itemCfg = (listItem.target.data as ItemCfg);
+
             int index = (int)listItem.target.data;
             int itemId = upgradeCardItemsArr[index];
 
@@ -393,9 +389,6 @@ namespace GFGGame
         {
             UI_ComConsume listItem = UI_ComConsume.Proxy(obj);
             int index = (int)listItem.target.data;
-            // int itemId = upgradeCardItemsArr[index];
-
-            // string count = listItem.m_txtUseCount.text;
 
             if (itemsCount[index] == 0)
             {
@@ -414,9 +407,7 @@ namespace GFGGame
 
             for (int i = 0; i < itemsCount.Count; i++)
             {
-                // UI_ComConsume listItem = UI_ComConsume.Proxy(_comFosterBottom.m_listLvConsume.GetChildAt(i));
 
-                // if (int.Parse(listItem.m_txtUseCount.text) == 0) { continue; }
                 if (itemsCount[i] == 0) continue;
                 ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(upgradeCardItemsArr[i]);
                 count += itemCfg.cardUpLvGoldsArr[_cardData.itemCfg.rarity - 1][1] * itemsCount[i];
@@ -532,8 +523,8 @@ namespace GFGGame
         private void UpdateUpStarView()
         {
             CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardData.id, _cardData.star);
-            _comFosterBottom.m_comStar.m_c1.selectedIndex = _cardData.star;
-            _comFosterBottom.m_comStar.m_c2.selectedIndex = 5;
+
+
             if (CardDataManager.isFullStar(_cardData.id, _cardData.star, false))
             {
                 _comFosterBottom.m_ctrlFullStar.selectedIndex = 1;
@@ -545,7 +536,28 @@ namespace GFGGame
             else
             {
                 _comFosterBottom.m_ctrlFullStar.selectedIndex = 0;
-
+                _comFosterBottom.m_txtCurStar.text = _cardData.star.ToString();
+                List<CardStarCfg> starCfgs = CardStarCfgArray.Instance.GetCfgsBycardId(_cardData.id);
+                _comFosterBottom.m_txtAllStar.SetVar("value", starCfgs.Count.ToString()).FlushVars();
+                for (int i = 0; i < 4; i++)
+                {
+                    UI_ComStarItem comStarItem = UI_ComStarItem.Proxy(_comFosterBottom.target.GetChild("comStarItem" + i));
+                    int count = _cardData.star % 5;
+                    if (i * 5 + count < _cardData.star)
+                    {
+                        comStarItem.m_c1.selectedIndex = 5;
+                    }
+                    else if (i * 5 + count > _cardData.star)
+                    {
+                        comStarItem.m_c1.selectedIndex = 0;
+                    }
+                    else
+                    {
+                        comStarItem.m_c1.selectedIndex = count;
+                    }
+                    comStarItem.m_txtContent.text = _cardData.itemCfg.starDescArr[i];
+                    UI_ComStarItem.ProxyEnd();
+                }
                 _comFosterBottom.m_btnUpStar.data = 0;//data  0:可以升级，1：材料不足
 
                 ItemUtil.SetItemNumAndNeedNum(_comFosterBottom.m_comStarCousumeGold, cardStarCfg.costID, cardStarCfg.costNum);
@@ -698,7 +710,8 @@ namespace GFGGame
             item.m_comSkill.m_loaSkill.url = ResPathUtil.GetCardSmallPath(_cardData.resources[_cardData.resIndex]);
             item.m_txtName.text = skillCfg.name;
             item.m_txtLv.text = string.Format("{0}级", skillLv);
-
+            PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, skillCfg.skillId);
+            item.m_txtDesc.text = skillLvlCfg.describe;
             item.m_btnUp.visible = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv + 1, skillCfg.skillId) != null;
             RedDotController.Instance.SetComRedDot(item.m_btnUp, RedDotDataManager.Instance.GetCardSkillRed(skillCfg.skillId), "", 9, -8);
 

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -89,8 +89,9 @@ namespace GFGGame
             RarityIconController.UpdateRarityIcon(item.m_loaRarity, cardData.itemCfg.id, false);// ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
             item.m_loaMainScore.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (cardData.itemCfg.mainScore));
 
-            UI_ComStar comStar = UI_ComStar.Proxy(item.m_comStar);
-            comStar.m_c1.selectedIndex = cardData.star;
+            // UI_ComStar comStar = UI_ComStar.Proxy(item.m_comStar);
+            item.m_txtStarLv.text = cardData.star.ToString();
+            // comStar.m_c1.selectedIndex = cardData.star;
             if (_effects.Count <= index)
             {
                 string resPath = ResPathUtil.GetViewEffectPath("ui_xz", "ui_xz_zd_kq");
@@ -101,7 +102,7 @@ namespace GFGGame
                 _wrappers.Add(wrapper0);
             }
             UI_ListCardItem.ProxyEnd();
-            UI_ComStar.ProxyEnd();
+            // UI_ComStar.ProxyEnd();
         }
         private void OnListCardItemClick(EventContext context)
         {

GameClient/Assets/Scenes/GameLauncher.unity

@@ -277,7 +277,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 170410349}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 2.5, y: -5, z: 0}
+  m_LocalPosition: {x: 2.8125, y: -5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}

GameClient/Assets/link.xml

@@ -3,4 +3,7 @@
 	<assembly fullname="UnityEngine.SpriteMaskModule">
 		<type fullname="UnityEngine.SpriteMask" preserve="all" />
 	</assembly>
+	<assembly fullname="UnityEngine.CoreModule">
+		<type fullname="UnityEngine.Rendering.SortingGroup" preserve="all" />
+	</assembly>
 </linker>

GameClient/ProjectSettings/GraphicsSettings.asset

@@ -60,4 +60,5 @@ GraphicsSettings:
   m_AlbedoSwatchInfos: []
   m_LightsUseLinearIntensity: 0
   m_LightsUseColorTemperature: 0
+  m_DefaultRenderingLayerMask: 1
   m_LogWhenShaderIsCompiled: 0