Эх сурвалжийг харах

提交水月镜花的活动逻辑

leiyasi 1 жил өмнө
parent
commit
f8a5d8308c
44 өөрчлөгдсөн 280 нэмэгдсэн , 45 устгасан
  1. 9 9
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxUI.cs
  2. 2 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs
  3. 6 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioActivityUI.cs
  4. 2 0
      GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusView.cs
  5. 1 0
      GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskView.cs
  6. 8 0
      GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs
  7. 4 3
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs
  8. 3 15
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  9. 5 6
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioActivityView.cs
  10. BIN
      GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0!a.png
  11. BIN
      GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0.png
  12. BIN
      GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_fui.bytes
  13. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png
  14. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png
  15. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png
  16. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes
  17. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  18. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  19. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  20. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  21. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_10!a.png
  22. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_10.png
  23. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_11!a.png
  24. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_11.png
  25. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_12!a.png
  26. 120 0
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_12!a.png.meta
  27. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_12.png
  28. 120 0
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_12.png.meta
  29. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  30. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png
  31. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  32. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  33. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png
  34. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png
  35. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png
  36. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png
  37. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png
  38. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png
  39. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes
  40. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_atlas0!a.png
  41. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_atlas0.png
  42. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_1!a.png
  43. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_1.png
  44. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes

+ 9 - 9
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxUI.cs

@@ -9,18 +9,18 @@ namespace UI.ActivityThemeLuckyBox
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaBg;
+        public GGraph m_bgEffectHolder;
         public GButton m_btnBack;
         public UI_Button1 m_btnChapter;
         public UI_Button1 m_btnTask;
         public UI_Button1 m_btnShop;
         public GTextField m_timeDesc;
-        public GTextField m_txtTime_3;
         public GTextField m_txtTime;
+        public GTextField m_txtTime_4;
         public GButton m_btnLuckyBox_old;
         public UI_Button1 m_btnLuckyBox;
-        public GGraph m_bgEffectHolder;
         public Transition m_In_2;
-        public Transition m_in_3;
+        public Transition m_In_4;
         public const string URL = "ui://ubfk2kobmbf1k";
         public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
         public const string RES_NAME = "ActivityThemeLuckyBoxUI";
@@ -70,23 +70,24 @@ namespace UI.ActivityThemeLuckyBox
         {
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_bgEffectHolder = (GGraph)comp.GetChild("bgEffectHolder");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnChapter = (UI_Button1)UI_Button1.Create(comp.GetChild("btnChapter"));
             m_btnTask = (UI_Button1)UI_Button1.Create(comp.GetChild("btnTask"));
             m_btnShop = (UI_Button1)UI_Button1.Create(comp.GetChild("btnShop"));
             m_timeDesc = (GTextField)comp.GetChild("timeDesc");
-            m_txtTime_3 = (GTextField)comp.GetChild("txtTime_3");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_txtTime_4 = (GTextField)comp.GetChild("txtTime_4");
             m_btnLuckyBox_old = (GButton)comp.GetChild("btnLuckyBox_old");
             m_btnLuckyBox = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLuckyBox"));
-            m_bgEffectHolder = (GGraph)comp.GetChild("bgEffectHolder");
             m_In_2 = comp.GetTransition("In_2");
-            m_in_3 = comp.GetTransition("in_3");
+            m_In_4 = comp.GetTransition("In_4");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_loaBg = null;
+            m_bgEffectHolder = null;
             m_btnBack = null;
             m_btnChapter.Dispose();
             m_btnChapter = null;
@@ -95,14 +96,13 @@ namespace UI.ActivityThemeLuckyBox
             m_btnShop.Dispose();
             m_btnShop = null;
             m_timeDesc = null;
-            m_txtTime_3 = null;
             m_txtTime = null;
+            m_txtTime_4 = null;
             m_btnLuckyBox_old = null;
             m_btnLuckyBox.Dispose();
             m_btnLuckyBox = null;
-            m_bgEffectHolder = null;
             m_In_2 = null;
-            m_in_3 = null;
+            m_In_4 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 2 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -22,11 +22,10 @@ namespace UI.Main
         public UI_BtnModle2 m_btnWanShiLi;
         public UI_BtnModle2 m_btnTea;
         public UI_BtnModle2 m_btnOpenServerActivity;
-        public UI_BtnModle2 m_btnActivityLuckyBox;
+        public UI_BtnModle1 m_btnActivityLuckyBox;
         public UI_BtnModle2 m_btnActivityZCJB;
         public UI_BtnModle2 m_btnGetYuanXiao;
         public UI_BtnModle2 m_btnActivityFYJY;
-        public UI_BtnModle2 m_btnActivitySYJH;
         public GTextField m_serverTime;
         public GLoader m_loaGuidestudio;
         public UI_ComAd m_comListAd;
@@ -110,11 +109,10 @@ namespace UI.Main
             m_btnWanShiLi = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnWanShiLi"));
             m_btnTea = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnTea"));
             m_btnOpenServerActivity = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnOpenServerActivity"));
-            m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
+            m_btnActivityLuckyBox = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityLuckyBox"));
             m_btnActivityZCJB = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityZCJB"));
             m_btnGetYuanXiao = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnGetYuanXiao"));
             m_btnActivityFYJY = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityFYJY"));
-            m_btnActivitySYJH = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivitySYJH"));
             m_serverTime = (GTextField)comp.GetChild("serverTime");
             m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
             m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
@@ -168,8 +166,6 @@ namespace UI.Main
             m_btnGetYuanXiao = null;
             m_btnActivityFYJY.Dispose();
             m_btnActivityFYJY = null;
-            m_btnActivitySYJH.Dispose();
-            m_btnActivitySYJH = null;
             m_serverTime = null;
             m_loaGuidestudio = null;
             m_comListAd.Dispose();

+ 6 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioActivityUI.cs

@@ -7,11 +7,11 @@ namespace UI.Studio
     public partial class UI_StudioActivityUI
     {
         public GComponent target;
-        public GLoader m_Bg;
+        public GLoader m_loaBg;
         public GComponent m_comValueBar;
         public GButton m_btnBack;
         public GLoader m_btnChageLine;
-        public GLoader m_loaBg;
+        public GLoader m_loaRole;
         public GTextField m_activityTitle;
         public GList m_list;
         public GButton m_btnReward;
@@ -64,11 +64,11 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
-            m_Bg = (GLoader)comp.GetChild("Bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_loaRole = (GLoader)comp.GetChild("loaRole");
             m_activityTitle = (GTextField)comp.GetChild("activityTitle");
             m_list = (GList)comp.GetChild("list");
             m_btnReward = (GButton)comp.GetChild("btnReward");
@@ -77,11 +77,11 @@ namespace UI.Studio
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_Bg = null;
+            m_loaBg = null;
             m_comValueBar = null;
             m_btnBack = null;
             m_btnChageLine = null;
-            m_loaBg = null;
+            m_loaRole = null;
             m_activityTitle = null;
             m_list = null;
             m_btnReward = null;

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusView.cs

@@ -68,6 +68,8 @@ namespace GFGGame
             _bonueCfgs = ActivityLuckybonusCfgArray.Instance.GetCfgsByid(_activityId);
             _bonueCfgs = ActivityDataManager.Instance.SortActivityLuckybonusCfg(_bonueCfgs, _typeId);
             _ui.m_list.numItems = _bonueCfgs.Count;
+            _ui.m_list.scrollPane.ScrollTop();
+
         }
 
         protected override void OnHide()

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskView.cs

@@ -61,6 +61,7 @@ namespace GFGGame
         {
             _taskCfgs = TaskDataManager.Instance.GetTaskCfgs(TaskFuncType.LuckyBoxActivity); 
             _ui.m_list.numItems = _taskCfgs.Count;
+            _ui.m_list.scrollPane.ScrollTop();
         }
 
         private void RenderListItem(int index, GObject obj)

+ 8 - 0
GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -201,6 +201,14 @@ namespace GFGGame
                 _effectUIDic.Add("L", EffectUIPool.CreateEffectUI(_ui.m_btnLuckyBox.m_effectHolder, "ui_Activity/New_CK_Flower", "L"));
                 _effectUIDic.Add("R", EffectUIPool.CreateEffectUI(_ui.m_btnChapter.m_effectHolder, "ui_Activity/New_CK_Flower", "R"));
             }
+
+            // 3表示 水月镜花
+            else if(_activityId == 4)
+            {
+                _effectUIDic.Add("All_tx", EffectUIPool.CreateEffectUI(_ui.m_bgEffectHolder, "ui_Activity", "SYJHbgtx"));
+                _effectUIDic.Add("L", EffectUIPool.CreateEffectUI(_ui.m_btnLuckyBox.m_effectHolder, "ui_Activity", "SYJH_icon_tx_L"));
+                _effectUIDic.Add("R", EffectUIPool.CreateEffectUI(_ui.m_btnChapter.m_effectHolder, "ui_Activity", "SYJH_icon_tx_R"));
+            }
         }
     }
 }

+ 4 - 3
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -94,6 +94,7 @@ namespace GFGGame
             LuckyBoxDataManager.Instance.luckyBoxIndex = 2;
             UpGiftBox();
             UpLuckyDiscount();
+            UpdateTime(null);
             Timers.inst.Add(1, 0, UpdateTime);
             UpdateListItemData();
             ChangeUIByActivity();
@@ -134,10 +135,10 @@ namespace GFGGame
 
             comBox.m_btnPreview.m_c1.selectedIndex = 1;
 
