对战技能

FGUIProject/assets/Main/FontScore/Font8.fnt

@@ -1,3 +1,4 @@
+info size=67 resizable=true colored=false
 char id=48 img=vuz5as xoffset=0 yoffset=0 xadvance=0
 char id=49 img=vuz5at xoffset=0 yoffset=0 xadvance=0
 char id=50 img=vuz5au xoffset=0 yoffset=0 xadvance=0
@@ -8,3 +9,5 @@ char id=54 img=vuz5ay xoffset=0 yoffset=0 xadvance=0
 char id=55 img=vuz5az xoffset=0 yoffset=0 xadvance=0
 char id=56 img=vuz5b0 xoffset=0 yoffset=0 xadvance=0
 char id=57 img=vuz5b1 xoffset=0 yoffset=0 xadvance=0
+char id=43 img=v3k9ct xoffset=0 yoffset=15 xadvance=0
+char id=45 img=v3k9cu xoffset=0 yoffset=30 xadvance=0

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -1,45 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://mfvz4q8kmza1c0">
   <displayList>
+    <image id="n36_v3k9" name="n36" src="v3k9cy" fileName="images/zd_jinengdi_1.png" xy="0,1619">
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+    <component id="n2_8xpg" name="btnSkip" src="nmnb2x" fileName="componentsDialog/ButtonSkip.xml" xy="867,1769" visible="false">
+      <relation target="" sidePair="bottom-bottom"/>
+    </component>
     <component id="n0_8xpg" name="selfScore" src="8xpg4e" fileName="components/CompFightScore.xml" xy="133,843" visible="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <component id="n1_8xpg" name="selfName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="-28,1667">
+    <component id="n6_8xpg" name="targetScore" src="8xpg4e" fileName="components/CompFightScore.xml" xy="707,843" visible="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <component id="n4_8xpg" name="targetName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="540,1667">
-      <relation target="" sidePair="center-center,middle-middle"/>
+    <component id="n37_mhyh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="52,142"/>
+    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="172,171">
+      <ProgressBar value="42" max="100"/>
     </component>
-    <component id="n2_8xpg" name="btnSkip" src="nmnb2x" fileName="componentsDialog/ButtonSkip.xml" xy="867,1769" visible="false">
+    <component id="n15_mza1" name="comMineCircle" src="v3k9cv" fileName="components/comMineCircle.xml" xy="350,641" pivot="0.5,0.5" anchor="true" visible="false"/>
+    <component id="n17_mza1" name="comTargetCircle" src="v3k9c4" fileName="components/comTargetCircle.xml" xy="730,641" pivot="0.5,0.5" anchor="true" visible="false"/>
+    <component id="n25_vbe8" name="ComShieldMine" src="v3k9c3" fileName="components/ComSkillShield.xml" xy="133,895"/>
+    <component id="n27_vbe8" name="ComShieldNpc" src="v3k9c3" fileName="components/ComSkillShield.xml" xy="712,895"/>
+    <component id="n24_vbe8" name="proMinusMine" src="mhyhd4" fileName="components/ProgressBar2.xml" xy="190,820">
+      <ProgressBar value="100" max="100"/>
+    </component>
+    <component id="n26_vbe8" name="proMinusNpc" src="mhyhd4" fileName="components/ProgressBar2.xml" xy="708,820">
+      <ProgressBar value="100" max="100"/>
+    </component>
+    <component id="n29_uj53" name="ComRoleSkillMineAdd" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="100,914"/>
+    <component id="n34_pcn0" name="ComRoleSkillMineMinus" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="100,914"/>
+    <component id="n33_uj53" name="ComRoleSkillNpcAdd" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="620,914"/>
+    <component id="n35_pcn0" name="ComRoleSkillNpcMinus" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="620,914"/>
+    <component id="n1_8xpg" name="selfName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="48,1499">
       <relation target="" sidePair="bottom-bottom"/>
     </component>
-    <component id="n6_8xpg" name="targetScore" src="8xpg4e" fileName="components/CompFightScore.xml" xy="707,843" visible="false">
-      <relation target="" sidePair="center-center,middle-middle"/>
+    <component id="n4_8xpg" name="targetName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="596,1499">
+      <relation target="" sidePair="bottom-bottom"/>
+    </component>
+    <component id="n20_vbe8" name="btnSkill0" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="70,1682">
+      <relation target="" sidePair="bottom-bottom"/>
+      <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9cm"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv3k9cc"/>
+    </component>
+    <component id="n21_vbe8" name="btnSkill1" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="314,1682">
+      <relation target="" sidePair="bottom-bottom"/>
+      <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9cn"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv3k9cd"/>
+    </component>
+    <component id="n22_vbe8" name="btnSkill2" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="556,1682">
+      <relation target="" sidePair="bottom-bottom"/>
+      <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9co"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv3k9ce"/>
+    </component>
+    <component id="n23_vbe8" name="btnSkill3" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="800,1682">
+      <relation target="" sidePair="bottom-bottom"/>
+      <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9cp"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv3k9cf"/>
     </component>
-    <graph id="n7_mza1" name="grh_0" xy="344,327" pivot="0.5,0.5" anchor="true" size="25,25" aspect="true"/>
-    <graph id="n8_mza1" name="grh_1" xy="110,560" pivot="0.5,0.5" anchor="true" size="25,25" aspect="true"/>
-    <graph id="n9_mza1" name="grh_2" xy="407,1032" pivot="0.5,0.5" anchor="true" size="25,25" aspect="true"/>
-    <graph id="n10_mza1" name="grh_3" xy="426,680" pivot="0.5,0.5" anchor="true" size="25,25" aspect="true"/>
-    <graph id="n11_mza1" name="grh_4" xy="337,1439" pivot="0.5,0.5" anchor="true" size="25,25" aspect="true"/>
-    <graph id="n12_mza1" name="grh_5" xy="358,1589" pivot="0.5,0.5" anchor="true" size="25,25" aspect="true"/>
-    <graph id="n13_mza1" name="grh_6" xy="121,350" pivot="0.5,0.5" anchor="true" size="25,25" aspect="true"/>
-    <graph id="n14_mza1" name="grh_7" xy="418,516" pivot="0.5,0.5" anchor="true" size="25,25" aspect="true"/>
-    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="64,170">
-      <ProgressBar max="100"/>
-    </component>
-    <component id="n15_mza1" name="comMineCircle" src="v3k9c4" fileName="components/comTargetCircle.xml" xy="78,562" pivot="0.5,0.5" anchor="true" visible="false"/>
-    <component id="n17_mza1" name="comTargetCircle" src="v3k9c4" fileName="components/comTargetCircle.xml" xy="857,856" pivot="0.5,0.5" anchor="true" visible="false"/>
-    <component id="n20_vbe8" name="btnSkill0" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="141,1718"/>
-    <component id="n21_vbe8" name="btnSkill1" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="338,1718"/>
-    <component id="n22_vbe8" name="btnSkill2" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="569,1714"/>
-    <component id="n23_vbe8" name="btnSkill3" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="802,1719"/>
-    <component id="n24_vbe8" name="ComMinusMine" src="v3k9c2" fileName="components/ComSkillMinus.xml" xy="107,917"/>
-    <component id="n25_vbe8" name="ComShieldMine" src="v3k9c3" fileName="components/ComSkillShield.xml" xy="116,678"/>
-    <component id="n26_vbe8" name="ComMinusNpc" src="v3k9c2" fileName="components/ComSkillMinus.xml" xy="688,929"/>
-    <component id="n27_vbe8" name="ComShieldNpc" src="v3k9c3" fileName="components/ComSkillShield.xml" xy="702,692"/>
-    <component id="n29_uj53" name="ComRoleSkillMineAdd" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="137,337"/>
-    <component id="n33_uj53" name="ComRoleSkillNpcAdd" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="764,337"/>
-    <component id="n34_pcn0" name="ComRoleSkillMineMinus" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="159,295"/>
-    <component id="n35_pcn0" name="ComRoleSkillNpcMinus" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="786,316"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComAllScoreResult.xml

@@ -3,6 +3,6 @@
   <displayList>
     <image id="n34_vuz5" name="n34" src="vuz5b9" fileName="imagesStory/zd_pfanniu_4.png" xy="0,0"/>
     <image id="n35_vuz5" name="n35" src="vuz5bg" fileName="imagesStory/zd_pfziti_4.png" xy="63,107"/>
-    <text id="n36_vuz5" name="txtCount" xy="60,200" pivot="0.5,0" size="239,71" font="ui://mfvz4q8kvuz5b5" fontSize="12" text="66666"/>
+    <text id="n36_vuz5" name="txtCount" xy="62,200" pivot="0.5,0" size="234,69" font="ui://mfvz4q8kvuz5b5" fontSize="65" text="66666"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComBtnSkill.xml

@@ -1,13 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="200,200">
+<component size="212,212">
+  <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <image id="n20_uxaj" name="n20" src="vuz5b8" fileName="imagesStory/zd_pfanniu_3.png" xy="11,11" size="178,178" aspect="true"/>
-    <loader id="n22_uxaj" name="icon" xy="11,11" size="178,178" aspect="true" url="ui://mfvz4q8kvuz5b7" fill="scaleMatchHeight"/>
-    <component id="n24_vbe8" name="proCD" src="v3k9c5" fileName="components/ProgressBarCD.xml" xy="21,20" size="156,156">
-      <ProgressBar max="100"/>
+    <loader id="n22_uxaj" name="icon" xy="106,106" pivot="0.5,0.5" anchor="true" size="212,212" aspect="true" url="ui://mfvz4q8kv3k9cp" fill="scaleMatchHeight" autoSize="true">
+      <gearDisplay controller="c1" pages="0"/>
+    </loader>
+    <loader id="n28_v3k9" name="icon1" xy="106,106" pivot="0.5,0.5" anchor="true" size="212,212" aspect="true" url="ui://mfvz4q8kv3k9cc" fill="scaleMatchHeight" autoSize="true">
+      <gearDisplay controller="c1" pages="1,2"/>
+    </loader>
+    <component id="n24_vbe8" name="proCD" src="v3k9c5" fileName="components/ProgressBarCD.xml" xy="-14,-14">
+      <gearDisplay controller="c1" pages="1"/>
+      <ProgressBar value="59" max="100"/>
     </component>
-    <text id="n25_uj53" name="txtName" xy="53,72" size="94,56" fontSize="42" color="#666666" align="center" autoSize="none" text="天工"/>
+    <image id="n26_v3k9" name="n26" src="v3k9ck" fileName="imagesStory/zd_txiao_1.png" xy="-22,-22" pivot="0.5,0.5">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n27_v3k9" name="n27" src="v3k9cl" fileName="imagesStory/zd_txiao_2.png" xy="-22,-22" pivot="0.5,0.5">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
   </displayList>
+  <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
+    <item time="0" type="Alpha" target="n26_v3k9" tween="true" startValue="1" endValue="0.5" duration="9" ease="Linear"/>
+    <item time="9" type="Alpha" target="n26_v3k9" tween="true" startValue="0.5" endValue="1" duration="9" ease="Linear"/>
+  </transition>
   <customProperty target="icon" propertyId="1"/>
-  <customProperty target="txtName" propertyId="0"/>
+  <customProperty target="icon1" propertyId="1"/>
 </component>

FGUIProject/assets/Main/components/ComRoleSkill.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="360,360">
+  <controller name="c1" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n30_v3k9" name="n30" src="v3k9cb" fileName="imagesStory/zd_jinengdi_1.png" xy="0,0"/>
+    <text id="n29_uj53" name="txtScore" xy="180,205" pivot="0.5,0" anchor="true" size="231,59" font="ui://mfvz4q8kvuz5b5" fontSize="55" color="#5dd05d" vars="true" text="-{count=10086}">
+      <gearText controller="c1" pages="0,1" values="+{count=9000}|-{count=10086}"/>
+    </text>
+    <image id="n31_v3k9" name="n31" src="v3k9cg" fileName="imagesStory/zd_jnsxzi_1.png" xy="79,101">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n32_v3k9" name="n32" src="v3k9ch" fileName="imagesStory/zd_jnsxzi_2.png" xy="79,101">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/ComRoleSkillScore.xml

@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="200,80">
-  <controller name="c1" pages="0,,1," selected="1"/>
+<component size="360,360">
   <displayList>
-    <text id="n29_uj53" name="txtScore" xy="99,0" pivot="0.5,0" anchor="true" size="108,80" visible="false" fontSize="30" color="#dc5454" vars="true" text="荆钗&#xA;-{count=10086}">
-      <gearColor controller="c1" pages="0,1" values="#5dd05d,#000000|#dc5454,#000000"/>
-      <gearText controller="c1" pages="0,1" values="天工&#xA;+{count=10086}|荆钗&#xA;-{count=10086}"/>
-    </text>
+    <component id="n30_v3k9" name="comRoleSkill" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="180,180" pivot="0.5,0.5" anchor="true"/>
   </displayList>
   <transition name="t0">
-    <item time="0" type="Visible" target="n29_uj53" value="true"/>
-    <item time="0" type="XY" target="n29_uj53" tween="true" startValue="99.5,0" endValue="99.5,-80" duration="9" ease="Linear"/>
-    <item time="9" type="Visible" target="n29_uj53" value="false"/>
+    <item time="0" type="Pivot" target="n30_v3k9" value="0.5,0.5"/>
+    <item time="0" type="Scale" target="n30_v3k9" tween="true" startValue="1.5,1.5" endValue="1,1" duration="12" ease="Bounce.Out"/>
+    <item time="0" type="Visible" target="n30_v3k9" value="true"/>
+    <item time="0" type="XY" target="n30_v3k9" value="180,180"/>
+    <item time="18" type="Visible" target="n30_v3k9" value="false"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Pivot" target="n30_v3k9" value="0,1"/>
+    <item time="0" type="Visible" target="n30_v3k9" value="true"/>
+    <item time="0" type="XY" target="n30_v3k9" value="0,360"/>
+    <item time="6" type="Rotation" target="n30_v3k9" tween="true" startValue="0" endValue="15" duration="6" ease="Bounce.Out"/>
+    <item time="18" type="Visible" target="n30_v3k9" value="false"/>
   </transition>
 </component>

FGUIProject/assets/Main/components/ComSkillMinus.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="268,30">
-  <displayList>
-    <component id="n24_vbe8" name="proMinus" src="vuz5bh" fileName="components/ProgressBar1.xml" xy="0,0" size="268,30">
-      <ProgressBar value="100" max="100"/>
-    </component>
-  </displayList>
-</component>

FGUIProject/assets/Main/components/CompFightResultName.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="540,78">
+<component size="442,78">
   <displayList>
     <image id="n1_8xpg" name="n1" src="8xpg40" fileName="imagesStory/zd_pf_zidi_1.png" xy="0,0"/>
-    <text id="n3_8xpg" name="txtName" xy="137,13" size="308,52" fontSize="38" color="#ffffff" align="center" autoSize="none" autoClearText="true" text="名字五个字"/>
+    <text id="n3_8xpg" name="txtName" xy="67,8" size="308,56" fontSize="42" color="#fff5d8" align="center" autoSize="none" autoClearText="true" text="名字五个字"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ProgressBar1.xml

@@ -4,12 +4,14 @@
     <image id="n0_vuz5" name="n0" src="vuz5ba" fileName="imagesStory/zd_pfjdt_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_vuz5" name="bar" src="vuz5bb" fileName="imagesStory/zd_pfjdt_2.png" xy="0,2" fillMethod="hz" fillAmount="38"/>
+    <image id="n1_vuz5" name="bar" src="vuz5bb" fileName="imagesStory/zd_pfjdt_2.png" xy="0,2"/>
     <text id="n2_vuz5" name="txtCount" xy="32,-4" size="238,36" fontSize="26" color="#fff6ee" vAlign="middle" autoSize="none" text="总分：0">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
-    <image id="n3_vuz5" name="imgCurScore" src="vuz5bc" fileName="imagesStory/zd_pfjdt_3.png" xy="0,-12" pivot="0.5,0" anchor="true"/>
-    <image id="n4_oixc" name="imgFirstScore" src="oixcby" fileName="imagesStory/zd_pfjdt_4.png" xy="0,-11" pivot="0.5,0" anchor="true"/>
+    <image id="n3_vuz5" name="ani" src="vuz5bc" fileName="imagesStory/zd_pfjdt_3.png" xy="933,-12">
+      <relation target="n1_vuz5" sidePair="right-right"/>
+    </image>
+    <image id="n4_oixc" name="imgFirstScore" src="oixcby" fileName="imagesStory/zd_pfjdt_4.png" xy="-12,-11"/>
   </displayList>
   <ProgressBar titleType="value"/>
 </component>

FGUIProject/assets/Main/components/ProgressBar2.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="181,16" extention="ProgressBar">
+  <ProgressBar/>
+  <displayList>
+    <image id="n0_mhyh" src="v3k9d0" name="n0" xy="0,0" size="181,16">
+      <relation target="" sidePair="width,height"/>
+    </image>
+    <image id="n1_mhyh" src="v3k9d1" name="bar" xy="0,2" size="181,12"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/ProgressBarCD.xml

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="240,240" extention="ProgressBar">
   <displayList>
-    <graph id="n0_vbe8" name="n0" xy="0,0" size="240,240" lineColor="#ffa0a0a0" fillColor="#fff0f0f0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <image id="n1_vbe8" name="bar" src="vuz5bp" fileName="imagesStory/zd_pfhd_4.png" xy="0,-10" size="249,262" color="#f1ddba" fillMethod="radial360" fillOrigin="1" fillClockwise="false">
+    <image id="n2_v3k9" name="n2" src="v3k9ca" fileName="imagesStory/zd_daoshu_2.png" xy="14,14"/>
+    <image id="n1_vbe8" name="bar" src="v3k9c9" fileName="imagesStory/zd_daoshu_1.png" xy="14,14" color="#f1ddba" fillMethod="radial360" fillOrigin="1" fillClockwise="false">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>

FGUIProject/assets/Main/components/ProgressBarTargetScore.xml

@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="952,30" extention="ProgressBar">
+<component size="852,30" extention="ProgressBar">
   <displayList>
-    <image id="n0_uj53" name="n0" src="vuz5ba" fileName="imagesStory/zd_pfjdt_1.png" xy="0,0" size="952,30">
+    <image id="n0_uj53" name="n0" src="vuz5ba" fileName="imagesStory/zd_pfjdt_1.png" xy="0,0" size="852,30">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_uj53" name="bar" src="vuz5bb" fileName="imagesStory/zd_pfjdt_2.png" xy="0,2" size="952,26"/>
-    <text id="n4_uj53" name="txtMineScore" xy="45,-4" size="238,36" fontSize="26" color="#fff6ee" vAlign="middle" autoSize="none" text="0">
+    <image id="n7_v3k9" name="n7" src="v3k9cs" fileName="imagesStory/zd_zdjdt_3.png" xy="0,-1"/>
+    <image id="n1_uj53" name="bar" src="v3k9cr" fileName="imagesStory/zd_zdjdt_2.png" xy="0,-1"/>
+    <text id="n4_uj53" name="txtMineScore" xy="60,-7" size="138,39" fontSize="28" color="#fff6ee" vAlign="middle" autoSize="none" text="总分：10086">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
-    <text id="n5_uj53" name="txtNpcScore" xy="669,-4" pivot="1,0" size="238,36" fontSize="26" color="#fff6ee" align="right" vAlign="middle" autoSize="none" text="0">
+    <text id="n5_uj53" name="txtNpcScore" xy="620,-7" pivot="1,0" size="175,39" fontSize="28" color="#fff6ee" align="right" vAlign="middle" text="敌方：10086">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
-    <image id="n6_uj53" name="n6" src="oixcby" fileName="imagesStory/zd_pfjdt_4.png" xy="476,-11" pivot="0.5,0" anchor="true"/>
+    <image id="n6_uj53" name="ani" src="vuz5bc" fileName="imagesStory/zd_pfjdt_3.png" xy="836,-13" size="32,56">
+      <relation target="n1_uj53" sidePair="right-right"/>
+    </image>
   </displayList>
   <ProgressBar/>
 </component>

FGUIProject/assets/Main/components/comMineCircle.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="256,256">
+  <displayList>
+    <loader id="n16_v3k9" name="loaIcon" xy="0,-1" size="256,259" url="ui://mfvz4q8kvuz5b6" autoSize="true"/>
+    <text id="n17_v3k9" name="txtPart" xy="128,78" pivot="0.5,0.5" anchor="true" size="124,79" fontSize="60" color="#fdfbee" align="center" text="饰品"/>
+    <text id="n15_mza1" name="txtCount" xy="0,124" pivot="0.5,0.5" size="256,60" font="ui://mfvz4q8kvuz5b2" fontSize="56" align="center" vAlign="middle" autoSize="none" text="999"/>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n16_v3k9" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="0" type="Rotation" target="n17_v3k9" value="0"/>
+    <item time="0" type="Size" target="n15_mza1" value="10,60"/>
+    <item time="0" type="Skew" target="n17_v3k9" value="90,0"/>
+    <item time="6" type="Rotation" target="n17_v3k9" tween="true" startValue="-15" endValue="0" duration="3" ease="Linear"/>
+    <item time="6" type="Skew" target="n17_v3k9" tween="true" startValue="90,0" endValue="0,0" duration="3" ease="Linear"/>
+    <item time="10" type="Size" target="n15_mza1" tween="true" startValue="10,60" endValue="256,60" duration="4" ease="Linear"/>
+    <item time="24" type="Alpha" target="n16_v3k9" value="1"/>
+  </transition>
+</component>

FGUIProject/assets/Main/components/comTargetCircle.xml

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="144,144">
+<component size="256,256">
   <displayList>
-    <image id="n14_mza1" name="n14" src="vuz5b7" fileName="imagesStory/zd_pfanniu_2.png" xy="1,0" pivot="0.5,0.5" size="142,143" aspect="true"/>
-    <text id="n15_mza1" name="txtCount0" xy="-16,56" pivot="0.5,0.5" size="176,32" font="ui://mfvz4q8kvuz5b3" fontSize="28" align="center" vAlign="middle" autoSize="none" text="999"/>
+    <loader id="n16_v3k9" name="loaIcon" xy="0,-1" size="256,259" url="ui://mfvz4q8kvuz5b7" autoSize="true"/>
+    <text id="n17_v3k9" name="txtPart" xy="128,78" pivot="0.5,0.5" anchor="true" size="124,79" fontSize="60" color="#fdfbee" align="center" text="饰品"/>
+    <text id="n15_mza1" name="txtCount" xy="0,124" pivot="0.5,0.5" size="256,60" font="ui://mfvz4q8kvuz5b3" fontSize="56" align="center" vAlign="middle" autoSize="none" text="999"/>
   </displayList>
   <transition name="t0">
-    <item time="0" type="Alpha" target="n14_mza1" tween="true" startValue="0" endValue="1" duration="2" ease="Linear"/>
-    <item time="0" type="Alpha" target="n15_mza1" tween="true" startValue="0" endValue="1" duration="2" ease="Linear"/>
-    <item time="0" type="XY" target="n14_mza1" value="1,0"/>
-    <item time="0" type="XY" target="n15_mza1" value="-16,56"/>
-    <item time="6" type="XY" target="n14_mza1" tween="true" startValue="1,0" endValue="1,-149" duration="15" ease="Linear"/>
-    <item time="6" type="XY" target="n15_mza1" tween="true" startValue="-16,56" endValue="-16,-93" duration="15" ease="Linear"/>
-    <item time="15" type="Alpha" target="n14_mza1" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
-    <item time="15" type="Alpha" target="n15_mza1" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
+    <item time="0" type="Alpha" target="n16_v3k9" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="0" type="Rotation" target="n17_v3k9" value="0"/>
+    <item time="0" type="Size" target="n15_mza1" value="10,60"/>
+    <item time="0" type="Skew" target="n17_v3k9" value="90,0"/>
+    <item time="6" type="Rotation" target="n17_v3k9" tween="true" startValue="15" endValue="0" duration="3" ease="Linear"/>
+    <item time="6" type="Skew" target="n17_v3k9" tween="true" startValue="-90,0" endValue="0,0" duration="3" ease="Linear"/>
+    <item time="10" type="Size" target="n15_mza1" tween="true" startValue="10,60" endValue="256,60" duration="4" ease="Linear"/>
+    <item time="18" type="Alpha" target="n16_v3k9" value="1"/>
   </transition>
 </component>

FGUIProject/assets/Main/package.xml

@@ -321,19 +321,49 @@
     <movieclip id="vuz5bq" name="MovieClip1.jta" path="/Movie/"/>
     <component id="vuz5bu" name="ComAllScoreResult.xml" path="/components/"/>
     <image id="vuz5bv" name="zd_pfhd_4.png" path="/Movie/"/>
-    <movieclip id="vuz5bw" name="MovieClip2.jta" path="/Movie/"/>
+    <movieclip id="vuz5bw" name="MovieClip2.jta" path="/Movie/" atlas="alone_npot"/>
     <component id="vuz5bx" name="Slider1_grip.xml" path="/components/"/>
     <image id="oixcby" name="zd_pfjdt_4.png" path="/imagesStory/"/>
     <image id="oixcbz" name="zd_ztca.png" path="/imagesStory/"/>
     <component id="v3k9c0" name="ComBtnSkill.xml" path="/components/"/>
     <component id="v3k9c1" name="ComRoleSkillScore.xml" path="/components/"/>
-    <component id="v3k9c2" name="ComSkillMinus.xml" path="/components/"/>
     <component id="v3k9c3" name="ComSkillShield.xml" path="/components/"/>
     <component id="v3k9c4" name="comTargetCircle.xml" path="/components/"/>
     <component id="v3k9c5" name="ProgressBarCD.xml" path="/components/"/>
     <component id="v3k9c6" name="ProgressBarSingleScore.xml" path="/components/"/>
     <component id="v3k9c7" name="ProgressBarTargetScore.xml" path="/components/"/>
     <image id="v3k9c8" name="f08dc01e397bcd8d2e04da1517d6cf7.png" path="/imagesStory/"/>
+    <image id="v3k9c9" name="zd_daoshu_1.png" path="/imagesStory/"/>
+    <image id="v3k9ca" name="zd_daoshu_2.png" path="/imagesStory/"/>
+    <image id="v3k9cb" name="zd_jinengdi_1.png" path="/imagesStory/"/>
+    <image id="v3k9cc" name="zd_jineng_1.png" path="/imagesStory/"/>
+    <image id="v3k9cd" name="zd_jineng_2.png" path="/imagesStory/"/>
+    <image id="v3k9ce" name="zd_jineng_3.png" path="/imagesStory/"/>
+    <image id="v3k9cf" name="zd_jineng_4.png" path="/imagesStory/"/>
+    <image id="v3k9cg" name="zd_jnsxzi_1.png" path="/imagesStory/"/>
+    <image id="v3k9ch" name="zd_jnsxzi_2.png" path="/imagesStory/"/>
+    <image id="v3k9ci" name="zd_jnsxzi_3.png" path="/imagesStory/"/>
+    <image id="v3k9cj" name="zd_jnsxzi_4.png" path="/imagesStory/"/>
+    <image id="v3k9ck" name="zd_txiao_1.png" path="/imagesStory/"/>
+    <image id="v3k9cl" name="zd_txiao_2.png" path="/imagesStory/"/>
+    <image id="v3k9cm" name="zd_xzjineng_1.png" path="/imagesStory/"/>
+    <image id="v3k9cn" name="zd_xzjineng_2.png" path="/imagesStory/"/>
+    <image id="v3k9co" name="zd_xzjineng_3.png" path="/imagesStory/"/>
+    <image id="v3k9cp" name="zd_xzjineng_4.png" path="/imagesStory/"/>
+    <image id="v3k9cq" name="zd_zdjdt_1.png" path="/imagesStory/"/>
+    <image id="v3k9cr" name="zd_zdjdt_2.png" path="/imagesStory/"/>
+    <image id="v3k9cs" name="zd_zdjdt_3.png" path="/imagesStory/"/>
+    <image id="v3k9ct" name="zd_zijia.png" path="/FontScore/"/>
+    <image id="v3k9cu" name="zd_zijian.png" path="/FontScore/"/>
+    <component id="v3k9cv" name="comMineCircle.xml" path="/components/"/>
+    <component id="v3k9cx" name="ComRoleSkill.xml" path="/components/"/>
+    <image id="v3k9cy" name="zd_jinengdi_1.png" path="/images/"/>
+    <image id="v3k9cz" name="zd_mcdi.png" path="/imagesStory/"/>
+    <image id="v3k9d0" name="zd_xpfjdt_1.png" path="/imagesStory/"/>
+    <image id="v3k9d1" name="zd_xpfjdt_2.png" path="/imagesStory/"/>
+    <image id="v3k9d2" name="zd_zijia.png" path="/imagesStory/"/>
+    <image id="v3k9d3" name="zd_zijian.png" path="/imagesStory/"/>
+    <component id="mhyhd4" name="ProgressBar2.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Editor/Excel/CodeBuilder.cs

@@ -120,6 +120,11 @@ namespace GFGEditor
                     _assignmentBuilder.AppendFormat("\t\t\t{0} = ConfigUtil.GetInt(reader.GetString(reader.GetOrdinal(\"_{1}\")));", name, name);
                     _assignmentBuilder.AppendLine();
                 }
+                else if (type == "float")
+                {
+                    _assignmentBuilder.AppendFormat("\t\t\t{0} = ConfigUtil.GetFloat(reader.GetString(reader.GetOrdinal(\"_{1}\")));", name, name);
+                    _assignmentBuilder.AppendLine();
+                }
                 else if (type == "string")
                 {
                     _assignmentBuilder.AppendFormat("\t\t\t{0} = reader.GetString(reader.GetOrdinal(\"_{1}\"));", name, name);

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit ff9ea3fbe837ab301dbeebe8c62926733414412d
+Subproject commit 92db9cde3f5f90f000317e9075dfa77b3139ef2c

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

@@ -7,9 +7,11 @@ namespace UI.Main
     public partial class UI_ComBtnSkill
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_icon;
+        public GLoader m_icon1;
         public GProgressBar m_proCD;
-        public GTextField m_txtName;
+        public Transition m_t0;
         public const string URL = "ui://mfvz4q8kv3k9c0";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComBtnSkill";
@@ -57,15 +59,19 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_icon = (GLoader)comp.GetChild("icon");
+            m_icon1 = (GLoader)comp.GetChild("icon1");
             m_proCD = (GProgressBar)comp.GetChild("proCD");
-            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_icon = null;
+            m_icon1 = null;
             m_proCD = null;
-            m_txtName = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillMinus.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkill.cs

@@ -4,18 +4,19 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_ComSkillMinus
+    public partial class UI_ComRoleSkill
     {
         public GComponent target;
-        public UI_ProgressBar1 m_proMinus;
-        public const string URL = "ui://mfvz4q8kv3k9c2";
+        public Controller m_c1;
+        public GTextField m_txtScore;
+        public const string URL = "ui://mfvz4q8kv3k9cx";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComSkillMinus";
-        private static UI_ComSkillMinus _proxy;
+        public const string RES_NAME = "ComRoleSkill";
+        private static UI_ComRoleSkill _proxy;
 
-        public static UI_ComSkillMinus Create(GObject gObject = null)
+        public static UI_ComRoleSkill Create(GObject gObject = null)
         {
-            var ui = new UI_ComSkillMinus();
+            var ui = new UI_ComRoleSkill();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +25,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ComSkillMinus Proxy(GObject gObject = null)
+        public static UI_ComRoleSkill Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComSkillMinus();
+                _proxy = new UI_ComRoleSkill();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,12 +56,13 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_proMinus = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proMinus"));
+            m_c1 = comp.GetController("c1");
+            m_txtScore = (GTextField)comp.GetChild("txtScore");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_proMinus.Dispose();
-            m_proMinus = null;
+            m_c1 = null;
+            m_txtScore = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillMinus.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkill.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 58b4472fc3b928d41a322ecaddbdd56d
+guid: 989c2f692d42a4b49b5278740e4719ea
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -7,9 +7,9 @@ namespace UI.Main
     public partial class UI_ComRoleSkillScore
     {
         public GComponent target;
-        public Controller m_c1;
-        public GTextField m_txtScore;
+        public UI_ComRoleSkill m_comRoleSkill;
         public Transition m_t0;
+        public Transition m_t1;
         public const string URL = "ui://mfvz4q8kv3k9c1";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComRoleSkillScore";
@@ -57,15 +57,16 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_comRoleSkill = (UI_ComRoleSkill)UI_ComRoleSkill.Create(comp.GetChild("comRoleSkill"));
             m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_txtScore = null;
+            m_comRoleSkill.Dispose();
+            m_comRoleSkill = null;
             m_t0 = null;
+            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,7 +8,6 @@ namespace UI.Main
     {
         public GProgressBar target;
         public GTextField m_txtCount;
-        public GImage m_imgCurScore;
         public GImage m_imgFirstScore;
         public const string URL = "ui://mfvz4q8kvuz5bh";
         public const string PACKAGE_NAME = "Main";
@@ -58,13 +57,11 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_imgCurScore = (GImage)comp.GetChild("imgCurScore");
             m_imgFirstScore = (GImage)comp.GetChild("imgFirstScore");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_txtCount = null;
-            m_imgCurScore = null;
             m_imgFirstScore = null;
             if(disposeTarget && target != null)
             {

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

@@ -7,34 +7,27 @@ namespace UI.Main
     public partial class UI_StoryFightTargetScoreUI
     {
         public GComponent target;
-        public UI_CompFightScore m_selfScore;
-        public UI_CompFightResultName m_selfName;
-        public UI_CompFightResultName m_targetName;
         public GButton m_btnSkip;
+        public UI_CompFightScore m_selfScore;
         public UI_CompFightScore m_targetScore;
-        public GGraph m_grh_0;
-        public GGraph m_grh_1;
-        public GGraph m_grh_2;
-        public GGraph m_grh_3;
-        public GGraph m_grh_4;
-        public GGraph m_grh_5;
-        public GGraph m_grh_6;
-        public GGraph m_grh_7;
+        public GButton m_btnBack;
         public UI_ProgressBarTargetScore m_proScore;
-        public UI_comTargetCircle m_comMineCircle;
+        public UI_comMineCircle m_comMineCircle;
         public UI_comTargetCircle m_comTargetCircle;
-        public UI_ComBtnSkill m_btnSkill0;
-        public UI_ComBtnSkill m_btnSkill1;
-        public UI_ComBtnSkill m_btnSkill2;
-        public UI_ComBtnSkill m_btnSkill3;
-        public UI_ComSkillMinus m_ComMinusMine;
         public UI_ComSkillShield m_ComShieldMine;
-        public UI_ComSkillMinus m_ComMinusNpc;
         public UI_ComSkillShield m_ComShieldNpc;
+        public GProgressBar m_proMinusMine;
+        public GProgressBar m_proMinusNpc;
         public UI_ComRoleSkillScore m_ComRoleSkillMineAdd;
-        public UI_ComRoleSkillScore m_ComRoleSkillNpcAdd;
         public UI_ComRoleSkillScore m_ComRoleSkillMineMinus;
+        public UI_ComRoleSkillScore m_ComRoleSkillNpcAdd;
         public UI_ComRoleSkillScore m_ComRoleSkillNpcMinus;
+        public UI_CompFightResultName m_selfName;
+        public UI_CompFightResultName m_targetName;
+        public UI_ComBtnSkill m_btnSkill0;
+        public UI_ComBtnSkill m_btnSkill1;
+        public UI_ComBtnSkill m_btnSkill2;
+        public UI_ComBtnSkill m_btnSkill3;
         public const string URL = "ui://mfvz4q8k8xpg3w";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightTargetScoreUI";
@@ -82,84 +75,68 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_selfScore = (UI_CompFightScore)UI_CompFightScore.Create(comp.GetChild("selfScore"));
-            m_selfName = (UI_CompFightResultName)UI_CompFightResultName.Create(comp.GetChild("selfName"));
-            m_targetName = (UI_CompFightResultName)UI_CompFightResultName.Create(comp.GetChild("targetName"));
             m_btnSkip = (GButton)comp.GetChild("btnSkip");
+            m_selfScore = (UI_CompFightScore)UI_CompFightScore.Create(comp.GetChild("selfScore"));
             m_targetScore = (UI_CompFightScore)UI_CompFightScore.Create(comp.GetChild("targetScore"));
-            m_grh_0 = (GGraph)comp.GetChild("grh_0");
-            m_grh_1 = (GGraph)comp.GetChild("grh_1");
-            m_grh_2 = (GGraph)comp.GetChild("grh_2");
-            m_grh_3 = (GGraph)comp.GetChild("grh_3");
-            m_grh_4 = (GGraph)comp.GetChild("grh_4");
-            m_grh_5 = (GGraph)comp.GetChild("grh_5");
-            m_grh_6 = (GGraph)comp.GetChild("grh_6");
-            m_grh_7 = (GGraph)comp.GetChild("grh_7");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_proScore = (UI_ProgressBarTargetScore)UI_ProgressBarTargetScore.Create(comp.GetChild("proScore"));
-            m_comMineCircle = (UI_comTargetCircle)UI_comTargetCircle.Create(comp.GetChild("comMineCircle"));
+            m_comMineCircle = (UI_comMineCircle)UI_comMineCircle.Create(comp.GetChild("comMineCircle"));
             m_comTargetCircle = (UI_comTargetCircle)UI_comTargetCircle.Create(comp.GetChild("comTargetCircle"));
-            m_btnSkill0 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill0"));
-            m_btnSkill1 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill1"));
-            m_btnSkill2 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill2"));
-            m_btnSkill3 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill3"));
-            m_ComMinusMine = (UI_ComSkillMinus)UI_ComSkillMinus.Create(comp.GetChild("ComMinusMine"));
             m_ComShieldMine = (UI_ComSkillShield)UI_ComSkillShield.Create(comp.GetChild("ComShieldMine"));
-            m_ComMinusNpc = (UI_ComSkillMinus)UI_ComSkillMinus.Create(comp.GetChild("ComMinusNpc"));
             m_ComShieldNpc = (UI_ComSkillShield)UI_ComSkillShield.Create(comp.GetChild("ComShieldNpc"));
+            m_proMinusMine = (GProgressBar)comp.GetChild("proMinusMine");
+            m_proMinusNpc = (GProgressBar)comp.GetChild("proMinusNpc");
             m_ComRoleSkillMineAdd = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillMineAdd"));
-            m_ComRoleSkillNpcAdd = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillNpcAdd"));
             m_ComRoleSkillMineMinus = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillMineMinus"));
+            m_ComRoleSkillNpcAdd = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillNpcAdd"));
             m_ComRoleSkillNpcMinus = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillNpcMinus"));
+            m_selfName = (UI_CompFightResultName)UI_CompFightResultName.Create(comp.GetChild("selfName"));
+            m_targetName = (UI_CompFightResultName)UI_CompFightResultName.Create(comp.GetChild("targetName"));
+            m_btnSkill0 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill0"));
+            m_btnSkill1 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill1"));
+            m_btnSkill2 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill2"));
+            m_btnSkill3 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill3"));
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_btnSkip = null;
             m_selfScore.Dispose();
             m_selfScore = null;
-            m_selfName.Dispose();
-            m_selfName = null;
-            m_targetName.Dispose();
-            m_targetName = null;
-            m_btnSkip = null;
             m_targetScore.Dispose();
             m_targetScore = null;
-            m_grh_0 = null;
-            m_grh_1 = null;
-            m_grh_2 = null;
-            m_grh_3 = null;
-            m_grh_4 = null;
-            m_grh_5 = null;
-            m_grh_6 = null;
-            m_grh_7 = null;
+            m_btnBack = null;
             m_proScore.Dispose();
             m_proScore = null;
             m_comMineCircle.Dispose();
             m_comMineCircle = null;
             m_comTargetCircle.Dispose();
             m_comTargetCircle = null;
-            m_btnSkill0.Dispose();
-            m_btnSkill0 = null;
-            m_btnSkill1.Dispose();
-            m_btnSkill1 = null;
-            m_btnSkill2.Dispose();
-            m_btnSkill2 = null;
-            m_btnSkill3.Dispose();
-            m_btnSkill3 = null;
-            m_ComMinusMine.Dispose();
-            m_ComMinusMine = null;
             m_ComShieldMine.Dispose();
             m_ComShieldMine = null;
-            m_ComMinusNpc.Dispose();
-            m_ComMinusNpc = null;
             m_ComShieldNpc.Dispose();
             m_ComShieldNpc = null;
+            m_proMinusMine = null;
+            m_proMinusNpc = null;
             m_ComRoleSkillMineAdd.Dispose();
             m_ComRoleSkillMineAdd = null;
-            m_ComRoleSkillNpcAdd.Dispose();
-            m_ComRoleSkillNpcAdd = null;
             m_ComRoleSkillMineMinus.Dispose();
             m_ComRoleSkillMineMinus = null;
+            m_ComRoleSkillNpcAdd.Dispose();
+            m_ComRoleSkillNpcAdd = null;
             m_ComRoleSkillNpcMinus.Dispose();
             m_ComRoleSkillNpcMinus = null;
+            m_selfName.Dispose();
+            m_selfName = null;
+            m_targetName.Dispose();
+            m_targetName = null;
+            m_btnSkill0.Dispose();
+            m_btnSkill0 = null;
+            m_btnSkill1.Dispose();
+            m_btnSkill1 = null;
+            m_btnSkill2.Dispose();
+            m_btnSkill2 = null;
+            m_btnSkill3.Dispose();
+            m_btnSkill3 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_comMineCircle
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtPart;
+        public GTextField m_txtCount;
+        public Transition m_t0;
+        public const string URL = "ui://mfvz4q8kv3k9cv";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "comMineCircle";
+        private static UI_comMineCircle _proxy;
+
+        public static UI_comMineCircle Create(GObject gObject = null)
+        {
+            var ui = new UI_comMineCircle();
+            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_comMineCircle Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_comMineCircle();
+            }
+            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtPart = (GTextField)comp.GetChild("txtPart");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtPart = null;
+            m_txtCount = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comMineCircle.cs.meta

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

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

@@ -7,7 +7,9 @@ namespace UI.Main
     public partial class UI_comTargetCircle
     {
         public GComponent target;
-        public GTextField m_txtCount0;
+        public GLoader m_loaIcon;
+        public GTextField m_txtPart;
+        public GTextField m_txtCount;
         public Transition m_t0;
         public const string URL = "ui://mfvz4q8kv3k9c4";
         public const string PACKAGE_NAME = "Main";
@@ -56,12 +58,16 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_txtCount0 = (GTextField)comp.GetChild("txtCount0");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtPart = (GTextField)comp.GetChild("txtPart");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtCount0 = null;
+            m_loaIcon = null;
+            m_txtPart = null;
+            m_txtCount = null;
             m_t0 = null;
             if(disposeTarget && target != null)
             {

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

@@ -54,6 +54,9 @@ namespace GFGGame
                 GLoader icon = btnSkill.GetChild("icon").asLoader;
                 icon.onClick.Add(() => { OnBtnSkillClick(btnSkill); });
             }
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
+            EventAgent.AddEventListener(ConstMessage.CARD_SKILL, UpdateCircleResult);
+
         }
 
         protected override void OnInit()
@@ -89,23 +92,17 @@ namespace GFGGame
             _mainScore = ScoreSystemData.Instance.GetMainScore();
             _targetMainScore = fightCfg.targetMainScore;
 
-            Timers.inst.Add(0.5f, 1, (param) =>
-           {
-               CircleScoreStart(null);
-           });//评分结束
+            Timers.inst.Add(0.5f, 1, CircleScoreStart);//评分结束
         }
         private void UpdateNormal()
         {
-            _ui.m_btnSkill0.m_proCD.visible = false;
-            _ui.m_btnSkill1.m_proCD.visible = false;
-            _ui.m_btnSkill2.m_proCD.visible = false;
-            _ui.m_btnSkill3.m_proCD.visible = false;
-            _ui.m_ComMinusNpc.target.visible = false;
-            _ui.m_ComMinusMine.target.visible = false;
-            _ui.m_ComShieldNpc.target.visible = false;
-            _ui.m_ComShieldMine.target.visible = false;
-            _ui.m_proScore.target.max = 100;
-            _ui.m_proScore.target.value = 50;
+            Reset();
+            RoleSkillCfg[] roleSkillCfgs = RoleSkillCfgArray.Instance.dataArray;
+            for (int i = 0; i < roleSkillCfgs.Length; i++)
+            {
+                GComponent btnSkill = _ui.target.GetChild("btnSkill" + i).asCom;
+                // btnSkill.GetTransition("t0").Play(1, 0, null);
+            }
         }
 
         private void CircleScoreStart(object param)
@@ -131,7 +128,7 @@ namespace GFGGame
         {
             int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
             double partScore = ScoreSystemData.Instance.GetPartItemScore(partId);
-            _ui.m_comMineCircle.m_txtCount0.text = ((int)partScore).ToString();
+            _ui.m_comMineCircle.m_txtCount.text = ((int)partScore).ToString();
             _score += (partScore + _skillScore);
             EquipDataCache.cacher.totalScore = (int)Math.Round(_score);
 
@@ -139,12 +136,12 @@ namespace GFGGame
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(StoryDataManager.currentLevelID);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
             double targetScore = fightCfg.targetPartsScoreArr[_index] * ConstScoreSystem.PART_SCORE;
-            _ui.m_comTargetCircle.m_txtCount0.text = targetScore.ToString();
+            _ui.m_comTargetCircle.m_txtCount.text = targetScore.ToString();
             _targetScore += targetScore;
             EquipDataCache.cacher.npcTotalScore = (int)Math.Round(_targetScore);
 
             UpdateProgressBar();
-            SetCirclePos();
+            PlayScoreAni();
             ReleaseNpcSkill();
         }
         private void UpdateProgressBar()
@@ -154,18 +151,14 @@ namespace GFGGame
             double value = _score / (_score + _targetScore) * _ui.m_proScore.target.max;
             _ui.m_proScore.target.TweenValue(value, 0.5f);
         }
-        private void SetCirclePos()
+        private void PlayScoreAni()
         {
-            Vector2 pos = (_ui.target.GetChild("grh_" + _index).asGraph).xy;
-            float x = 0f;
-            float y = 0f;
-            EquipDataCache.cacher.GetCirclePos(pos, _range, out x, out y);
-            _ui.m_comMineCircle.target.SetXY(x, y);
             _ui.m_comMineCircle.target.visible = true;
+            _ui.m_comMineCircle.m_txtPart.text = FightScoreCfgArray.Instance.GetCfg(_index + 1).name;
             _ui.m_comMineCircle.m_t0.Play(CircleScoreEnd);
 
-            _ui.m_comTargetCircle.target.SetXY(_ui.target.width - x, y);
             _ui.m_comTargetCircle.target.visible = true;
+            _ui.m_comTargetCircle.m_txtPart.text = FightScoreCfgArray.Instance.GetCfg(_index + 1).name;
             _ui.m_comTargetCircle.m_t0.Play();
         }
         private void CircleScoreEnd()
@@ -177,10 +170,9 @@ namespace GFGGame
             }
             else
             {
-                Timers.inst.Add(0.5f, 1, (param) =>
-                {
-                    CircleScoreStart(null);
-                });//评分结束
+                _ui.m_comTargetCircle.target.visible = false;
+                _ui.m_comMineCircle.target.visible = false;
+                Timers.inst.Add(0.5f, 1, CircleScoreStart);//评分结束
             }
         }
         private void ReleaseNpcSkill()
@@ -197,15 +189,29 @@ namespace GFGGame
         {
             UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(obj);
             RoleSkillCfg cfg = item.target.data as RoleSkillCfg;
-
-            SetCdState(item.m_proCD, cfg.cd);
+            int count = (int)item.m_icon.data;
+            if (count >= cfg.limiteCount) return;//超过最大限制次数
+            item.m_c1.selectedIndex = 1;
+            item.m_icon.data = count + 1;
+            SetCdState(obj, cfg.cd);
             SetSkillValue(cfg, SkillDataManager.MINE);
         }
-        private void SetCdState(GProgressBar bar, float time)
+        private void SetCdState(GComponent obj, float time)
         {
+            UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(obj);
+            GProgressBar bar = item.m_proCD;
             bar.visible = true;
             bar.value = 100;
-            bar.TweenValue(0, time).OnComplete(() => { bar.visible = false; });
+            bar.TweenValue(0, time).OnComplete((GTweener tweener) =>
+            {
+                GProgressBar bar = (GProgressBar)tweener.target;
+                UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(bar.parent);
+                int count = (int)item.m_icon.data;
+                RoleSkillCfg cfg = item.target.data as RoleSkillCfg;
+                item.m_c1.selectedIndex = count >= cfg.limiteCount ? 2 : 0;
+
+                item.m_proCD.visible = false;
+            });
         }
 
         private void SetSkillValue(RoleSkillCfg cfg, int role)
@@ -231,7 +237,6 @@ namespace GFGGame
         private void UpdateAddUI(RoleSkillCfg cfg, int role)
         {
             UI_ComRoleSkillScore comRoleSkillScore = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillMineAdd : _ui.m_ComRoleSkillNpcAdd;
-            comRoleSkillScore.m_c1.selectedIndex = 0;
             int score = 0;
             if (role == SkillDataManager.MINE)
             {
@@ -243,7 +248,8 @@ namespace GFGGame
                 score = (int)_targetMainScore * cfg.value / 100;
                 _targetScore += score;
             }
-            comRoleSkillScore.m_txtScore.SetVar("count", score.ToString()).FlushVars();
+            comRoleSkillScore.m_comRoleSkill.m_c1.selectedIndex = 0;
+            comRoleSkillScore.m_comRoleSkill.m_txtScore.SetVar("count", score.ToString()).FlushVars();
             comRoleSkillScore.m_t0.Play();
 
             UpdateProgressBar();
@@ -253,14 +259,14 @@ namespace GFGGame
         //荆钗效果
         private void UpdateMinusUI(RoleSkillCfg cfg, int role)
         {
-            UI_ComSkillMinus comSkillMinus = role == SkillDataManager.MINE ? _ui.m_ComMinusMine : _ui.m_ComMinusNpc;
+            GProgressBar comSkillMinus = role == SkillDataManager.MINE ? _ui.m_proMinusMine : _ui.m_proMinusNpc;
             UI_ComSkillShield targetComSkillShield = role == SkillDataManager.MINE ? _ui.m_ComShieldNpc : _ui.m_ComShieldMine;
 
-            comSkillMinus.target.visible = true;
-            comSkillMinus.m_proMinus.target.value = 0;
-            comSkillMinus.m_proMinus.target.TweenValue(100, 2f).OnComplete(() =>
+            comSkillMinus.visible = true;
+            comSkillMinus.value = 0;
+            comSkillMinus.TweenValue(100, 2f).OnComplete(() =>
             {
-                comSkillMinus.target.visible = false;
+                comSkillMinus.visible = false;
                 if (targetComSkillShield.target.visible)
                 {
                     targetComSkillShield.target.visible = false;
@@ -282,10 +288,9 @@ namespace GFGGame
                     _score -= score;
                 }
 
-                comRoleSkillScore.m_c1.selectedIndex = 1;
-                comRoleSkillScore.m_txtScore.SetVar("count", score.ToString()).FlushVars();
-                comRoleSkillScore.m_t0.Play();
-
+                comRoleSkillScore.m_comRoleSkill.m_c1.selectedIndex = 1;
+                comRoleSkillScore.m_comRoleSkill.m_txtScore.SetVar("count", score.ToString()).FlushVars();
+                comRoleSkillScore.m_t1.Play();
                 UpdateProgressBar();
 
             });
@@ -293,13 +298,13 @@ namespace GFGGame
         private void UpdateBreakUI(RoleSkillCfg cfg, int role)
         {
 
-            UI_ComSkillMinus targetSkillMinus = role == SkillDataManager.MINE ? _ui.m_ComMinusNpc : _ui.m_ComMinusMine;
-            targetSkillMinus.target.visible = false;
+            GProgressBar targetSkillMinus = role == SkillDataManager.MINE ? _ui.m_proMinusNpc : _ui.m_proMinusMine;
+            targetSkillMinus.visible = false;
 
-            GTweener twener = GTween.GetTween(targetSkillMinus.m_proMinus, TweenPropType.Progress);
+            GTweener twener = GTween.GetTween(targetSkillMinus, TweenPropType.Progress);
             if (twener != null)
             {
-                twener.Kill(true);
+                twener.Kill();
             }
         }
         //锦衣效果
@@ -310,7 +315,13 @@ namespace GFGGame
 
             Timers.inst.Add(cfg.duration, 1, (param) => { comSkillShield.target.visible = false; });
         }
+        private void OnBtnBackClick()
+        {
+            Reset();
+            this.Hide();
+            ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW));
 
+        }
         protected override void OnHide()
         {
             base.OnHide();
@@ -324,14 +335,46 @@ namespace GFGGame
 
         private void Skip(object param = null)
         {
-            Timers.inst.Remove((param) =>
-          {
-              CircleScoreStart(null);
-          });
 
-            Timers.inst.Remove(Skip);
+            Reset();
             this.Hide();
             ViewManager.Show(ViewName.STORY_FIGHT_RESULT_VIEW);
         }
+        private void Reset()
+        {
+            _ui.m_proScore.target.max = 100;
+            _ui.m_proScore.target.value = 0;
+
+            _ui.m_comMineCircle.target.visible = false;
+            _ui.m_comTargetCircle.target.visible = false;
+
+            _ui.m_proMinusMine.visible = false;
+            _ui.m_proMinusNpc.visible = false;
+            GTweener twenerMine = GTween.GetTween(_ui.m_proMinusMine, TweenPropType.Progress);
+            if (twenerMine != null) twenerMine.Kill(true);
+            GTweener twenerNpc = GTween.GetTween(_ui.m_proMinusNpc, TweenPropType.Progress);
+            if (twenerNpc != null) twenerNpc.Kill(true);
+
+            _ui.m_ComShieldNpc.target.visible = false;
+            _ui.m_ComShieldMine.target.visible = false;
+
+            _ui.m_ComRoleSkillMineAdd.m_comRoleSkill.target.visible = false;
+            _ui.m_ComRoleSkillMineMinus.m_comRoleSkill.target.visible = false;
+            _ui.m_ComRoleSkillNpcAdd.m_comRoleSkill.target.visible = false;
+            _ui.m_ComRoleSkillNpcMinus.m_comRoleSkill.target.visible = false;
+
+            RoleSkillCfg[] roleSkillCfgs = RoleSkillCfgArray.Instance.dataArray;
+            for (int i = 0; i < roleSkillCfgs.Length; i++)
+            {
+                GComponent btnSkill = _ui.target.GetChild("btnSkill" + i).asCom;
+
+                btnSkill.GetChild("icon").asLoader.data = 0;
+                btnSkill.GetController("c1").selectedIndex = 0;
+                // btnSkill.GetTransition("t0").Stop();
+            }
+
+            Timers.inst.Remove(CircleScoreStart);
+            Timers.inst.Remove(Skip);
+        }
     }
 }

GameClient/Assets/ResIn/UI/Main/Main_atlas_vuz5bw!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 5fe8daefeffa6f84aaeb2ffe765c2b97
+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: -100
+    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/ResIn/UI/Main/Main_atlas_vuz5bw.png.meta

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