Browse Source

战斗结算

zhaoyang 2 years ago
parent
commit
ea912b5c7a

+ 3 - 3
FGUIProject/assets/Main/StoryFightResultUI.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <loader id="n11_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"/>
+    <loader id="n11_wono" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchHeight">
+      <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <graph id="n1_8xpg" name="btnClose" xy="0,0" size="1080,1920" alpha="0" type="rect" fillColor="#ffff0000">
       <relation target="" sidePair="width-width,height-height"/>
@@ -10,7 +10,7 @@
     <component id="n8_wono" name="comResult" src="wonogf" fileName="components/ComResult.xml" xy="815,141" pivot="0.5,0" size="265,601">
       <relation target="n10_wono" sidePair="top-top"/>
     </component>
-    <component id="n10_wono" name="comRoleResult" src="wonogk" fileName="components/ComRoleResult.xml" xy="175,222">
+    <component id="n10_wono" name="comRoleResult" src="wonogk" fileName="components/ComRoleResult.xml" xy="175,222" pivot="0.5,0.5" scale="1.1,1.1">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
     <component id="n2_8xpg" name="comExpBar" src="8xpg52" fileName="components/CompFightExpBar.xml" xy="0,1673" alpha="0">

+ 5 - 5
FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://mfvz4q8kwonoh4">
   <displayList>
-    <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"/>
+    <loader id="n39_wono" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchHeight">
+      <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <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"/>
@@ -21,8 +21,8 @@
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1"/>
     </component>
-    <loader id="n51_wono" name="LoaMask" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" alpha="0" touchable="false" fill="scaleMatchWidth">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    <loader id="n51_wono" name="LoaMask" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" alpha="0" touchable="false" align="center" vAlign="middle" fill="scaleMatchHeight">
+      <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <component id="n46_wono" name="comRoleResult" src="wonogk" fileName="components/ComRoleResult.xml" xy="540,959" pivot="0.5,0.5" anchor="true" scale="0,0" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
@@ -50,7 +50,7 @@
   </transition>
   <transition name="t2">
     <item time="0" type="Alpha" target="n51_wono" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
-    <item time="0" type="Scale" target="n46_wono" tween="true" startValue="0,0" endValue="1,1" duration="12" ease="Linear"/>
+    <item time="0" type="Scale" target="n46_wono" tween="true" startValue="0,0" endValue="1.1,1.1" duration="12" ease="Linear"/>
     <item time="0" type="Skew" target="n46_wono" tween="true" startValue="0,-180" endValue="0,0" duration="12" ease="Linear"/>
     <item time="0" type="Visible" target="n42_wono" value="false"/>
   </transition>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="730,1475" opaque="false">
-  <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
     <component id="n14_wono" name="comRole" src="wonogm" fileName="components/ComRole.xml" xy="72,90"/>
     <image id="n11_wono" name="n11" src="wonog6" fileName="imagesFight/jz_yjd_k.png" xy="39,60"/>

BIN
FGUIProject/assets/Main/imagesFight/jz_yjd_dd.png


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

@@ -63,8 +63,8 @@ namespace GFGGame
 
             _ui.m_comClickCircle.target.onClick.Add(OnComClickCircle);
 
-            _ui.m_loaBg.url = ResPathUtil.GetFightBgImgPath("zd_bj_bja_2");
-            _ui.m_LoaMask.url = ResPathUtil.GetFightBgImgPath("zd_jsjm_bjtu");
+            _ui.m_loaBg.url = ResPathUtil.GetFightBgImgPath("fightBg");
+            _ui.m_LoaMask.url = ResPathUtil.GetFightBgImgPath("fightBg");
 
 
         }

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

@@ -65,7 +65,7 @@ namespace GFGGame
             _ui.m_btnClose.enabled = false;
             _ui.m_btnClose.onClick.Add(OnClickBtnClose);
 
-            _ui.m_loaBg.url = ResPathUtil.GetFightBgImgPath("zd_jsjm_bjtu");
+            _ui.m_loaBg.url = ResPathUtil.GetFightBgImgPath("fightBg");
 
         }
 

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


BIN
GameClient/Assets/ResIn/Fight/fightBg.png


+ 96 - 0
GameClient/Assets/ResIn/Fight/fightBg.png.meta

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

+ 1 - 1
GameClient/Assets/ResIn/Prefab/SceneFightResult.prefab

@@ -71,7 +71,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: -999
-  m_Sprite: {fileID: 21300000, guid: 6fe07358b7102e94bb4bddc5e7aad403, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 859afd0190d7e284f8a4dfffbf313f68, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

+ 1 - 1
GameClient/Assets/ResIn/Prefab/SceneFightSingle.prefab

@@ -71,7 +71,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: -999
-  m_Sprite: {fileID: 21300000, guid: f6ef83aeaa759b748bc6116cca3c711f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 03cdae2317655b24e9b791c43f151e7a, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

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_fui.bytes