战斗表现修改

GameClient/Assets/Game/HotUpdate/Data/RoleInfoManager.cs

@@ -215,11 +215,17 @@ namespace GFGGame
             UI_ComHead comHead = UI_ComHead.Proxy(component);
             if(headBorderCfg.res.Length == 0)
             {
-                comHead.m_c2.selectedIndex = 0;
+                if(comHead.m_c2 != null)
+                {
+                    comHead.m_c2.selectedIndex = 0;
+                }            
             }
             else
             {
-                comHead.m_c2.selectedIndex = 1;
+                if (comHead.m_c2 != null)
+                {
+                    comHead.m_c2.selectedIndex = 1;
+                }
                 comHead.m_loaBorder.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
             }
             comHead.m_comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);

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

@@ -17,9 +17,11 @@ namespace UI.Main
         public GGraph m_holder0;
         public GGraph m_holder1;
         public GGraph m_holder2;
+        public GLoader m_numBg;
         public GTextField m_txtCount0;
         public GTextField m_txtCount1;
         public GTextField m_txtCount2;
+        public GLoader m_evaluatext;
         public GGroup m_grpResult;
         public Transition m_t0;
         public Transition m_t1;
@@ -80,9 +82,11 @@ namespace UI.Main
             m_holder0 = (GGraph)comp.GetChild("holder0");
             m_holder1 = (GGraph)comp.GetChild("holder1");
             m_holder2 = (GGraph)comp.GetChild("holder2");
+            m_numBg = (GLoader)comp.GetChild("numBg");
             m_txtCount0 = (GTextField)comp.GetChild("txtCount0");
             m_txtCount1 = (GTextField)comp.GetChild("txtCount1");
             m_txtCount2 = (GTextField)comp.GetChild("txtCount2");
+            m_evaluatext = (GLoader)comp.GetChild("evaluatext");
             m_grpResult = (GGroup)comp.GetChild("grpResult");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
@@ -99,9 +103,11 @@ namespace UI.Main
             m_holder0 = null;
             m_holder1 = null;
             m_holder2 = null;
+            m_numBg = null;
             m_txtCount0 = null;
             m_txtCount1 = null;
             m_txtCount2 = null;
+            m_evaluatext = null;
             m_grpResult = null;
             m_t0 = null;
             m_t1 = null;

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