-            comBox.m_comCostOne.m_txtCost.text = _luckyBoxCfg.costNum.ToString();
-            comBox.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(_luckyBoxCfg.costID).res);
+            comBox.m_comCostOne.m_txtCost.text = _luckyBoxCfg.costNum.ToString(); 
+            comBox.m_comCostOne.m_loaCost.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(_luckyBoxCfg.costID).res, "png");
             comBox.m_comCostTen.m_txtCost.text = _luckyBoxCfg.costNumTen.ToString();
-            comBox.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(_luckyBoxCfg.costID).res);
+            comBox.m_comCostTen.m_loaCost.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(_luckyBoxCfg.costID).res, "png");
 
             if (comBox.m_btnBuyOne.data == null)
             {

+ 3 - 15
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -294,12 +294,6 @@ namespace GFGGame
                     }
                 }
 
-                //RefreshBtnActivitySYJH();
-                //if (_ui.m_btnActivitySYJH.target.visible)
-                //{
-                //    RedDotController.Instance.SetComRedDot(_ui.m_btnActivitySYJH.target, RedDotDataManager.Instance.GetActivityLuckyBoxRed(3));
-                //}
-
             }
             // 后续活动按钮的刷新检测
             else
@@ -328,12 +322,6 @@ namespace GFGGame
                 = (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.AfternoonLeisure) > 0);
         }
 
-        private void RefreshBtnActivitySYJH()
-        {
-            _ui.m_btnActivitySYJH.target.visible
-                = (ActivityDataManager.Instance.GetCurOpenActiveByType(1) > 0);
-        }
-
         private void AddEffect()
         {
             _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder, "ui_zjm", "ZJM_szl_down_3"));
@@ -687,9 +675,9 @@ namespace GFGGame
                 }
                 ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLuckyBoxId);
                 _ui.m_btnActivityLuckyBox.target.title = activityOpenCfg.themeName;
-                _ui.m_btnActivityLuckyBox.target.icon = "ui://Main/zjm_tb_" + activityOpenCfg.res;
-                long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
-                _ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+                _ui.m_btnActivityLuckyBox.target.icon = "ui://Main/zjm_icon_" + activityOpenCfg.res.Split('_')[1];
+                //long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
+                //_ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
             }
         }
 

+ 5 - 6
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioActivityView.cs

@@ -40,7 +40,6 @@ namespace GFGGame
             isReturnView = true;
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
-            _ui.m_Bg.url = ResPathUtil.GetBgImgPath("bg_fhl");
             _ui.m_btnChageLine.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
 
             _ui.m_list.itemRenderer = RenderListItem;
@@ -73,13 +72,12 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _valueBarController.OnShown();
-            _valueBarController.UpdateList(new List<int>() { 3000015, ConstItemID.GOLD, ConstItemID.DIAMOND_RED });
-
             StudioDataManager.Instance.filingChapterId = StudioDataManager.Instance.GetLuckyBoxActivityID();
 
             UpdateView();
             UpdateItem();
+            _valueBarController.OnShown();
+
         }
 
         protected override void OnHide()
@@ -163,15 +161,16 @@ namespace GFGGame
         private void UpdateView()
         {
             _studioCfg = StudioCfgArray.Instance.GetCfg(StudioDataManager.Instance.filingChapterId);
+            _valueBarController.UpdateList(new List<int>(_studioCfg.ItemIDArrArr));
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_studioCfg.LeveRes);
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(this._studioCfg.limit);
             var limitCfg = LimitCfgArray.Instance.GetCfg(this._studioCfg.limit);
-            _ui.m_loaBg.url = ResPathUtil.GetStudioFilingPicPath(_studioCfg.res); //ResPathUtil.GetBgImgPath(_studioCfg.res);
+            _ui.m_loaRole.url = ResPathUtil.GetStudioFilingPicPath(_studioCfg.res); //ResPathUtil.GetBgImgPath(_studioCfg.res);
             _ui.m_txtNum.text = string.Format("剩余次数:{0}/{1}", limitData.TotalPlayMax - limitData.PlayTimes, limitData.MaxStorageCount);
             _ui.m_activityTipText.SetVar("name", _studioCfg.name).FlushVars();
             _ui.m_activityTitle.text = _studioCfg.name;
             _storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_studioCfg.type, _studioCfg.subType, StudioDataManager.Instance.filingChapterId);
             _ui.m_list.numItems = _storyLevelCfgs.Count;
-
             UpdateRedDot();
         }
 

BIN
GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0.png


BIN
GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_fui.bytes


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


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


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_10.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_11!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_11.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_12!a.png


+ 120 - 0
GameClient/Assets/ResIn/UI/Main/Main_atlas0_12!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 56a0f6951bdb4924ab3830e1c265a34f
+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: 

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_12.png


+ 120 - 0
GameClient/Assets/ResIn/UI/Main/Main_atlas0_12.png.meta

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

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes