结算

FGUIProject/assets/DressUp/components/TypeItem.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="216,210">
   <displayList>
-    <image id="n5_wono" name="n5" src="wonodu" fileName="images/hz_yjmzdi_2.png" xy="24,0" group="n8_wono"/>
-    <loader id="n0_k6he" name="icon" xy="120,96" pivot="0.5,0.5" anchor="true" size="102,102" group="n8_wono" url="ui://mbo439wbq08x9" align="center" vAlign="middle" autoSize="true" playing="false" clearOnPublish="true"/>
-    <image id="n3_pjip" name="imgNeed" src="pjip2z" fileName="images/hz_bcbc_1.png" xy="24,0" group="n8_wono"/>
-    <image id="n4_ovm4" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" pkg="eg2y0ldp" xy="0,63" group="n8_wono"/>
-    <image id="n6_wono" name="n6" src="wonodt" fileName="images/hz_yjmzdi_1.png" xy="42,168" group="n8_wono"/>
-    <text id="n7_wono" name="txtname" xy="86,167" pivot="0.5,0" size="68,44" group="n8_wono" font="ui://eg2y0ldpwonotjc" fontSize="32" color="#bc9456" text="发型"/>
-    <group id="n8_wono" name="n8" xy="0,0" size="216,211"/>
+    <image id="n5_wono" name="n5" src="wonodu" fileName="images/hz_yjmzdi_2.png" xy="24,0"/>
+    <loader id="n0_k6he" name="icon" xy="120,96" pivot="0.5,0.5" anchor="true" size="102,102" url="ui://mbo439wbq08x9" align="center" vAlign="middle" autoSize="true" playing="false" clearOnPublish="true"/>
+    <image id="n3_pjip" name="imgNeed" src="pjip2z" fileName="images/hz_bcbc_1.png" xy="24,0"/>
+    <image id="n4_ovm4" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" pkg="eg2y0ldp" xy="0,63"/>
+    <image id="n6_wono" name="n6" src="wonodt" fileName="images/hz_yjmzdi_1.png" xy="42,168"/>
+    <text id="n7_wono" name="txtname" xy="86,167" pivot="0.5,0" size="68,44" font="ui://eg2y0ldpwonotjc" fontSize="32" color="#bc9456" text="发型"/>
   </displayList>
 </component>

FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

@@ -4,7 +4,10 @@
     <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>
-    <loader id="n38_wono" name="loaRole" xy="0,-240" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchWidth">
+    <image id="n52_wono" name="imgRole" src="v482fx" fileName="zjm_1.jpg" xy="540,960" pivot="0.5,0.5" anchor="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
+    <loader id="n38_wono" name="loaRole" xy="0,-240" size="1080,2400" visible="false" align="center" vAlign="middle" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n34_tc53" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,60">

FGUIProject/assets/Main/components/ComRole.xml

@@ -8,12 +8,16 @@
     <loader id="n15_wono" name="loaRole" xy="342,690" pivot="0.5,0.5" anchor="true" size="1110,1973" aspect="true" alpha="0" align="center" vAlign="middle" fill="scaleMatchWidth">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
+    <image id="n18_wono" name="imgRole" src="v482fx" fileName="zjm_1.jpg" xy="293,658" pivot="0.5,0.5" anchor="true" size="1110,2466" aspect="true" alpha="0">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
     <image id="n17_wono" name="n17" src="wonogx" fileName="imagesFight/jz_yjd_f.png" xy="0,0" visible="false"/>
   </displayList>
   <transition name="t0">
     <item time="0" type="Visible" target="n17_wono" value="true"/>
     <item time="0" type="XY" target="n17_wono" tween="true" startValue="0,-1000" endValue="0,1300" duration="12" ease="Linear"/>
     <item time="12" type="Alpha" target="n15_wono" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
+    <item time="12" type="Alpha" target="n18_wono" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
     <item time="12" type="Visible" target="n17_wono" value="false"/>
   </transition>
 </component>

FGUIProject/assets/Main/package.xml

@@ -384,7 +384,7 @@
     <image id="v482fu" name="zjm_rk_8.png" path="/images/"/>
     <image id="v482fv" name="zjm_rk_9.png" path="/images/"/>
     <image id="v482fw" name="zjm_2.jpg" path="/"/>
-    <image id="v482fx" name="zjm_1.jpg" path="/"/>
+    <image id="v482fx" name="zjm_1.jpg" path="/" atlas="alone_npot"/>
     <image id="qqatfy" name="zjm_hdhd_2.png" path="/images/"/>
     <component id="njmnfz" name="ChangeNameUI.xml" path="/" exported="true"/>
     <image id="njmng0" name="mc_jlkuang_1.png" path="/images/"/>

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

@@ -9,6 +9,7 @@ namespace UI.Main
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaRole;
+        public GImage m_imgRole;
         public Transition m_t0;
         public const string URL = "ui://mfvz4q8kwonogm";
         public const string PACKAGE_NAME = "Main";
@@ -59,12 +60,14 @@ namespace UI.Main
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaRole = (GLoader)comp.GetChild("loaRole");
+            m_imgRole = (GImage)comp.GetChild("imgRole");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_loaRole = null;
+            m_imgRole = null;
             m_t0 = null;
             if(disposeTarget && target != null)
             {

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

@@ -8,6 +8,7 @@ namespace UI.Main
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GImage m_imgRole;
         public GLoader m_loaRole;
         public GButton m_btnBack;
         public UI_ProgressBar1 m_proScore;
@@ -74,6 +75,7 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_imgRole = (GImage)comp.GetChild("imgRole");
             m_loaRole = (GLoader)comp.GetChild("loaRole");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_proScore = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proScore"));
@@ -96,6 +98,7 @@ namespace UI.Main
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_imgRole = null;
             m_loaRole = null;
             m_btnBack = null;
             m_proScore.Dispose();

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

@@ -19,7 +19,7 @@ namespace GFGGame
         private double _mainScore;//总主属性分
         private const int _range = 100;//圆圈随机范围
         private const float _prefectScale = 60f;//完美缩放比
-        private Texture _texture;
+        private NTexture _nTexture;
         private bool _stopFight = false;
 
         // private GameObject _gameObject0;
@@ -79,8 +79,11 @@ namespace GFGGame
             ScoreSystemData.Instance.SetEquipDicWithType();
 
             _ui.m_comClickCircle.target.touchable = false;
-            NTexture nTexture = new NTexture(EquipDataCache.cacher.RoleTextuex);
-            _ui.m_loaRole.texture = nTexture;//EquipDataCache.cacher.FightRoleRes;
+            _nTexture = new NTexture(EquipDataCache.cacher.RoleTextuex);
+
+            // _ui.m_loaRole.texture = _nTexture;//EquipDataCache.cacher.FightRoleRes;
+            _ui.m_imgRole.SetSize(_nTexture.width, _nTexture.height);
+            _ui.m_imgRole.texture = _nTexture;
 
             _ui.m_btnSpeedUp.visible = EquipDataCache.cacher.autoPlay;
             _ui.m_btnSpeedUp.title = "x" + EquipDataCache.cacher.fightSpeed;
@@ -190,8 +193,11 @@ namespace GFGGame
             if (_index >= FightScoreCfgArray.Instance.dataArray.Length)
             {
                 GetCurStar(out int star, out Transition transition);
-                NTexture nTexture = new NTexture(EquipDataCache.cacher.RoleTextuex);
-                _ui.m_comRoleResult.m_comRole.m_loaRole.texture = nTexture;
+
+                // _ui.m_comRoleResult.m_comRole.m_loaRole.texture = _nTexture;
+                // _ui.m_comRoleResult.m_comRole.m_loaRole.texture = _nTexture;
+                _ui.m_comRoleResult.m_comRole.m_imgRole.texture = _nTexture;
+                _ui.m_comRoleResult.m_comRole.m_imgRole.SetSize(_nTexture.width, _nTexture.height);
                 _ui.m_comRoleResult.m_c1.selectedIndex = 0;
                 _ui.m_LoaMask.touchable = true;
                 _ui.m_t3.Play();
@@ -288,8 +294,6 @@ namespace GFGGame
             _ui.m_comScoreStage.target.visible = true;
             _ui.m_comClickCircle.target.SetScale(0, 0);
             _ui.m_loaGlass.SetScale(0, 0);
-
-
         }
 
 

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

@@ -81,9 +81,11 @@ namespace GFGGame
 
             GLoader loaRole = _ui.m_ComRoleResult.m_comRole.m_loaRole;
             NTexture nTexture = new NTexture(EquipDataCache.cacher.RoleTextuex);
-            loaRole.texture = nTexture;
-            loaRole.alpha = 1;
-
+            // loaRole.texture = nTexture;
+            // loaRole.alpha = 1;
+            _ui.m_ComRoleResult.m_comRole.m_imgRole.alpha = 1;
+            _ui.m_ComRoleResult.m_comRole.m_imgRole.SetSize(nTexture.width, nTexture.height);
+            _ui.m_ComRoleResult.m_comRole.m_imgRole.texture = nTexture;
             // loaRole.SetSize(loaRole.width, loaRole.texture.height * loaRole.width / loaRole.texture.width);
 
             _ui.m_comResult.m_c1.selectedIndex = _resultData.Star;

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

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