Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -9,7 +9,9 @@ namespace UI.Main
         public GComponent target;
         public Controller m_c1;
         public GGraph m_holderResult;
+        public GImage m_paopao;
         public GLoader m_loaPart;
+        public GLoader m_evaluatext;
         public GGraph m_holderNormal;
         public GGraph m_holderHigh;
         public GGraph m_holderCircle;
@@ -21,8 +23,11 @@ namespace UI.Main
         public GTextField m_txtCount0;
         public GTextField m_txtCount1;
         public GTextField m_txtCount2;
-        public GLoader m_evaluatext;
         public GGroup m_grpResult;
+        public GGraph m_ppEffect;
+        public GGraph m_starEffect;
+        public GGraph m_starEffect2;
+        public GGraph m_starEffect3;
         public Transition m_t0;
         public Transition m_t1;
         public const string URL = "ui://mfvz4q8kvuz5bi";
@@ -74,7 +79,9 @@ namespace UI.Main
         {
             m_c1 = comp.GetController("c1");
             m_holderResult = (GGraph)comp.GetChild("holderResult");
+            m_paopao = (GImage)comp.GetChild("paopao");
             m_loaPart = (GLoader)comp.GetChild("loaPart");
+            m_evaluatext = (GLoader)comp.GetChild("evaluatext");
             m_holderNormal = (GGraph)comp.GetChild("holderNormal");
             m_holderHigh = (GGraph)comp.GetChild("holderHigh");
             m_holderCircle = (GGraph)comp.GetChild("holderCircle");
@@ -86,8 +93,11 @@ namespace UI.Main
             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_ppEffect = (GGraph)comp.GetChild("ppEffect");
+            m_starEffect = (GGraph)comp.GetChild("starEffect");
+            m_starEffect2 = (GGraph)comp.GetChild("starEffect2");
+            m_starEffect3 = (GGraph)comp.GetChild("starEffect3");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
         }
@@ -95,7 +105,9 @@ namespace UI.Main
         {
             m_c1 = null;
             m_holderResult = null;
+            m_paopao = null;
             m_loaPart = null;
+            m_evaluatext = null;
             m_holderNormal = null;
             m_holderHigh = null;
             m_holderCircle = null;
@@ -107,8 +119,11 @@ namespace UI.Main
             m_txtCount0 = null;
             m_txtCount1 = null;
             m_txtCount2 = null;
-            m_evaluatext = null;
             m_grpResult = null;
+            m_ppEffect = null;
+            m_starEffect = null;
+            m_starEffect2 = null;
+            m_starEffect3 = null;
             m_t0 = null;
             m_t1 = null;
             if(disposeTarget && target != null)

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

@@ -8,11 +8,13 @@ namespace UI.Main
     {
         public GComponent target;
         public GLoader m_bg;
+        public GGraph m_bgEffect;
         public GGraph m_holder;
         public UI_ComClick m_comClick;
         public UI_ProgressBar1 m_proScore;
         public GButton m_btnSpeedUp;
         public GLoader m_btnBack;
+        public Transition m_t0;
         public const string URL = "ui://mfvz4q8k8xpg3x";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightSingleScoreUI";
@@ -61,15 +63,18 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_bg = (GLoader)comp.GetChild("bg");
+            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
             m_holder = (GGraph)comp.GetChild("holder");
             m_comClick = (UI_ComClick)UI_ComClick.Create(comp.GetChild("comClick"));
             m_proScore = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proScore"));
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
             m_btnBack = (GLoader)comp.GetChild("btnBack");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
+            m_bgEffect = null;
             m_holder = null;
             m_comClick.Dispose();
             m_comClick = null;
@@ -77,6 +82,7 @@ namespace UI.Main
             m_proScore = null;
             m_btnSpeedUp = null;
             m_btnBack = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,6 +8,7 @@ namespace UI.Main
     {
         public GComponent target;
         public GLoader m_bg;
+        public GGraph m_bgEffect;
         public GGraph m_holder;
         public UI_ComClick m_comClick;
         public GLoader m_btnBack;
@@ -21,6 +22,7 @@ namespace UI.Main
         public GGraph m_effReduceScore;
         public Transition m_t1;
         public Transition m_t2;
+        public Transition m_t3;
         public const string URL = "ui://mfvz4q8k8xpg3w";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightTargetScoreUI";
@@ -69,6 +71,7 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_bg = (GLoader)comp.GetChild("bg");
+            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
             m_holder = (GGraph)comp.GetChild("holder");
             m_comClick = (UI_ComClick)UI_ComClick.Create(comp.GetChild("comClick"));
             m_btnBack = (GLoader)comp.GetChild("btnBack");
@@ -82,10 +85,12 @@ namespace UI.Main
             m_effReduceScore = (GGraph)comp.GetChild("effReduceScore");
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
+            m_t3 = comp.GetTransition("t3");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
+            m_bgEffect = null;
             m_holder = null;
             m_comClick.Dispose();
             m_comClick = null;
@@ -103,6 +108,7 @@ namespace UI.Main
             m_effReduceScore = null;
             m_t1 = null;
             m_t2 = null;
+            m_t3 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -31,6 +31,9 @@ namespace GFGGame
         private float offsetX = 150.0f;
         //部位图片
         private List<string> partImage = new List<string> { "","fx","zr","sp","scw","fz","zb"};
+        //点击特效
+        private List<string> ppEffectName = new List<string> { "PaoPao_Lose","PaoPao_prefectgood", "PaoPao_prefectgood" };
+        private List<string> starEffectName = new List<string> { "zd_Lose","zd_Good","zd_prefect"};
 
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
@@ -50,6 +53,9 @@ namespace GFGGame
         private EffectUI _effectUI16;
         private EffectUI _effectUI17;
         private EffectUI _effectUI18;
+        private EffectUI _effectUI19;
+        private EffectUI _effectUI20;
+        private EffectUI _effectUI21;
 
         public override void Dispose()
         {
@@ -94,6 +100,12 @@ namespace GFGGame
             _effectUI17 = null;
             EffectUIPool.Recycle(_effectUI18);
             _effectUI18 = null;
+            EffectUIPool.Recycle(_effectUI19);
+            _effectUI19 = null;
+            EffectUIPool.Recycle(_effectUI20);
+            _effectUI20 = null;
+            EffectUIPool.Recycle(_effectUI21);
+            _effectUI21 = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -135,7 +147,7 @@ namespace GFGGame
             _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_proScore.m_holder1, "ui_fight_new", "Progress_fixed");
             _effectUI6 = EffectUIPool.CreateEffectUI(_ui.m_proScore.m_comBar.m_holder, "ui_fight_new", "Progress_liuguang");
             //_effectUI7 = EffectUIPool.CreateEffectUI(_ui.m_comAllPerfect.m_holder, "ui_fight_new", "zd_df_dfzj");
-            _effectUI8 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_holderNormal, "ui_fight_new", "bottom_appear");
+            _effectUI8 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_holderNormal, "ui_fight_new", "bottom_Highlight");
             _effectUI9 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_holderCircle, "ui_fight_new", "circle");
             _effectUI10 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_holder0, "ui_fight_new", "Lose_animation");
             _effectUI11 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_holder1, "ui_fight_new", "Good_animation");
@@ -146,6 +158,7 @@ namespace GFGGame
             _effectUI16 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comAllPerfect.m_holder, "ui_fight_new", "3S_textAppear01");
             _effectUI17 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comAllPerfect.m_holderSmokeIn, "ui_fight_new", "smoke_Approach");
             _effectUI18 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comAllPerfect.m_holderSmokeOut, "ui_fight_new", "smoke_out");
+            _effectUI21 = EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_HaiZhiShi", "Bg_All_Tx");
         }
         protected override void AddEventListener()
         {
@@ -284,16 +297,18 @@ 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_paopao.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.m_evaluatext.url = string.Format("ui://Main/zd_wz_pf_{0}", partImage[_partId]);
             _ui.m_comClick.m_comResult.target.SetXY(x, y);
             _ui.m_comClick.m_comResult.m_t0.ignoreEngineTimeScale = false;
             _ui.m_comClick.m_comResult.m_t0.timeScale = FightDataManager.Instance.fightSpeed;
             if (GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0)
             {
                 _ui.m_comClick.target.touchable = false;
-                _ui.m_comClick.m_comResult.m_t0.Play(1, 0, 0, 1.25f, UpdateToCheckGuide);
+                _ui.m_comClick.m_comResult.m_t0.Play(1, 0, 0, 1.0f, UpdateToCheckGuide);
             }
             else if (FightDataManager.Instance.autoPlay)
             {
@@ -321,7 +336,11 @@ namespace GFGGame
             _ui.m_comClick.target.touchable = false;
             int clickType = FightDataManager.Instance.GetClickType(_ui.m_comClick.m_comResult.m_holderCircle.scale.x);
             _ui.m_comClick.m_comResult.m_t0.Stop(true, false);
-
+            if (clickType == 2)
+            {
+                _effectUI20 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_starEffect, "ui_fight_new", starEffectName[clickType]);
+                _ui.m_comClick.m_comResult.m_starEffect.visible = true;
+            }
 
             if (clickType == ClickType.PERFECT_CLICK)
             {
@@ -337,16 +356,28 @@ namespace GFGGame
         private void PartScoreResultStart(int clickType)
         {
             Debug.Log("_partId:" + _partId);
-
             // _ui.m_comClick.target.touchable = false;
+            _effectUI19 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_ppEffect, "ui_fight_new", ppEffectName[clickType]);
+            
+            _ui.m_comClick.m_comResult.m_ppEffect.visible = true;    
+            _ui.m_comClick.m_comResult.m_paopao.visible = false;
+            if(clickType == 2)
+            {
+                _ui.m_t0.Play();
+            }
+            else
+            {
+                _effectUI20 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_starEffect, "ui_fight_new", starEffectName[clickType]);
+                _ui.m_comClick.m_comResult.m_starEffect.visible = true;
+            }
 
             PartScoreResultEnd();
-            //这里后面去掉第四个参数，因为不需要他参与计算了
+            //这里后面去掉第四个参数，因为不需要他参与计算了  
             _partScore = ScoreSystemData.Instance.GetRoundScore(roleData, _partId, clickType , _allSkillScore);
             _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:
@@ -376,6 +407,13 @@ namespace GFGGame
         private void CheckPartEndSkill()
         {
             // _ui.m_comClick.m_comResult.target.visible = _partId == FightScoreCfgArray.Instance.dataArray.Length ? false : true;
+            _ui.m_comClick.m_comResult.m_ppEffect.visible = false;
+            _ui.m_comClick.m_comResult.m_starEffect.visible = false;
+            EffectUIPool.Recycle(_effectUI19);
+            _effectUI19 = null;
+            EffectUIPool.Recycle(_effectUI20);
+            _effectUI20 = null;
+
             _skillScore = 0;
             _currentTime = SkillBeginTime.ERVERY_ROUND_END;
             TryShowCardSkill(null);

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

@@ -33,6 +33,10 @@ namespace GFGGame
         private EffectUI _effectUI14;
         private EffectUI _effectUI15;
 
+        private EffectUI _effectUI19;
+        private EffectUI _effectUI20;
+        private EffectUI _effectUI21;
+
         private NTexture _nTexture;
         private bool _isAutoPlay = false;
         // private float _speed = 1;
@@ -54,6 +58,9 @@ namespace GFGGame
 
         //部位图片
         private List<string> partImage = new List<string> { "", "fx", "zr", "sp", "scw", "fz", "zb" };
+        //点击特效
+        private List<string> ppEffectName = new List<string> { "PaoPao_Lose", "PaoPao_prefectgood", "PaoPao_prefectgood" };
+        private List<string> starEffectName = new List<string> { "zd_Lose", "zd_Good", "zd_prefect" };
 
         public override void Dispose()
         {
@@ -87,6 +94,13 @@ namespace GFGGame
             _effectUI14 = null;
             EffectUIPool.Recycle(_effectUI15);
             _effectUI15 = null;
+
+            EffectUIPool.Recycle(_effectUI19);
+            _effectUI19 = null;
+            EffectUIPool.Recycle(_effectUI20);
+            _effectUI20 = null;
+            EffectUIPool.Recycle(_effectUI21);
+            _effectUI21 = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -99,7 +113,7 @@ namespace GFGGame
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_proScore.m_holder1, "ui_fight_new", "Progress_fixed");
             _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_proScore.m_holder, "ui_fight_new", "Progress_head");
             _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_proScore.m_comBar.m_holder, "ui_fight_new", "Progress_liuguang");
-            _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_holderNormal, "ui_fight_new", "bottom_appear");
+            _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_holderNormal, "ui_fight_new", "bottom_Highlight");
             _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_holderCircle, "ui_fight_new", "circle");
             //_effectUI6 = EffectUIPool.CreateEffectUI(_ui.m_comAllPerfect.m_holder, "ui_fight_new", "zd_df_dfzj");
             _effectUI7 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_holder0, "ui_fight_new", "Lose_animation");
@@ -111,6 +125,7 @@ namespace GFGGame
             _effectUI13 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comAllPerfect.m_holder, "ui_fight_new", "3S_textAppear01");
             _effectUI14 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comAllPerfect.m_holderSmokeIn, "ui_fight_new", "smoke_Approach");
             _effectUI15 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comAllPerfect.m_holderSmokeOut, "ui_fight_new", "smoke_out");
+            _effectUI21 = EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_HaiZhiShi", "Bg_All_Tx");
         }
 
         protected override void OnInit()
@@ -402,6 +417,13 @@ namespace GFGGame
 
         private void CheckPartFightEndSkill()
         {
+            _ui.m_comClick.m_comResult.m_ppEffect.visible = false;
+            _ui.m_comClick.m_comResult.m_starEffect.visible = false;
+            EffectUIPool.Recycle(_effectUI19);
+            _effectUI19 = null;
+            EffectUIPool.Recycle(_effectUI20);
+            _effectUI20 = null;
+
             _skillScore = 0;
             _targetSkillScore = 0;
 
@@ -523,9 +545,12 @@ namespace GFGGame
             x = pos.x;
             y = pos.y;
             _ui.m_comClick.m_comResult.m_holderNormal.scale = new Vector2(1.6f, 1.6f);
+            _ui.m_comClick.m_comResult.m_paopao.visible = true;
             _ui.m_comClick.m_comResult.m_holderResult.SetXY(130, 130);
             _ui.m_comClick.m_comResult.target.visible = true;
             // _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.m_evaluatext.url = string.Format("ui://Main/zd_wz_pf_{0}", partImage[_partId]);
+
             _ui.m_comClick.m_comResult.target.SetXY(x, y);
 
             _ui.m_comClick.m_comResult.m_t0.timeScale = FightDataManager.Instance.fightSpeed;
@@ -555,6 +580,13 @@ namespace GFGGame
             int clickType = FightDataManager.Instance.GetClickType(_ui.m_comClick.m_comResult.m_holderCircle.scale.x);
             _ui.m_comClick.m_comResult.m_t0.Stop(true, false);
 
+            if (clickType == 2)
+            {
+                _effectUI20 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_starEffect, "ui_fight_new", starEffectName[clickType]);
+                _ui.m_comClick.m_comResult.m_starEffect.visible = true;
+            }
+
+
             if (clickType == ClickType.PERFECT_CLICK)
             {
                 CheckPartPerfectClickSkill();
@@ -576,6 +608,21 @@ namespace GFGGame
 
             _ui.m_comClick.target.touchable = false;
 
+            _effectUI19 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_ppEffect, "ui_fight_new", ppEffectName[clickType]);
+
+            _ui.m_comClick.m_comResult.m_ppEffect.visible = true;
+            _ui.m_comClick.m_comResult.m_paopao.visible = false;
+            if (clickType == 2)
+            {
+                _ui.m_t3.Play();
+            }
+            else
+            {
+                _effectUI20 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_starEffect, "ui_fight_new", starEffectName[clickType]);
+                _ui.m_comClick.m_comResult.m_starEffect.visible = true;
+            }
+
+
             int _partScore = ScoreSystemData.Instance.GetRoundScore(roleData, _partId, clickType, _skillScore);
             int _targetPartScore;
             if (targetData.type == FightTargetType.PLAYER)

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

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 2d79f865c56d0fd459dfef99c47aa0d8
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 83fae21be34971945aa6291b533a101e
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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_11!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 3f2bd12fcbac28c40bcd1f0fc8e66f5c
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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_11.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 62f322eccf7ed704fb99ab516b6a9d82
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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: