Browse Source

双人战斗表现

zhaoyang 3 years ago
parent
commit
fc075ea712
59 changed files with 267 additions and 46 deletions
  1. BIN
      FGUIProject/assets/CommonGame/SIMKAI.TTF
  2. 2 1
      FGUIProject/assets/CommonGame/package.xml
  3. 10 0
      FGUIProject/assets/Main/Font5/Font9.fnt
  4. BIN
      FGUIProject/assets/Main/Font5/zdsz_0.png
  5. BIN
      FGUIProject/assets/Main/Font5/zdsz_1.png
  6. BIN
      FGUIProject/assets/Main/Font5/zdsz_2.png
  7. BIN
      FGUIProject/assets/Main/Font5/zdsz_3.png
  8. BIN
      FGUIProject/assets/Main/Font5/zdsz_4.png
  9. BIN
      FGUIProject/assets/Main/Font5/zdsz_5.png
  10. BIN
      FGUIProject/assets/Main/Font5/zdsz_6.png
  11. BIN
      FGUIProject/assets/Main/Font5/zdsz_7.png
  12. BIN
      FGUIProject/assets/Main/Font5/zdsz_8.png
  13. BIN
      FGUIProject/assets/Main/Font5/zdsz_9.png
  14. 7 14
      FGUIProject/assets/Main/StoryFightTargetScoreUI.xml
  15. 9 12
      FGUIProject/assets/Main/components/ComBtnSkill.xml
  16. 11 0
      FGUIProject/assets/Main/components/Component2.xml
  17. 6 0
      FGUIProject/assets/Main/components/Component3.xml
  18. 2 2
      FGUIProject/assets/Main/components/ProgressBarCD.xml
  19. 6 9
      FGUIProject/assets/Main/components/ProgressBarTargetScore.xml
  20. BIN
      FGUIProject/assets/Main/imagesStory/zd_cishukuang.png
  21. BIN
      FGUIProject/assets/Main/imagesStory/zd_daoshu_1.png
  22. BIN
      FGUIProject/assets/Main/imagesStory/zd_daoshu_2.png
  23. BIN
      FGUIProject/assets/Main/imagesStory/zd_jineng_1.png
  24. BIN
      FGUIProject/assets/Main/imagesStory/zd_jineng_2.png
  25. BIN
      FGUIProject/assets/Main/imagesStory/zd_jineng_3.png
  26. BIN
      FGUIProject/assets/Main/imagesStory/zd_jineng_4.png
  27. BIN
      FGUIProject/assets/Main/imagesStory/zd_jingzi_1.png
  28. BIN
      FGUIProject/assets/Main/imagesStory/zd_jingzi_2.png
  29. BIN
      FGUIProject/assets/Main/imagesStory/zd_jingzi_3.png
  30. BIN
      FGUIProject/assets/Main/imagesStory/zd_jingzi_4.png
  31. BIN
      FGUIProject/assets/Main/imagesStory/zd_txtxtx.png
  32. BIN
      FGUIProject/assets/Main/imagesStory/zd_xpfjdt_1.png
  33. BIN
      FGUIProject/assets/Main/imagesStory/zd_xpfjdt_2.png
  34. BIN
      FGUIProject/assets/Main/imagesStory/zd_zdjdt_1.png
  35. BIN
      FGUIProject/assets/Main/imagesStory/zd_zdjdt_2.png
  36. BIN
      FGUIProject/assets/Main/imagesStory/zd_zdjdt_3.png
  37. BIN
      FGUIProject/assets/Main/imagesStory/zd_zdjdt_liang.png
  38. 20 0
      FGUIProject/assets/Main/package.xml
  39. 0 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComBtnSkill.cs
  40. 75 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component2.cs
  41. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component2.cs.meta
  42. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component3.cs
  43. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component3.cs.meta
  44. 4 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ProgressBarTargetScore.cs
  45. 20 5
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs
  46. 2 0
      GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs
  47. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  48. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  49. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  50. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  51. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png
  52. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  53. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png
  54. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png
  55. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png
  56. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png
  57. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  58. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  59. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

BIN
FGUIProject/assets/CommonGame/SIMKAI.TTF


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

@@ -70,7 +70,7 @@
     <image id="lwri5x" name="hc_btkuang_1.png" path="/images/" exported="true"/>
     <component id="lwri5y" name="ButtonApproach.xml" path="/components/" exported="true"/>
     <image id="j53916" name="zjm_gnk.png" path="/images/"/>
-    <font id="kst18" name="STZHONGS.TTF" path="/" renderMode="" samplePointSize="16"/>
+    <font id="kst18" name="STZHONGS.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
     <component id="r9gf5z" name="ButtonInValueBar.xml" path="/components/"/>
     <component id="qp4l60" name="ButtonHome.xml" path="/components/" exported="true"/>
     <image id="pq5x62" name="kp_sxing_x_1.png" path="/imagesExport/" exported="true"/>
@@ -175,6 +175,7 @@
     <image id="qdrt18" name="hd_sxicon_4.png" path="/imagesExport/" exported="true"/>
     <image id="bd1ca0" name="jingzhongh_bg.jpg" path="/bgimg/" exported="true" atlas="alone_npot"/>
     <component id="n3xha1" name="ComCostCurrency.xml" path="/components/" exported="true"/>
+    <font id="k1kha2" name="SIMKAI.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 10 - 0
FGUIProject/assets/Main/Font5/Font9.fnt

@@ -0,0 +1,10 @@
+char id=48 img=k1khdq xoffset=0 yoffset=0 xadvance=0
+char id=49 img=k1khdr xoffset=0 yoffset=0 xadvance=0
+char id=50 img=k1khds xoffset=0 yoffset=0 xadvance=0
+char id=51 img=k1khdt xoffset=0 yoffset=0 xadvance=0
+char id=52 img=k1khdu xoffset=0 yoffset=0 xadvance=0
+char id=53 img=k1khdv xoffset=0 yoffset=0 xadvance=0
+char id=54 img=k1khdw xoffset=0 yoffset=0 xadvance=0
+char id=55 img=k1khdx xoffset=0 yoffset=0 xadvance=0
+char id=56 img=k1khdy xoffset=0 yoffset=0 xadvance=0
+char id=57 img=k1khdz xoffset=0 yoffset=0 xadvance=0

BIN
FGUIProject/assets/Main/Font5/zdsz_0.png


BIN
FGUIProject/assets/Main/Font5/zdsz_1.png


BIN
FGUIProject/assets/Main/Font5/zdsz_2.png


BIN
FGUIProject/assets/Main/Font5/zdsz_3.png


BIN
FGUIProject/assets/Main/Font5/zdsz_4.png


BIN
FGUIProject/assets/Main/Font5/zdsz_5.png


BIN
FGUIProject/assets/Main/Font5/zdsz_6.png


BIN
FGUIProject/assets/Main/Font5/zdsz_7.png


BIN
FGUIProject/assets/Main/Font5/zdsz_8.png


BIN
FGUIProject/assets/Main/Font5/zdsz_9.png


+ 7 - 14
FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -1,9 +1,6 @@
 <?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>
@@ -13,9 +10,9 @@
     <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="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 id="n37_mhyh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="52,164"/>
+    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="44,71">
+      <ProgressBar max="100"/>
     </component>
     <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"/>
@@ -39,23 +36,19 @@
     </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"/>
+      <property target="icon" 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"/>
+      <property target="icon" 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"/>
+      <property target="icon" 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"/>
+      <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9cf"/>
     </component>
     <component id="n38_jj0m" name="btnSpeedUp" src="jj0mdl" fileName="componentsDialog/ButtonSpeedUp1.xml" xy="943,1546">
       <relation target="" sidePair="right-right,bottom-bottom"/>

+ 9 - 12
FGUIProject/assets/Main/components/ComBtnSkill.xml

@@ -2,26 +2,23 @@
 <component size="212,212">
   <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <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>
+    <loader id="n22_uxaj" name="icon" xy="106,106" pivot="0.5,0.5" anchor="true" size="196,196" aspect="true" url="ui://mfvz4q8kv3k9cc" fill="scaleMatchHeight" autoSize="true"/>
     <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>
-    <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">
+    <image id="n26_v3k9" name="n26" src="k1khe5" fileName="imagesStory/zd_txtxtx.png" xy="-22,-22" pivot="0.5,0.5">
       <gearDisplay controller="c1" pages="0"/>
     </image>
+    <image id="n29_k1kh" name="n29" src="k1khe0" fileName="imagesStory/zd_cishukuang.png" xy="155,8"/>
+    <text id="n30_k1kh" name="n30" xy="172,14" pivot="0.5,0" size="23,42" fontSize="30" color="#fbf4ed" align="center" bold="true" text="1"/>
   </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"/>
+    <item time="0" type="Scale" target="n26_v3k9" tween="true" startValue="1,1" endValue="0.9,0.9" duration="18" ease="Linear"/>
+    <item time="4" type="Alpha" target="n26_v3k9" tween="true" startValue="1" endValue="0.5" duration="14" ease="Linear"/>
+    <item time="18" type="Alpha" target="n26_v3k9" tween="true" startValue="0.5" endValue="1" duration="14"/>
+    <item time="18" type="Scale" target="n26_v3k9" tween="true" startValue="0.9,0.9" endValue="1,1" duration="18" ease="Linear"/>
+    <item time="36" type="Alpha" target="n26_v3k9" value="1"/>
   </transition>
   <customProperty target="icon" propertyId="1"/>
   <customProperty target="icon1" propertyId="1"/>

+ 11 - 0
FGUIProject/assets/Main/components/Component2.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="503,24">
+  <displayList>
+    <component id="n1_uj53" name="bar" src="k1khe8" fileName="components/Component3.xml" xy="0,0" size="503,24">
+      <relation target="" sidePair="width-width"/>
+    </component>
+    <image id="n6_uj53" name="imgAni" src="k1khdp" fileName="imagesStory/zd_zdjdt_liang.png" xy="503,15" pivot="0.65,0.6" anchor="true">
+      <relation target="" sidePair="right-right"/>
+    </image>
+  </displayList>
+</component>

+ 6 - 0
FGUIProject/assets/Main/components/Component3.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="958,24" overflow="hidden">
+  <displayList>
+    <image id="n1_uj53" name="bar" src="v3k9cr" fileName="imagesStory/zd_zdjdt_2.png" xy="0,0"/>
+  </displayList>
+</component>

+ 2 - 2
FGUIProject/assets/Main/components/ProgressBarCD.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="240,240" extention="ProgressBar">
   <displayList>
-    <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">
+    <image id="n2_v3k9" name="n2" src="v3k9ca" fileName="imagesStory/zd_daoshu_2.png" xy="22,22"/>
+    <image id="n1_vbe8" name="bar" src="v3k9c9" fileName="imagesStory/zd_daoshu_1.png" xy="22,22" fillMethod="radial360" fillOrigin="1" fillClockwise="false">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>

+ 6 - 9
FGUIProject/assets/Main/components/ProgressBarTargetScore.xml

@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="852,30" extention="ProgressBar">
+<component size="958,43" extention="ProgressBar">
   <displayList>
-    <image id="n0_uj53" name="n0" src="vuz5ba" fileName="imagesStory/zd_pfjdt_1.png" xy="0,0" size="852,30">
+    <image id="n0_uj53" name="n0" src="v3k9cq" fileName="imagesStory/zd_zdjdt_1.png" xy="-17,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <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">
+    <image id="n7_v3k9" name="n7" src="v3k9cs" fileName="imagesStory/zd_zdjdt_3.png" xy="0,9" flip="hz"/>
+    <component id="n1_uj53" name="comBar" src="k1khe7" fileName="components/Component2.xml" xy="0,9" size="560,24"/>
+    <text id="n4_uj53" name="txtMineScore" xy="406,52" size="114,44" font="ui://eg2y0ldpk1kha2" fontSize="32" color="#fcf5ec" vAlign="middle" strokeColor="#796135" strokeSize="2" text="总分10086">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
-    <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">
+    <text id="n5_uj53" name="txtNpcScore" xy="828,52" pivot="1,0" size="114,44" font="ui://eg2y0ldpk1kha2" fontSize="32" color="#fcf5ec" align="right" vAlign="middle" strokeColor="#796135" strokeSize="2" text="敌方10086">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
-    <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>

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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

@@ -374,6 +374,26 @@
     <component id="lqp0dm" name="ComBtn.xml" path="/components/"/>
     <image id="kqhddn" name="zjm_rk_7.png" path="/images/"/>
     <image id="kqhddo" name="zjm_rk_6.png" path="/images/"/>
+    <image id="k1khdp" name="zd_zdjdt_liang.png" path="/imagesStory/"/>
+    <image id="k1khdq" name="zdsz_0.png" path="/Font5/"/>
+    <image id="k1khdr" name="zdsz_1.png" path="/Font5/"/>
+    <image id="k1khds" name="zdsz_2.png" path="/Font5/"/>
+    <image id="k1khdt" name="zdsz_3.png" path="/Font5/"/>
+    <image id="k1khdu" name="zdsz_4.png" path="/Font5/"/>
+    <image id="k1khdv" name="zdsz_5.png" path="/Font5/"/>
+    <image id="k1khdw" name="zdsz_6.png" path="/Font5/"/>
+    <image id="k1khdx" name="zdsz_7.png" path="/Font5/"/>
+    <image id="k1khdy" name="zdsz_8.png" path="/Font5/"/>
+    <image id="k1khdz" name="zdsz_9.png" path="/Font5/"/>
+    <image id="k1khe0" name="zd_cishukuang.png" path="/imagesStory/"/>
+    <image id="k1khe1" name="zd_jingzi_1.png" path="/imagesStory/"/>
+    <image id="k1khe2" name="zd_jingzi_2.png" path="/imagesStory/"/>
+    <image id="k1khe3" name="zd_jingzi_3.png" path="/imagesStory/"/>
+    <image id="k1khe4" name="zd_jingzi_4.png" path="/imagesStory/"/>
+    <image id="k1khe5" name="zd_txtxtx.png" path="/imagesStory/"/>
+    <font id="k1khe6" name="Font9.fnt" path="/Font5/" exported="true"/>
+    <component id="k1khe7" name="Component2.xml" path="/components/"/>
+    <component id="k1khe8" name="Component3.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 0 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComBtnSkill.cs

@@ -9,7 +9,6 @@ namespace UI.Main
         public GComponent target;
         public Controller m_c1;
         public GLoader m_icon;
-        public GLoader m_icon1;
         public GProgressBar m_proCD;
         public Transition m_t0;
         public const string URL = "ui://mfvz4q8kv3k9c0";
@@ -61,7 +60,6 @@ namespace UI.Main
         {
             m_c1 = comp.GetController("c1");
             m_icon = (GLoader)comp.GetChild("icon");
-            m_icon1 = (GLoader)comp.GetChild("icon1");
             m_proCD = (GProgressBar)comp.GetChild("proCD");
             m_t0 = comp.GetTransition("t0");
         }
@@ -69,7 +67,6 @@ namespace UI.Main
         {
             m_c1 = null;
             m_icon = null;
-            m_icon1 = null;
             m_proCD = null;
             m_t0 = null;
             if(disposeTarget && target != null)

+ 75 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component2.cs

@@ -0,0 +1,75 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_Component2
+    {
+        public GComponent target;
+        public UI_Component3 m_bar;
+        public GImage m_imgAni;
+        public const string URL = "ui://mfvz4q8kk1khe7";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "Component2";
+        private static UI_Component2 _proxy;
+
+        public static UI_Component2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component2();
+            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_Component2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component2();
+            }
+            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_bar = (UI_Component3)UI_Component3.Create(comp.GetChild("bar"));
+            m_imgAni = (GImage)comp.GetChild("imgAni");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bar.Dispose();
+            m_bar = null;
+            m_imgAni = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component3.cs

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

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

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

+ 4 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ProgressBarTargetScore.cs

@@ -7,6 +7,7 @@ namespace UI.Main
     public partial class UI_ProgressBarTargetScore
     {
         public GProgressBar target;
+        public UI_Component2 m_comBar;
         public GTextField m_txtMineScore;
         public GTextField m_txtNpcScore;
         public const string URL = "ui://mfvz4q8kv3k9c7";
@@ -56,11 +57,14 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_comBar = (UI_Component2)UI_Component2.Create(comp.GetChild("comBar"));
             m_txtMineScore = (GTextField)comp.GetChild("txtMineScore");
             m_txtNpcScore = (GTextField)comp.GetChild("txtNpcScore");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_comBar.Dispose();
+            m_comBar = null;
             m_txtMineScore = null;
             m_txtNpcScore = null;
             if(disposeTarget && target != null)

+ 20 - 5
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -218,12 +218,25 @@ namespace GFGGame
         //顶部评分进度条
         private void UpdateProgressBar()
         {
-            _ui.m_proScore.m_txtMineScore.text = ((int)_score).ToString();
-            _ui.m_proScore.m_txtNpcScore.text = ((int)_targetScore).ToString();
-            Debug.Log("_targetScore:" + _targetScore);
+            _ui.m_proScore.m_txtMineScore.text = string.Format("总分{0}", (int)_score);// ((int)_score).ToString();
+            _ui.m_proScore.m_txtNpcScore.text = string.Format("敌方{0}", (int)_targetScore); //((int)_targetScore).ToString();
+            _ui.m_proScore.m_comBar.m_imgAni.visible = true;
 
-            double value = _score / (_score + _targetScore) * _ui.m_proScore.target.max;
-            _ui.m_proScore.target.TweenValue(value, 0.5f);
+            double proportion = _score / (_score + _targetScore);
+            // double value = proportion * _ui.m_proScore.target.max;
+            // _ui.m_proScore.target.TweenValue(value, 0.5f);
+            float width = (float)(proportion * _ui.m_proScore.target.width);
+
+            GTween.To(_ui.m_proScore.m_comBar.target.width, width, 0.5f).SetTarget(_ui.m_proScore.m_comBar).OnUpdate((GTweener t) =>
+                {
+                    _ui.m_proScore.m_comBar.target.width = t.value.x;
+                }); ;
+
+            // if (twener != null)
+            // {
+            //     twener.Kill();
+            // }
+            // _ui.m_proScore.m_imgAni.x = (float)(proportion * _ui.m_proScore.target.width);// SetPosition(proportion* _ui.m_proScore.target.width,);
         }
         //释放NPC技能
         private void ReleaseNpcSkill()
@@ -482,6 +495,8 @@ namespace GFGGame
 
             _ui.m_proScore.target.max = 100;
             _ui.m_proScore.target.value = 0;
+            _ui.m_proScore.m_comBar.target.width = 0;
+            _ui.m_proScore.m_comBar.m_imgAni.visible = false;
 
             _ui.m_comMineCircle.target.visible = false;
             _ui.m_comTargetCircle.target.visible = false;

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -25,6 +25,8 @@ namespace GFGGame
             UIConfig.defaultFont = "STZhongsong";
             Font afont1 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("ZIHUN125"));
             FontManager.RegisterFont(new DynamicFont("ZIHUN125", afont1));
+            Font afont2 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("SIMKAI"));
+            FontManager.RegisterFont(new DynamicFont("SIMKAI", afont2));
             _viewDic = new Dictionary<string, UIView>();
             //��ʼ����ͼ������
             _bottomLayer = CreateLayer("BottomLayer");

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


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


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


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


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


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


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


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


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


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


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


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


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