@@ -7,10 +7,12 @@ namespace UI.Main
     public partial class UI_StoryFightSingleScoreUI
     {
         public GComponent target;
+        public GLoader m_bg;
+        public GGraph m_holder;
         public UI_ComClick m_comClick;
-        public GButton m_btnBack;
         public UI_ProgressBar1 m_proScore;
         public GButton m_btnSpeedUp;
+        public GLoader m_btnBack;
         public const string URL = "ui://mfvz4q8k8xpg3x";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightSingleScoreUI";
@@ -58,19 +60,23 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_holder = (GGraph)comp.GetChild("holder");
             m_comClick = (UI_ComClick)UI_ComClick.Create(comp.GetChild("comClick"));
-            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_proScore = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proScore"));
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
+            m_btnBack = (GLoader)comp.GetChild("btnBack");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_bg = null;
+            m_holder = null;
             m_comClick.Dispose();
             m_comClick = null;
-            m_btnBack = null;
             m_proScore.Dispose();
             m_proScore = null;
             m_btnSpeedUp = null;
+            m_btnBack = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,8 +7,10 @@ namespace UI.Main
     public partial class UI_StoryFightTargetScoreUI
     {
         public GComponent target;
+        public GLoader m_bg;
+        public GGraph m_holder;
         public UI_ComClick m_comClick;
-        public GButton m_btnBack;
+        public GLoader m_btnBack;
         public GButton m_btnSpeedUp;
         public GButton m_btnSkip;
         public UI_ComTargetSkillShow m_comTargetCard;
@@ -66,8 +68,10 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_holder = (GGraph)comp.GetChild("holder");
             m_comClick = (UI_ComClick)UI_ComClick.Create(comp.GetChild("comClick"));
-            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnBack = (GLoader)comp.GetChild("btnBack");
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
             m_btnSkip = (GButton)comp.GetChild("btnSkip");
             m_comTargetCard = (UI_ComTargetSkillShow)UI_ComTargetSkillShow.Create(comp.GetChild("comTargetCard"));
@@ -81,6 +85,8 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_bg = null;
+            m_holder = null;
             m_comClick.Dispose();
             m_comClick = null;
             m_btnBack = null;

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

@@ -29,6 +29,8 @@ namespace GFGGame
         private bool tryGuide = false;
         //战斗表现修改,得分和星星偏移
         private float offsetX = 150.0f;
+        //部位图片
+        private List<string> partImage = new List<string> { "","fx","zr","sp","scw","fz","zb"};
 
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
@@ -155,13 +157,24 @@ namespace GFGGame
         {
             base.OnShown();
             roleData = InstanceZonesDataManager.roleData;
-            if (_sceneObject == null)
+            //if (_sceneObject == null)
+            //{
+            //    _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("SceneFightSingleScore"));
+            //    MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, true);
+            //    MyDressUpHelper.dressUpObj.AddOrRemove(180014, false);
+            //}
+            //MyDressUpHelper.dressUpObj.PutOnItemList(roleData.itemList);
+
+            DressUpObjUI dressUpObjUI;
+            if (_ui.m_holder.data == null)
             {
-                _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("SceneFightSingleScore"));
-                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, true);
-                MyDressUpHelper.dressUpObj.AddOrRemove(180014, false);
+                _ui.m_holder.data = new DressUpObjUI("SceneFightSingleScore");
             }
-            MyDressUpHelper.dressUpObj.PutOnItemList(roleData.itemList);
+            dressUpObjUI = _ui.m_holder.data as DressUpObjUI;
+            dressUpObjUI.ResetSceneObj(100, false, true, null, false);
+            dressUpObjUI.dressUpObj.PutOnItemList(roleData.itemList);
+            dressUpObjUI.UpdateWrapper(_ui.m_holder);
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("zd_g_bg");
 
             if (!FightDataManager.Instance.autoPlay)
             {
@@ -271,6 +284,7 @@ namespace GFGGame
             x = pos.x;
             y = pos.y;
             _ui.m_comClick.m_comResult.target.visible = true;
+            _ui.m_comClick.m_comResult.m_holderNormal.scale = new Vector2(1.6f, 1.6f);
             _ui.m_comClick.m_comResult.m_holderResult.SetXY(130, 130);
             // _ui.m_comClick.m_comResult.m_loaGlass.url = string.Format("ui://Main/zd_bl_{0}", UnityEngine.Random.Range(0, 3));
             _ui.m_comClick.m_comResult.target.SetXY(x, y);
@@ -291,7 +305,7 @@ namespace GFGGame
                 _ui.m_comClick.m_comResult.m_t0.ClearHooks();
                 _ui.m_comClick.m_comResult.m_t0.Play(OnComResultComplete);
             }
-            _ui.m_comClick.m_comResult.m_loaPart.url = string.Format("ui://Main/pf_picture_{0}", _partId);
+            _ui.m_comClick.m_comResult.m_loaPart.url = string.Format("ui://Main/zd_icon_{0}", partImage[_partId]);
         }
         private void OnComResultComplete()
         {
@@ -332,6 +346,7 @@ namespace GFGGame
             _score += _partScore;
             _ui.m_comClick.m_comResult.target.GetChild("holder" + clickType).visible = true;
             _ui.m_comClick.m_comResult.m_c1.selectedIndex = clickType;
+            _ui.m_comClick.m_comResult.m_evaluatext.url = string.Format("ui://Main/zd_wz_pf_{0}", partImage[_partId]);
             switch (clickType)
             {
                 case ClickType.MISS_CLICK:
@@ -473,6 +488,7 @@ namespace GFGGame
             if (GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0 && !ViewManager.isViewOpen(typeof(GuideView).FullName)) return;
             Timers.inst.Add(0.1f, 0, ComAllCirclePressTime);
 
+            _effectUI15.GetObj().GetComponent<Animator>().SetBool("player", true);  
         }
         private void ComAllCirclePressTime(object param = null)
         {
@@ -683,11 +699,18 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            if (_sceneObject != null)
+            //if (_sceneObject != null)
+            //{
+            //    PrefabManager.Instance.Restore(_sceneObject);
+            //    _sceneObject = null;
+            //}
+
+            DressUpObjUI dressUpObjUI = _ui.m_holder.data as DressUpObjUI;
+            if (dressUpObjUI != null)
             {
-                PrefabManager.Instance.Restore(_sceneObject);
-                _sceneObject = null;
+                dressUpObjUI.Dispose();
             }
+            _ui.m_holder.data = null;
 
             Reset();
             Timers.inst.Remove(CheckGuide);

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

@@ -52,6 +52,9 @@ namespace GFGGame
         private int _prefectCount = 0;//卓越点击数量
         private float _time = 0;// 登峰造极按住的时间
 
+        //部位图片
+        private List<string> partImage = new List<string> { "", "fx", "zr", "sp", "scw", "fz", "zb" };
+
         public override void Dispose()
         {
             EffectUIPool.Recycle(_effectUI1);
@@ -157,13 +160,24 @@ namespace GFGGame
             roleData = (this.viewData as object[])[0] as FightData;
             targetData = (this.viewData as object[])[1] as FightData;
 
-            if (_sceneObject == null)
+            //if (_sceneObject == null)
+            //{
+            //    _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("SceneFightSingleScore"));
+            //    MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, true);
+            //    MyDressUpHelper.dressUpObj.AddOrRemove(180014, false);
+            //}
+            //MyDressUpHelper.dressUpObj.PutOnItemList(roleData.itemList);
+
+            DressUpObjUI dressUpObjUI;
+            if (_ui.m_holder.data == null)
             {
-                _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("SceneFightSingleScore"));
-                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, true);
-                MyDressUpHelper.dressUpObj.AddOrRemove(180014, false);
+                _ui.m_holder.data = new DressUpObjUI("SceneFightSingleScore");
             }
-            MyDressUpHelper.dressUpObj.PutOnItemList(roleData.itemList);
+            dressUpObjUI = _ui.m_holder.data as DressUpObjUI;
+            dressUpObjUI.ResetSceneObj(100, false, true, null, false);
+            dressUpObjUI.dressUpObj.PutOnItemList(roleData.itemList);
+            dressUpObjUI.UpdateWrapper(_ui.m_holder);
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("zd_g_bg");
 
 
             _ui.m_btnBack.visible = true;
@@ -524,7 +538,7 @@ namespace GFGGame
                 _ui.m_comClick.m_comResult.m_t0.ClearHooks();
                 _ui.m_comClick.m_comResult.m_t0.Play(OnComResultComplete);
             }
-            _ui.m_comClick.m_comResult.m_loaPart.url = string.Format("ui://Main/pf_picture_{0}", _partId);
+            _ui.m_comClick.m_comResult.m_loaPart.url = string.Format("ui://Main/zd_icon_{0}", partImage[_partId]);
         }
 
         private void OnComResultComplete()
@@ -593,7 +607,7 @@ namespace GFGGame
             PartScoreResultEnd();
             _ui.m_comClick.m_comResult.m_c1.selectedIndex = clickType;
             _ui.m_comClick.m_comResult.target.GetChild("holder" + clickType).visible = true;
-
+            _ui.m_comClick.m_comResult.m_loaPart.url = string.Format("ui://Main/zd_wz_pf_{0}", partImage[_partId]);
         }
         private void PartScoreResultEnd()
         {
@@ -850,11 +864,18 @@ namespace GFGGame
         {
             base.OnHide();
             Reset();
-            if (_sceneObject != null)
+            //if (_sceneObject != null)
+            //{
+            //    PrefabManager.Instance.Restore(_sceneObject);
+            //    _sceneObject = null;
+            //}
+
+            DressUpObjUI dressUpObjUI = _ui.m_holder.data as DressUpObjUI;
+            if (dressUpObjUI != null)
             {
-                PrefabManager.Instance.Restore(_sceneObject);
-                _sceneObject = null;
+                dressUpObjUI.Dispose();
             }
+            _ui.m_holder.data = null;
 
             Timers.inst.Remove(CheckGuide);
         }

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

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 59c23b3e214af1f4b9e6d24d3e259e35
-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_atlas0_10.png.meta

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