双人战斗

FGUIProject/assets/Arena/package.xml

@@ -46,6 +46,7 @@
     <image id="psph1c" name="hz_zdikuang_2.png" path="/images/"/>
     <component id="psph1d" name="ComCard.xml" path="/components/"/>
     <component id="psph1e" name="BtnTab3.xml" path="/components/"/>
+    <image id="psph1f" name="b9677f930b91d918bb2d80bdee69fb1.png" path="/Designs/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Arena" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

@@ -7,7 +7,7 @@
     <image id="n52_wono" name="imgRole" src="v482fx" fileName="zjm_1.jpg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <component id="n53_f2bf" name="comClick" src="f2bfiw" fileName="components/ComClick.xml" xy="0,0">
+    <component id="n53_f2bf" name="comClick" src="psphj5" fileName="components/ComClick1.xml" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
     <component id="n34_tc53" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,80">
@@ -21,7 +21,7 @@
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1"/>
     </component>
-    <component id="n54_psph" name="comAllPerfect" src="cn279k" fileName="components/ComAllPerfect.xml" xy="367,963"/>
+    <component id="n54_psph" name="comAllPerfect" src="psphj4" fileName="components/ComAllPerfect1.xml" xy="367,963"/>
     <loader id="n51_wono" name="LoaMask" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" alpha="0" align="center" vAlign="middle" fill="scaleMatchHeight">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -7,7 +7,7 @@
     <image id="n62_psph" name="imgRole" src="v482fx" fileName="zjm_1.jpg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <component id="n50_psph" name="comClick" src="f2bfiw" fileName="components/ComClick.xml" xy="0,0">
+    <component id="n50_psph" name="comClick" src="psphj5" fileName="components/ComClick1.xml" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
     <component id="n37_mhyh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,80">
@@ -24,7 +24,7 @@
     </component>
     <component id="n54_psph" name="comTargetCard" src="psphiz" fileName="components/ComTargetCard.xml" xy="1180,540" pivot="0.5,0.5" anchor="true" size="174,250" aspect="true"/>
     <component id="n55_psph" name="comDeduction" src="psphix" fileName="components/ComDeduction.xml" xy="102,500" pivot="0.5,0.5" anchor="true" scale="0,0"/>
-    <component id="n56_psph" name="comAllPerfect" src="cn279k" fileName="components/ComAllPerfect.xml" xy="367,963"/>
+    <component id="n56_psph" name="comAllPerfect" src="psphj4" fileName="components/ComAllPerfect1.xml" xy="367,963"/>
     <loader id="n57_psph" name="LoaMask" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" alpha="0" align="center" vAlign="middle" fill="scaleMatchHeight">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>

FGUIProject/assets/Main/components/ComAllPerfect.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="345,367">
+  <displayList>
+    <loader id="n41_psph" name="n41" xy="49,60" size="247,247"/>
+    <image id="n31_cn27" name="n31" src="vuz5bp" fileName="imagesStory/zd_pfhd_4.png" xy="49,52" pivot="0.5,0.5" group="n40_psph"/>
+    <image id="n33_cn27" name="imgCircle" src="vuz5bp" fileName="imagesStory/zd_pfhd_4.png" xy="49,52" pivot="0.5,0.5" group="n40_psph" aspect="true"/>
+    <image id="n35_oixc" name="n35" src="oixcbz" fileName="imagesStory/zd_ztca.png" xy="85,138" group="n40_psph"/>
+    <movieclip id="n32_cn27" name="n32" src="vuz5bw" fileName="Movie/MovieClip2.jta" xy="139,151" pivot="0.5,0.5" size="66,65" group="n40_psph" aspect="true" scale="1.5,1.5"/>
+    <group id="n40_psph" name="n40" xy="49,52" size="247,262" advanced="true"/>
+    <graph id="n36_qgxy" name="holder" xy="181,-236" size="1,1" group="n39_qgxy"/>
+    <image id="n37_qgxy" name="img" src="vuz5bg" fileName="imagesStory/zd_pfziti_4.png" xy="65,-308" group="n39_qgxy"/>
+    <text id="n38_qgxy" name="txtCount" xy="64,-215" pivot="0.5,0" size="234,69" group="n39_qgxy" font="ui://mfvz4q8kvuz5b5" fontSize="65" text="66666"/>
+    <group id="n39_qgxy" name="n39" xy="64,-308" size="234,162" advanced="true"/>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Scale" target="n33_cn27" tween="true" startValue="1.5,1.5" endValue="1,1" duration="24" ease="Linear"/>
+    <item time="0" type="Visible" target="n31_cn27" value="true"/>
+    <item time="0" type="Visible" target="n32_cn27" value="true"/>
+    <item time="0" type="Visible" target="n33_cn27" value="true"/>
+    <item time="0" type="Visible" target="n35_oixc" value="true"/>
+    <item time="0" type="Visible" target="n39_qgxy" value="false"/>
+    <item time="0" type="Visible" target="n40_psph" value="true"/>
+    <item time="0" type="XY" target="n32_cn27" value="512,-55"/>
+    <item time="24" type="Rotation" target="n32_cn27" tween="true" startValue="0" endValue="-250" duration="48" ease="Quad.In"/>
+    <item time="24" type="Visible" target="n33_cn27" value="false"/>
+    <item time="24" type="XY" target="n32_cn27" tween="true" startValue="512,-55" endValue="111,173" duration="48" ease="Quad.In" path="2,0,0,-104,-572,-1143,-217,1,2,-401,228,342.8462,674.1072,0,0,1"/>
+    <item time="72" type="Visible" target="n31_cn27" value="false"/>
+    <item time="72" type="Visible" target="n32_cn27" value="false"/>
+    <item time="72" type="Visible" target="n35_oixc" value="false"/>
+    <item time="72" type="Visible" target="n39_qgxy" value="false"/>
+    <item time="72" type="Visible" target="n40_psph" value="false"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Visible" target="n39_qgxy" value="true"/>
+    <item time="0" type="Visible" target="n40_psph" value="false"/>
+    <item time="9" type="Visible" target="n39_qgxy" value="true"/>
+    <item time="63" type="Visible" target="n39_qgxy" value="false"/>
+    <item time="72" type="Visible" target="n39_qgxy" value="false"/>
+  </transition>
+</component>

FGUIProject/assets/Main/components/ComClick.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <graph id="n30_uo1t" name="grh_0" xy="570,228" pivot="0.5,0.5" size="25,25" group="n52_psph" aspect="true"/>
+    <graph id="n23_uo1t" name="grh_1" xy="139,374" pivot="0.5,0.5" size="25,25" group="n52_psph" aspect="true"/>
+    <graph id="n24_uo1t" name="grh_2" xy="590,492" pivot="0.5,0.5" size="25,25" group="n52_psph" aspect="true"/>
+    <graph id="n25_uo1t" name="grh_3" xy="653,957" pivot="0.5,0.5" size="25,25" group="n52_psph" aspect="true"/>
+    <graph id="n26_uo1t" name="grh_4" xy="89,729" pivot="0.5,0.5" size="25,25" group="n52_psph" aspect="true"/>
+    <graph id="n48_wono" name="grh_5" xy="111,1429" pivot="0.5,0.5" size="25,25" group="n52_psph" aspect="true"/>
+    <group id="n52_psph" name="n52" xy="89,228" size="589,1226" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
+    <component id="n51_f2bf" name="comResult" src="vuz5bi" fileName="components/ComScoreResult.xml" xy="143,489"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/ComDeduction.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="196,196">
+  <displayList>
+    <image id="n55_psph" name="n55" src="v3k9cf" fileName="imagesStory/zd_jineng_4.png" xy="0,0"/>
+    <text id="n56_psph" name="txtDeduction" xy="54,76" pivot="0.5,0" size="77,46" fontSize="34" align="center" text="-666"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/package.xml

@@ -201,7 +201,6 @@
     <component id="r1a99d" name="StoryCardChooseUI.xml" path="/" exported="true"/>
     <component id="r1a99f" name="ListCardItem.xml" path="/components/"/>
     <image id="r1a99g" name="fzd_fzxzhong.png" path="/imagesStory/"/>
-    <component id="cn279k" name="ComAllPerfect.xml" path="/components/"/>
     <component id="py009l" name="StorySkillUI.xml" path="/" exported="true"/>
     <image id="py009m" name="zd_kpdi_2.png" path="/imagesStory/"/>
     <image id="py009n" name="zd_kpdi_1.png" path="/imagesStory/"/>
@@ -433,7 +432,6 @@
     <image id="v95qia" name="zd_jz_2.png" path="/imagesStory/"/>
     <image id="v95qib" name="zd_jdbiao.png" path="/imagesStory/"/>
     <image id="v95qid" name="zd_zdjnsm_1.png" path="/imagesFight/"/>
-    <component id="v95qie" name="ComSkillTips.xml" path="/components/"/>
     <image id="dhoaif" name="zjm_bbbb.png" path="/images/"/>
     <image id="ysx9ig" name="fzl_fzl.png" path="/images/"/>
     <image id="weokih" name="zjm_22.png" path="/images/"/>
@@ -451,10 +449,14 @@
     <component id="mzf8it" name="ButtonModle6.xml" path="/components/"/>
     <component id="mzf8iu" name="ButtonModle7.xml" path="/components/"/>
     <component id="f2bfiv" name="comSingleClickCircle.xml" path="/components/"/>
-    <component id="f2bfiw" name="ComClick.xml" path="/components/"/>
     <component id="psphix" name="ComDeduction.xml" path="/components/"/>
     <component id="psphiy" name="ComSkillShow.xml" path="/components/"/>
     <component id="psphiz" name="ComTargetCard.xml" path="/components/"/>
+    <component id="psphj0" name="ComClick.xml" path="/"/>
+    <component id="psphj1" name="ComSkillTips.xml" path="/"/>
+    <component id="psphj2" name="ComAllCircle.xml" path="/components/"/>
+    <component id="psphj4" name="ComAllPerfect.xml" path="/components/"/>
+    <component id="psphj5" name="ComClick.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -13,7 +13,7 @@ namespace UI.Main
         public GTextField m_txtCount;
         public Transition m_t0;
         public Transition m_t1;
-        public const string URL = "ui://mfvz4q8kcn279k";
+        public const string URL = "ui://mfvz4q8kpsphj4";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComAllPerfect";
         private static UI_ComAllPerfect _proxy;

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

@@ -14,7 +14,7 @@ namespace UI.Main
         public GGraph m_grh_4;
         public GGraph m_grh_5;
         public UI_ComScoreResult m_comResult;
-        public const string URL = "ui://mfvz4q8kf2bfiw";
+        public const string URL = "ui://mfvz4q8kpsphj5";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComClick";
         private static UI_ComClick _proxy;

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

@@ -287,10 +287,17 @@ namespace GFGGame
                     PartScoreStart();
                     break;
                 case BeginTime.PART_PREFACT_CLICK:
-                    Timers.inst.Add(0.3f, 1, (object param) =>
+                    if (_skillScore < 0)
+                    {
+                        Timers.inst.Add(0.3f, 1, (object param) =>
+                        {
+                            PartScoreResultStart(ClickType.PREFACT_CLICK);
+                        });
+                    }
+                    else
                     {
                         PartScoreResultStart(ClickType.PREFACT_CLICK);
-                    });
+                    }
                     break;
                 case BeginTime.PART_FIGHT_END:
                     UpdateProgress(OnePartScoreEnd);

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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: f21b5e84ae865fe4c8ee426a73ffe8c4
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 71a5a6d3d384aa54da774c96d5468df0
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: