zhaoyang 3 жил өмнө
parent
commit
ea5eb82230
46 өөрчлөгдсөн 1277 нэмэгдсэн , 31 устгасан
  1. 19 11
      FGUIProject/assets/CommonGame/GetSuitItemUI.xml
  2. BIN
      FGUIProject/assets/CommonGame/effect/MovieClip3_0.jta
  3. BIN
      FGUIProject/assets/CommonGame/effect/MovieClip3_1.jta
  4. BIN
      FGUIProject/assets/CommonGame/effect/MovieClip3_2.jta
  5. BIN
      FGUIProject/assets/CommonGame/effect/MovieClip3_3.jta
  6. BIN
      FGUIProject/assets/CommonGame/effect/MovieClip4.jta
  7. BIN
      FGUIProject/assets/CommonGame/effect/MovieClip4_0.jta
  8. BIN
      FGUIProject/assets/CommonGame/effect/MovieClip4_1.jta
  9. BIN
      FGUIProject/assets/CommonGame/effect/MovieClip4_2.jta
  10. BIN
      FGUIProject/assets/CommonGame/effect/MovieClip4_3.jta
  11. 8 2
      FGUIProject/assets/CommonGame/package.xml
  12. 1 1
      GameClient/Assets/Game/HotUpdate/Controller/GameController.cs
  13. 8 3
      GameClient/Assets/Game/HotUpdate/Data/Handler/RoleDataHandler.cs
  14. 30 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GetSuitItemUI.cs
  15. 1 1
      GameClient/Assets/Game/HotUpdate/ServerProxy/DailyTaskSProxy.cs
  16. 57 6
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs
  17. 1 1
      GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskView.cs
  18. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kztetkd!a.png
  19. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kztetkd.png
  20. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kztetl8!a.png
  21. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kztetl8.png
  22. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtmk!a.png
  23. 96 0
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtmk!a.png.meta
  24. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtmk.png
  25. 96 0
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtmk.png.meta
  26. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtml!a.png
  27. 96 0
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtml!a.png.meta
  28. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtml.png
  29. 96 0
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtml.png.meta
  30. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtmm!a.png
  31. 96 0
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtmm!a.png.meta
  32. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtmm.png
  33. 96 0
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtmm.png.meta
  34. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnv!a.png
  35. 96 0
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnv!a.png.meta
  36. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnv.png
  37. 96 0
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnv.png.meta
  38. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnw!a.png
  39. 96 0
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnw!a.png.meta
  40. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnw.png
  41. 96 0
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnw.png.meta
  42. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnx!a.png
  43. 96 0
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnx!a.png.meta
  44. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnx.png
  45. 96 0
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnx.png.meta
  46. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes

+ 19 - 11
FGUIProject/assets/CommonGame/GetSuitItemUI.xml

@@ -7,32 +7,40 @@
     <image id="n5_tu96" name="n5" src="tu965i" fileName="images/cj_liangguang.png" xy="48,436">
     <image id="n5_tu96" name="n5" src="tu965i" fileName="images/cj_liangguang.png" xy="48,436">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
     </image>
-    <movieclip id="n14_kzte" name="mov0" src="kztetkd" fileName="effect/MovieClip3.jta" xy="-302,227" size="1684,1403" aspect="true">
+    <movieclip id="n14_kzte" name="mov00" src="kztetkd" fileName="effect/MovieClip3_0.jta" xy="-243,397" size="1570,1308" group="n22_slkg" aspect="true" blend="add"/>
+    <movieclip id="n19_slkg" name="mov01" src="slkgtmk" fileName="effect/MovieClip3_1.jta" xy="-223,397" size="1570,1308" group="n22_slkg" aspect="true" blend="add"/>
+    <movieclip id="n20_slkg" name="mov02" src="slkgtml" fileName="effect/MovieClip3_2.jta" xy="-223,397" size="1570,1308" group="n22_slkg" aspect="true" blend="add"/>
+    <movieclip id="n21_slkg" name="mov03" src="slkgtmm" fileName="effect/MovieClip3_3.jta" xy="-223,397" size="1570,1308" group="n22_slkg" aspect="true" blend="add"/>
+    <group id="n22_slkg" name="grpMov0" xy="-243,397" size="1590,1308" advanced="true">
       <relation target="n7_tu96" sidePair="bottom-bottom"/>
       <relation target="n7_tu96" sidePair="bottom-bottom"/>
-    </movieclip>
+    </group>
     <graph id="n7_tu96" name="holder" xy="393,683" pivot="0.5,0.5" size="394,268" touchable="false">
     <graph id="n7_tu96" name="holder" xy="393,683" pivot="0.5,0.5" size="394,268" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
     </graph>
-    <movieclip id="n16_kzte" name="mov1" src="kztetl8" fileName="effect/MovieClip4.jta" xy="30,-214" size="1018,1698" aspect="true">
+    <movieclip id="n23_slkg" name="mov10" src="kztetl8" fileName="effect/MovieClip4_0.jta" xy="17,-135" size="1045,1742" group="n27_slkg" aspect="true" blend="screen"/>
+    <movieclip id="n24_slkg" name="mov11" src="slkgtnv" fileName="effect/MovieClip4_1.jta" xy="17,-135" size="1045,1742" group="n27_slkg" aspect="true" blend="screen"/>
+    <movieclip id="n25_slkg" name="mov12" src="slkgtnw" fileName="effect/MovieClip4_2.jta" xy="17,-135" size="1045,1742" group="n27_slkg" aspect="true" blend="screen"/>
+    <movieclip id="n26_slkg" name="mov13" src="slkgtnx" fileName="effect/MovieClip4_3.jta" xy="17,-135" size="1045,1742" group="n27_slkg" aspect="true" blend="screen"/>
+    <group id="n27_slkg" name="grpMov1" xy="17,-135" size="1045,1742" advanced="true">
       <relation target="n7_tu96" sidePair="bottom-bottom"/>
       <relation target="n7_tu96" sidePair="bottom-bottom"/>
-    </movieclip>
-    <image id="n1_tu96" name="n1" src="tu965j" fileName="images/cj_tskuang_1.png" xy="199,1366" group="n6_tu96"/>
-    <text id="n2_tu96" name="txtName" xy="465,1389" size="138,46" group="n6_tu96" fontSize="34" color="#a17472" autoClearText="true" text="套装名称">
+    </group>
+    <image id="n1_tu96" name="n1" src="tu965j" fileName="images/cj_tskuang_1.png" xy="204,1391" group="n6_tu96"/>
+    <text id="n2_tu96" name="txtName" xy="470,1414" size="138,46" group="n6_tu96" fontSize="34" color="#a17472" autoClearText="true" text="套装名称">
       <relation target="" sidePair="center-center"/>
       <relation target="" sidePair="center-center"/>
     </text>
     </text>
-    <component id="n4_tu96" name="probar" src="tu965k" fileName="components/ProgressBar1.xml" xy="241,1457" group="n6_tu96">
+    <component id="n4_tu96" name="probar" src="tu965k" fileName="components/ProgressBar1.xml" xy="246,1482" group="n6_tu96">
       <ProgressBar value="50" max="100"/>
       <ProgressBar value="50" max="100"/>
     </component>
     </component>
-    <image id="n10_u67n" name="n10" src="u67n5n" fileName="images/cj_tskuang_2.png" xy="413,1406" group="n6_tu96">
+    <image id="n10_u67n" name="n10" src="u67n5n" fileName="images/cj_tskuang_2.png" xy="418,1431" group="n6_tu96">
       <relation target="n2_tu96" sidePair="right-left"/>
       <relation target="n2_tu96" sidePair="right-left"/>
     </image>
     </image>
-    <image id="n11_u67n" name="n11" src="u67n5n" fileName="images/cj_tskuang_2.png" xy="638,1406" group="n6_tu96">
+    <image id="n11_u67n" name="n11" src="u67n5n" fileName="images/cj_tskuang_2.png" xy="643,1431" group="n6_tu96">
       <relation target="n2_tu96" sidePair="left-right"/>
       <relation target="n2_tu96" sidePair="left-right"/>
     </image>
     </image>
-    <group id="n6_tu96" name="n6" xy="199,1366" size="672,166" advanced="true">
+    <group id="n6_tu96" name="n6" xy="204,1391" size="672,166" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
     </group>
-    <component id="n9_tu96" name="item" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,1687">
+    <component id="n9_tu96" name="item" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,1712">
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
     </component>
   </displayList>
   </displayList>

BIN
FGUIProject/assets/CommonGame/effect/MovieClip3.jta → FGUIProject/assets/CommonGame/effect/MovieClip3_0.jta


BIN
FGUIProject/assets/CommonGame/effect/MovieClip3_1.jta


BIN
FGUIProject/assets/CommonGame/effect/MovieClip3_2.jta


BIN
FGUIProject/assets/CommonGame/effect/MovieClip3_3.jta


BIN
FGUIProject/assets/CommonGame/effect/MovieClip4.jta


BIN
FGUIProject/assets/CommonGame/effect/MovieClip4_0.jta


BIN
FGUIProject/assets/CommonGame/effect/MovieClip4_1.jta


BIN
FGUIProject/assets/CommonGame/effect/MovieClip4_2.jta


BIN
FGUIProject/assets/CommonGame/effect/MovieClip4_3.jta


+ 8 - 2
FGUIProject/assets/CommonGame/package.xml

@@ -193,8 +193,14 @@
     <image id="kztethq" name="test.png" path="/imagesExport/" exported="true"/>
     <image id="kztethq" name="test.png" path="/imagesExport/" exported="true"/>
     <image id="kztethr" name="hyhy_btbt_1.png" path="/imagesExport/" exported="true"/>
     <image id="kztethr" name="hyhy_btbt_1.png" path="/imagesExport/" exported="true"/>
     <image id="kzteths" name="gxhd_scjlscjl.png" path="/images/"/>
     <image id="kzteths" name="gxhd_scjlscjl.png" path="/images/"/>
-    <movieclip id="kztetkd" name="MovieClip3.jta" path="/effect/" atlas="alone_npot"/>
-    <movieclip id="kztetl8" name="MovieClip4.jta" path="/effect/" atlas="alone_npot"/>
+    <movieclip id="kztetkd" name="MovieClip3_0.jta" path="/effect/" atlas="alone_npot"/>
+    <movieclip id="kztetl8" name="MovieClip4_0.jta" path="/effect/" atlas="alone_npot"/>
+    <movieclip id="slkgtmk" name="MovieClip3_1.jta" path="/effect/" atlas="alone_npot"/>
+    <movieclip id="slkgtml" name="MovieClip3_2.jta" path="/effect/" atlas="alone_npot"/>
+    <movieclip id="slkgtmm" name="MovieClip3_3.jta" path="/effect/" atlas="alone_npot"/>
+    <movieclip id="slkgtnv" name="MovieClip4_1.jta" path="/effect/" atlas="alone_npot"/>
+    <movieclip id="slkgtnw" name="MovieClip4_2.jta" path="/effect/" atlas="alone_npot"/>
+    <movieclip id="slkgtnx" name="MovieClip4_3.jta" path="/effect/" atlas="alone_npot"/>
   </resources>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -202,7 +202,7 @@ namespace GFGGame
             RechargeSProxy.ReqRechargeInfo().Coroutine();
             RechargeSProxy.ReqRechargeInfo().Coroutine();
             RechargeSProxy.ReqRequestGiftBagInfo().Coroutine();
             RechargeSProxy.ReqRequestGiftBagInfo().Coroutine();
             RechargeSProxy.ReqExchangeInfo().Coroutine();
             RechargeSProxy.ReqExchangeInfo().Coroutine();
-
+            DailyTaskSProxy.ReqDailyTaskInfos().Coroutine();
             EquipDataCache.cacher.autoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY) <= 0 ? false : true;
             EquipDataCache.cacher.autoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY) <= 0 ? false : true;
             EquipDataCache.cacher.fightSpeed = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY_SPEED) <= 1 ? 1 : StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY_SPEED);
             EquipDataCache.cacher.fightSpeed = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY_SPEED) <= 1 ? 1 : StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY_SPEED);
             GameGlobal.skipCheckOpen = StorageDataManager.Instance.GetStorageValue(ConstStorageId.SKIP_CHECK_OPEN) <= 0 ? false : true;
             GameGlobal.skipCheckOpen = StorageDataManager.Instance.GetStorageValue(ConstStorageId.SKIP_CHECK_OPEN) <= 0 ? false : true;

+ 8 - 3
GameClient/Assets/Game/HotUpdate/Data/Handler/RoleDataHandler.cs

@@ -26,17 +26,17 @@ namespace GFGGame
         private static void OnUpdate(object param)
         private static void OnUpdate(object param)
         {
         {
             int currentTimeSecs = (int)(Game.TimeInfo.ServerNow() / 1000);
             int currentTimeSecs = (int)(Game.TimeInfo.ServerNow() / 1000);
-            if (!RoleDataManager.powerTimeServerLock &&!RoleDataManager.CheckPowerFull())
+            if (!RoleDataManager.powerTimeServerLock && !RoleDataManager.CheckPowerFull())
             {
             {
                 int powerTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.PowerTime);
                 int powerTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.PowerTime);
                 int passTime = currentTimeSecs - powerTime;
                 int passTime = currentTimeSecs - powerTime;
-                if(passTime >= GameConst.INTERVAL_TIME_SECONDS_POWER)
+                if (passTime >= GameConst.INTERVAL_TIME_SECONDS_POWER)
                 {
                 {
                     RoleDataManager.powerTimeServerLock = true;
                     RoleDataManager.powerTimeServerLock = true;
                     NumericHelper.RequestAddAttributePoint(GameGlobal.zoneScene, NumericType.Power).Coroutine();
                     NumericHelper.RequestAddAttributePoint(GameGlobal.zoneScene, NumericType.Power).Coroutine();
                 }
                 }
             }
             }
-            if(currentTimeSecs >= _heartbeatCDEnd) 
+            if (currentTimeSecs >= _heartbeatCDEnd)
             {
             {
                 //GameProxy.ReqUpdateTime();
                 //GameProxy.ReqUpdateTime();
                 _heartbeatCDEnd = currentTimeSecs + INTERVAL_HEARTBEAT;
                 _heartbeatCDEnd = currentTimeSecs + INTERVAL_HEARTBEAT;
@@ -45,6 +45,11 @@ namespace GFGGame
             if (TimeHelper.ServerNowSecs >= dailyResetSecs)
             if (TimeHelper.ServerNowSecs >= dailyResetSecs)
             {
             {
                 CommonSProxy.ResetDailyData().Coroutine();
                 CommonSProxy.ResetDailyData().Coroutine();
+                RechargeSProxy.ReqRequestGiftBagInfo().Coroutine();
+                RechargeSProxy.ReqExchangeInfo().Coroutine();
+                DailyTaskSProxy.ReqDailyTaskInfos().Coroutine();
+                SuitFosterProxy.SendGetSuitInfos().Coroutine();
+                FieldSProxy.ReqFieldInstanceInfos().Coroutine();
             }
             }
         }
         }
 
 

+ 30 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GetSuitItemUI.cs

@@ -8,9 +8,17 @@ namespace UI.CommonGame
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_bg;
         public GLoader m_bg;
-        public GMovieClip m_mov0;
+        public GMovieClip m_mov00;
+        public GMovieClip m_mov01;
+        public GMovieClip m_mov02;
+        public GMovieClip m_mov03;
+        public GGroup m_grpMov0;
         public GGraph m_holder;
         public GGraph m_holder;
-        public GMovieClip m_mov1;
+        public GMovieClip m_mov10;
+        public GMovieClip m_mov11;
+        public GMovieClip m_mov12;
+        public GMovieClip m_mov13;
+        public GGroup m_grpMov1;
         public GTextField m_txtName;
         public GTextField m_txtName;
         public GProgressBar m_probar;
         public GProgressBar m_probar;
         public UI_LuckyBoxBonusItem m_item;
         public UI_LuckyBoxBonusItem m_item;
@@ -62,9 +70,17 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_bg = (GLoader)comp.GetChild("bg");
             m_bg = (GLoader)comp.GetChild("bg");
-            m_mov0 = (GMovieClip)comp.GetChild("mov0");
+            m_mov00 = (GMovieClip)comp.GetChild("mov00");
+            m_mov01 = (GMovieClip)comp.GetChild("mov01");
+            m_mov02 = (GMovieClip)comp.GetChild("mov02");
+            m_mov03 = (GMovieClip)comp.GetChild("mov03");
+            m_grpMov0 = (GGroup)comp.GetChild("grpMov0");
             m_holder = (GGraph)comp.GetChild("holder");
             m_holder = (GGraph)comp.GetChild("holder");
-            m_mov1 = (GMovieClip)comp.GetChild("mov1");
+            m_mov10 = (GMovieClip)comp.GetChild("mov10");
+            m_mov11 = (GMovieClip)comp.GetChild("mov11");
+            m_mov12 = (GMovieClip)comp.GetChild("mov12");
+            m_mov13 = (GMovieClip)comp.GetChild("mov13");
+            m_grpMov1 = (GGroup)comp.GetChild("grpMov1");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_probar = (GProgressBar)comp.GetChild("probar");
             m_probar = (GProgressBar)comp.GetChild("probar");
             m_item = (UI_LuckyBoxBonusItem)UI_LuckyBoxBonusItem.Create(comp.GetChild("item"));
             m_item = (UI_LuckyBoxBonusItem)UI_LuckyBoxBonusItem.Create(comp.GetChild("item"));
@@ -72,9 +88,17 @@ namespace UI.CommonGame
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
             m_bg = null;
             m_bg = null;
-            m_mov0 = null;
+            m_mov00 = null;
+            m_mov01 = null;
+            m_mov02 = null;
+            m_mov03 = null;
+            m_grpMov0 = null;
             m_holder = null;
             m_holder = null;
-            m_mov1 = null;
+            m_mov10 = null;
+            m_mov11 = null;
+            m_mov12 = null;
+            m_mov13 = null;
+            m_grpMov1 = null;
             m_txtName = null;
             m_txtName = null;
             m_probar = null;
             m_probar = null;
             m_item.Dispose();
             m_item.Dispose();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/ServerProxy/DailyTaskSProxy.cs

@@ -36,7 +36,7 @@ namespace GFGGame
 {
 {
     public static class DailyTaskSProxy
     public static class DailyTaskSProxy
     {
     {
-        public static async ETTask<bool> ReqDailyTaskInfos(List<int> itemIds, List<int> itemNums)
+        public static async ETTask<bool> ReqDailyTaskInfos()
         {
         {
             M2C_GetDailyTaskInfos response = null;
             M2C_GetDailyTaskInfos response = null;
             response = (M2C_GetDailyTaskInfos)await MessageHelper.SendToServer(new C2M_GetDailyTaskInfos());
             response = (M2C_GetDailyTaskInfos)await MessageHelper.SendToServer(new C2M_GetDailyTaskInfos());

+ 57 - 6
GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -33,6 +33,52 @@ namespace GFGGame
 
 
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneDressUp"));
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneDressUp"));
             _ui.m_bg.onClick.Add(OnClickBg);
             _ui.m_bg.onClick.Add(OnClickBg);
+
+            _ui.m_mov00.onPlayEnd.Add(() =>
+            {
+                _ui.m_mov00.visible = false;
+                _ui.m_mov01.visible = true;
+                _ui.m_mov01.SetPlaySettings(0, -1, 1, -1);
+            });
+            _ui.m_mov01.onPlayEnd.Add(() =>
+            {
+                _ui.m_mov01.visible = false;
+                _ui.m_mov02.visible = true;
+                _ui.m_mov02.SetPlaySettings(0, -1, 1, -1);
+            });
+            _ui.m_mov02.onPlayEnd.Add(() =>
+            {
+                _ui.m_mov02.visible = false;
+                _ui.m_mov03.visible = true;
+                _ui.m_mov03.SetPlaySettings(0, -1, 1, -1);
+            });
+            _ui.m_mov03.onPlayEnd.Add(() =>
+            {
+                _ui.m_mov03.visible = false;
+            });
+            _ui.m_mov10.onPlayEnd.Add(() =>
+               {
+                   _ui.m_mov10.visible = false;
+                   _ui.m_mov11.visible = true;
+                   _ui.m_mov11.SetPlaySettings(0, -1, 1, -1);
+               });
+            _ui.m_mov11.onPlayEnd.Add(() =>
+            {
+                _ui.m_mov11.visible = false;
+                _ui.m_mov12.visible = true;
+                _ui.m_mov12.SetPlaySettings(0, -1, 1, -1);
+            });
+            _ui.m_mov12.onPlayEnd.Add(() =>
+            {
+                _ui.m_mov12.visible = false;
+                _ui.m_mov13.visible = true;
+                _ui.m_mov13.SetPlaySettings(0, -1, 1, -1);
+            });
+            _ui.m_mov03.onPlayEnd.Add(() =>
+            {
+                _ui.m_mov03.visible = false;
+            });
+
         }
         }
 
 
         protected override void OnShown()
         protected override void OnShown()
@@ -103,8 +149,13 @@ namespace GFGGame
 
 
         private void UpdateView(int itemId)
         private void UpdateView(int itemId)
         {
         {
-            _ui.m_mov0.visible = false;
-            _ui.m_mov1.visible = false;
+            // _ui.m_mov0.visible = false;
+            // _ui.m_mov1.visible = false;
+            for (int i = 0; i < 4; i++)
+            {
+                _ui.target.GetChild("mov0" + i).asMovieClip.visible = false;
+                _ui.target.GetChild("mov1" + i).asMovieClip.visible = false;
+            }
             int count = 0;
             int count = 0;
             int totalCount = 1;
             int totalCount = 1;
             int suitId = 0;
             int suitId = 0;
@@ -147,10 +198,10 @@ namespace GFGGame
             {
             {
                 _wrapper.wrapTarget = _sceneObject;
                 _wrapper.wrapTarget = _sceneObject;
             }
             }
-            _ui.m_mov0.visible = true;
-            _ui.m_mov1.visible = true;
-            _ui.m_mov0.SetPlaySettings(0, -1, 1, -1);
-            _ui.m_mov1.SetPlaySettings(0, -1, 1, -1);
+            _ui.m_mov00.visible = true;
+            _ui.m_mov10.visible = true;
+            _ui.m_mov00.SetPlaySettings(0, -1, 1, -1);
+            _ui.m_mov10.SetPlaySettings(0, -1, 1, -1);
 
 
         }
         }
 
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskView.cs

@@ -57,7 +57,7 @@ namespace GFGGame
         private void UpdateList()
         private void UpdateList()
         {
         {
             _cfgs = DailyTaskDataManager.Instance.GetDailyTaskCfgs();
             _cfgs = DailyTaskDataManager.Instance.GetDailyTaskCfgs();
-            _cfgs = new List<DailyTaskCfg>(DailyTaskCfgArray.Instance.dataArray);
+            // _cfgs = new List<DailyTaskCfg>(DailyTaskCfgArray.Instance.dataArray);
             _ui.m_list.numItems = _cfgs.Count;
             _ui.m_list.numItems = _cfgs.Count;
 
 
         }
         }

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kztetkd!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kztetkd.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kztetl8!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kztetl8.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtmk!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtmk!a.png.meta

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

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtmk.png


+ 96 - 0
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtmk.png.meta

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

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtml!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtml!a.png.meta

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

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtml.png


+ 96 - 0
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtml.png.meta

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

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtmm!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtmm!a.png.meta

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

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtmm.png


+ 96 - 0
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtmm.png.meta

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

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnv!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnv!a.png.meta

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

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnv.png


+ 96 - 0
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnv.png.meta

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

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnw!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnw!a.png.meta

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

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnw.png


+ 96 - 0
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnw.png.meta

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

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnx!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnx!a.png.meta

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

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnx.png


+ 96 - 0
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_slkgtnx.png.meta

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

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes