zhaoyang 2 жил өмнө
parent
commit
bdf7b26cef

+ 8 - 10
FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920" designImage="ui://mfvz4q8kuo1t9j" designImageOffsetY="-120">
+<component size="1080,1920" designImage="ui://mfvz4q8kwonoh4">
   <displayList>
   <displayList>
     <loader id="n39_wono" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
     <loader id="n39_wono" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
@@ -16,15 +16,13 @@
     </component>
     </component>
     <component id="n42_wono" name="comScoreStage" src="wonoh2" fileName="components/ComSingleScoreStage.xml" xy="1022,108" pivot="0.5,0.5" anchor="true"/>
     <component id="n42_wono" name="comScoreStage" src="wonoh2" fileName="components/ComSingleScoreStage.xml" xy="1022,108" pivot="0.5,0.5" anchor="true"/>
     <loader id="n40_wono" name="loaGlass" xy="402,823" pivot="0.5,0.5" size="274,274" scale="0,0" url="ui://mfvz4q8kwonogt" align="center" vAlign="middle"/>
     <loader id="n40_wono" name="loaGlass" xy="402,823" pivot="0.5,0.5" size="274,274" scale="0,0" url="ui://mfvz4q8kwonogt" align="center" vAlign="middle"/>
-    <component id="n4_n0js" name="comClickCircle" src="n0js9b" fileName="components/comClickCircle.xml" xy="403,823" pivot="0.5,0.5" scale="0,0"/>
-    <graph id="n30_uo1t" name="grh_0" xy="258,270" pivot="0.5,0.5" size="25,25" aspect="true"/>
-    <graph id="n23_uo1t" name="grh_1" xy="764,660" pivot="0.5,0.5" size="25,25" aspect="true"/>
-    <graph id="n24_uo1t" name="grh_2" xy="757,1224" pivot="0.5,0.5" size="25,25" aspect="true"/>
-    <graph id="n25_uo1t" name="grh_3" xy="148,463" pivot="0.5,0.5" size="25,25" aspect="true"/>
-    <graph id="n26_uo1t" name="grh_4" xy="226,1269" pivot="0.5,0.5" size="25,25" aspect="true"/>
-    <graph id="n27_uo1t" name="grh_5" xy="178,1500" pivot="0.5,0.5" size="25,25" aspect="true"/>
-    <graph id="n28_uo1t" name="grh_6" xy="140,786" pivot="0.5,0.5" size="25,25" aspect="true"/>
-    <graph id="n29_uo1t" name="grh_7" xy="722,310" pivot="0.5,0.5" size="25,25" aspect="true"/>
+    <component id="n4_n0js" name="comClickCircle" src="n0js9b" fileName="components/comClickCircle.xml" xy="120,1439" pivot="0.5,0.5"/>
+    <graph id="n30_uo1t" name="grh_0" xy="570,228" pivot="0.5,0.5" size="25,25" aspect="true"/>
+    <graph id="n23_uo1t" name="grh_1" xy="139,374" pivot="0.5,0.5" size="25,25" aspect="true"/>
+    <graph id="n24_uo1t" name="grh_2" xy="590,492" pivot="0.5,0.5" size="25,25" aspect="true"/>
+    <graph id="n25_uo1t" name="grh_3" xy="653,957" pivot="0.5,0.5" size="25,25" aspect="true"/>
+    <graph id="n26_uo1t" name="grh_4" xy="89,729" pivot="0.5,0.5" size="25,25" aspect="true"/>
+    <graph id="n48_wono" name="grh_5" xy="111,1429" pivot="0.5,0.5" size="25,25" aspect="true"/>
     <component id="n36_jj0m" name="btnSpeedUp" src="jj0mdl" fileName="componentsDialog/ButtonSpeedUp1.xml" xy="915,1627">
     <component id="n36_jj0m" name="btnSpeedUp" src="jj0mdl" fileName="componentsDialog/ButtonSpeedUp1.xml" xy="915,1627">
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1"/>
       <Button title="x1"/>

+ 4 - 2
FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -4,8 +4,10 @@
     <component id="n2_8xpg" name="btnSkip" src="nmnb2x" fileName="componentsDialog/ButtonSkip.xml" xy="867,1769" visible="false">
     <component id="n2_8xpg" name="btnSkip" src="nmnb2x" fileName="componentsDialog/ButtonSkip.xml" xy="867,1769" visible="false">
       <relation target="" sidePair="bottom-bottom"/>
       <relation target="" sidePair="bottom-bottom"/>
     </component>
     </component>
-    <component id="n37_mhyh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="170,80">
+    <component id="n37_mhyh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,60">
+      <Button icon="ui://eg2y0ldpuyuxtj4"/>
+    </component>
+    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="170,108" pivot="0,0.5" anchor="true">
       <ProgressBar max="100"/>
       <ProgressBar max="100"/>
     </component>
     </component>
     <component id="n17_mza1" name="comMineCircle" src="c2umeg" fileName="components/comMineCircle.xml" xy="380,1428" pivot="0.5,0.5" anchor="true" visible="false">
     <component id="n17_mza1" name="comMineCircle" src="c2umeg" fileName="components/comMineCircle.xml" xy="380,1428" pivot="0.5,0.5" anchor="true" visible="false">

+ 1 - 1
FGUIProject/assets/Main/components/Component2.xml

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

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

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="836,43" extention="ProgressBar">
+<component size="801,40" extention="ProgressBar">
   <displayList>
   <displayList>
-    <image id="n0_uj53" name="n0" src="v3k9cq" fileName="imagesStory/zd_zdjdt_1.png" xy="-17,0">
+    <image id="n0_uj53" name="n0" src="v3k9cq" fileName="imagesStory/zd_zdjdt_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     </image>
-    <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="836,24"/>
-    <text id="n4_uj53" name="txtMineScore" xy="10,50" size="148,44" font="ui://eg2y0ldpk1kha2" fontSize="32" color="#fcf5ec" vAlign="bottom" strokeColor="#796135" strokeSize="2" text="赵四10086">
+    <image id="n7_v3k9" name="n7" src="v3k9cs" fileName="imagesStory/zd_zdjdt_3.png" xy="13,8" size="775,24" flip="hz"/>
+    <component id="n1_uj53" name="comBar" src="k1khe7" fileName="components/Component2.xml" xy="13,8"/>
+    <text id="n4_uj53" name="txtMineScore" xy="10,50" size="193,49" fontSize="36" color="#fcf5ec" vAlign="bottom" bold="true" strokeColor="#9c7735" strokeSize="2" text="赵四10086">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </text>
     </text>
-    <text id="n5_uj53" name="txtNpcScore" xy="826,50" pivot="1,0" anchor="true" size="180,44" font="ui://eg2y0ldpk1kha2" fontSize="32" color="#fcf5ec" align="right" vAlign="bottom" strokeColor="#796135" strokeSize="2" text="小宫女10086">
+    <text id="n5_uj53" name="txtNpcScore" xy="791,50" pivot="1,0" anchor="true" size="230,49" fontSize="36" color="#fcf5ec" align="right" vAlign="bottom" bold="true" strokeColor="#9c7735" strokeSize="2" text="小宫女10086">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </text>
     </text>
+    <text id="n8_wono" name="txtCount" xy="1,158" size="113,49" fontSize="36" color="#fcf5ec" vAlign="middle" bold="true" strokeColor="#9c7735" strokeSize="2" text="总分 0"/>
   </displayList>
   </displayList>
   <ProgressBar/>
   <ProgressBar/>
 </component>
 </component>

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

@@ -422,6 +422,7 @@
     <image id="wonoh1" name="zd_jz_3.png" path="/imagesStory/"/>
     <image id="wonoh1" name="zd_jz_3.png" path="/imagesStory/"/>
     <component id="wonoh2" name="ComSingleScoreStage.xml" path="/components/"/>
     <component id="wonoh2" name="ComSingleScoreStage.xml" path="/components/"/>
     <image id="wonoh3" name="zd_bl_1.png" path="/imagesStory/" exported="true"/>
     <image id="wonoh3" name="zd_bl_1.png" path="/imagesStory/" exported="true"/>
+    <image id="wonoh4" name="e99aaa17c9c248f0c46e82b085a5e67.jpg" path="/"/>
   </resources>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

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

@@ -10,6 +10,7 @@ namespace UI.Main
         public UI_Component2 m_comBar;
         public UI_Component2 m_comBar;
         public GTextField m_txtMineScore;
         public GTextField m_txtMineScore;
         public GTextField m_txtNpcScore;
         public GTextField m_txtNpcScore;
+        public GTextField m_txtCount;
         public const string URL = "ui://mfvz4q8kv3k9c7";
         public const string URL = "ui://mfvz4q8kv3k9c7";
         public const string PACKAGE_NAME = "Main";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ProgressBarTargetScore";
         public const string RES_NAME = "ProgressBarTargetScore";
@@ -60,6 +61,7 @@ namespace UI.Main
             m_comBar = (UI_Component2)UI_Component2.Create(comp.GetChild("comBar"));
             m_comBar = (UI_Component2)UI_Component2.Create(comp.GetChild("comBar"));
             m_txtMineScore = (GTextField)comp.GetChild("txtMineScore");
             m_txtMineScore = (GTextField)comp.GetChild("txtMineScore");
             m_txtNpcScore = (GTextField)comp.GetChild("txtNpcScore");
             m_txtNpcScore = (GTextField)comp.GetChild("txtNpcScore");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
@@ -67,6 +69,7 @@ namespace UI.Main
             m_comBar = null;
             m_comBar = null;
             m_txtMineScore = null;
             m_txtMineScore = null;
             m_txtNpcScore = null;
             m_txtNpcScore = null;
+            m_txtCount = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

+ 0 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightSingleScoreUI.cs

@@ -20,8 +20,6 @@ namespace UI.Main
         public GGraph m_grh_3;
         public GGraph m_grh_3;
         public GGraph m_grh_4;
         public GGraph m_grh_4;
         public GGraph m_grh_5;
         public GGraph m_grh_5;
-        public GGraph m_grh_6;
-        public GGraph m_grh_7;
         public GButton m_btnSpeedUp;
         public GButton m_btnSpeedUp;
         public GGraph m_grhMask;
         public GGraph m_grhMask;
         public UI_ComRoleResult m_comRoleResult;
         public UI_ComRoleResult m_comRoleResult;
@@ -87,8 +85,6 @@ namespace UI.Main
             m_grh_3 = (GGraph)comp.GetChild("grh_3");
             m_grh_3 = (GGraph)comp.GetChild("grh_3");
             m_grh_4 = (GGraph)comp.GetChild("grh_4");
             m_grh_4 = (GGraph)comp.GetChild("grh_4");
             m_grh_5 = (GGraph)comp.GetChild("grh_5");
             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_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
             m_grhMask = (GGraph)comp.GetChild("grhMask");
             m_grhMask = (GGraph)comp.GetChild("grhMask");
             m_comRoleResult = (UI_ComRoleResult)UI_ComRoleResult.Create(comp.GetChild("comRoleResult"));
             m_comRoleResult = (UI_ComRoleResult)UI_ComRoleResult.Create(comp.GetChild("comRoleResult"));
@@ -113,8 +109,6 @@ namespace UI.Main
             m_grh_3 = null;
             m_grh_3 = null;
             m_grh_4 = null;
             m_grh_4 = null;
             m_grh_5 = null;
             m_grh_5 = null;
-            m_grh_6 = null;
-            m_grh_7 = null;
             m_btnSpeedUp = null;
             m_btnSpeedUp = null;
             m_grhMask = null;
             m_grhMask = null;
             m_comRoleResult.Dispose();
             m_comRoleResult.Dispose();

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -141,7 +141,9 @@ namespace GFGGame
             Vector2 pos = (_ui.target.GetChild("grh_" + _index).asGraph).xy;
             Vector2 pos = (_ui.target.GetChild("grh_" + _index).asGraph).xy;
             float x = 0f;
             float x = 0f;
             float y = 0f;
             float y = 0f;
-            EquipDataCache.cacher.GetCirclePos(pos, _range, out x, out y);
+            // EquipDataCache.cacher.GetCirclePos(pos, _range, out x, out y);
+            x = pos.x;
+            y = pos.y;
             _ui.m_comClickCircle.target.SetXY(x, y);
             _ui.m_comClickCircle.target.SetXY(x, y);
             _ui.m_loaGlass.SetXY(x, y);
             _ui.m_loaGlass.SetXY(x, y);
             _ui.m_loaGlass.url = string.Format("ui://Main/zd_bl_{0}", UnityEngine.Random.Range(0, 3));
             _ui.m_loaGlass.url = string.Format("ui://Main/zd_bl_{0}", UnityEngine.Random.Range(0, 3));

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


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