zhaoyang 2 жил өмнө
parent
commit
73573d3ef5
42 өөрчлөгдсөн 223 нэмэгдсэн , 117 устгасан
  1. 0 0
      FGUIProject/assets/CommonGame/components/ComIcon000.xml
  2. 0 0
      FGUIProject/assets/CommonGame/components/ComIcon001.xml
  3. 0 0
      FGUIProject/assets/CommonGame/components/ComIcon002.xml
  4. 17 0
      FGUIProject/assets/CommonGame/components/ComIcon003.xml
  5. 0 0
      FGUIProject/assets/CommonGame/components/ComItem000.xml
  6. 0 0
      FGUIProject/assets/CommonGame/components/ComItem001_1.xml
  7. 0 0
      FGUIProject/assets/CommonGame/components/ComItem001_2.xml
  8. 0 0
      FGUIProject/assets/CommonGame/components/ComItem002.xml
  9. 8 7
      FGUIProject/assets/CommonGame/package.xml
  10. BIN
      FGUIProject/assets/LuckyBox/imageNews/bt_tiaoguo.png
  11. 1 0
      FGUIProject/assets/LuckyBox/package.xml
  12. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs
  13. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs.meta
  14. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs
  15. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs.meta
  16. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs
  17. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs.meta
  18. 89 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon003.cs
  19. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon003.cs.meta
  20. 9 9
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem000.cs
  21. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem000.cs.meta
  22. 9 9
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_1.cs
  23. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_1.cs.meta
  24. 9 9
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_2.cs
  25. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_2.cs.meta
  26. 9 9
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem002.cs
  27. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem002.cs.meta
  28. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew1.cs.meta
  29. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew.cs.meta
  30. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew1.cs.meta
  31. 0 2
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardPreView.cs
  32. 2 4
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/FirstChargeBonusView.cs
  33. 0 2
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs
  34. 0 2
      GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRewardGetView.cs
  35. 1 2
      GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRewardView.cs
  36. 0 2
      GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRuleView.cs
  37. 0 2
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingRewardView.cs
  38. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  39. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  40. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png
  41. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png
  42. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes

+ 0 - 0
FGUIProject/assets/CommonGame/components/ComItemIcon.xml → FGUIProject/assets/CommonGame/components/ComIcon000.xml


+ 0 - 0
FGUIProject/assets/CommonGame/components/ComItemIconNew.xml → FGUIProject/assets/CommonGame/components/ComIcon001.xml


+ 0 - 0
FGUIProject/assets/CommonGame/components/ComItemIconNew1.xml → FGUIProject/assets/CommonGame/components/ComIcon002.xml


+ 17 - 0
FGUIProject/assets/CommonGame/components/ComIcon003.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="180,180">
+  <displayList>
+    <image id="n25_pu55" name="n25" src="hhx9j" fileName="imagesNew/wp_baseboard1.png" xy="1,1"/>
+    <loader id="n12_ehs9" name="loaIcon" xy="89,94" pivot="0.5,0.5" anchor="true" size="122,122" group="n30_9jv6" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
+    <text id="n17_j48o" name="txtHasCount" xy="90,225" pivot="0.5,0" anchor="true" size="100,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
+    <loader id="n18_j48o" name="loaRarity" xy="115,38" size="27,58" group="n30_9jv6" aspect="true" url="ui://eg2y0ldpo9ghtll" fill="scale"/>
+    <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="-1,73" size="178,40" group="n29_pu55"/>
+    <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="-1,73" size="178,40" group="n29_pu55"/>
+    <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="8,73" size="160,40" group="n29_pu55"/>
+    <group id="n29_pu55" name="n29" xy="-1,73" size="178,40" group="n30_9jv6" advanced="true"/>
+    <image id="n24_pu55" name="n24" src="l500tlx" fileName="imagesNew/wpk_zz.png" xy="32,37" group="n27_pu55"/>
+    <image id="n26_pu55" name="n26" src="orsttis" fileName="images/pfjl_ywc.png" xy="46,68" size="85,49" group="n27_pu55"/>
+    <group id="n27_pu55" name="grpGot" xy="32,37" size="112,112" group="n30_9jv6" visible="false" advanced="true"/>
+    <group id="n30_9jv6" name="n30" xy="-1,33" size="178,228"/>
+  </displayList>
+</component>

+ 0 - 0
FGUIProject/assets/CommonGame/components/ComItem.xml → FGUIProject/assets/CommonGame/components/ComItem000.xml


+ 0 - 0
FGUIProject/assets/CommonGame/components/ComItemBlue.xml → FGUIProject/assets/CommonGame/components/ComItem001_1.xml


+ 0 - 0
FGUIProject/assets/CommonGame/components/ComItemNew.xml → FGUIProject/assets/CommonGame/components/ComItem001_2.xml


+ 0 - 0
FGUIProject/assets/CommonGame/components/ComItemNew1.xml → FGUIProject/assets/CommonGame/components/ComItem002.xml


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

@@ -88,7 +88,7 @@
     <image id="9cth90" name="cj_hd_zik.png" path="/imagesExport/"/>
     <component id="ojlzk" name="ListScoreItem.xml" path="/components/" exported="true"/>
     <component id="ih7596" name="ComFilterType.xml" path="/components/" exported="true"/>
-    <component id="j48o98" name="ComItem.xml" path="/components/" exported="true"/>
+    <component id="j48o98" name="ComItem000.xml" path="/components/" exported="true"/>
     <image id="j48o99" name="kp_sjsj_di_3.png" path="/images/" exported="true"/>
     <image id="j48o9a" name="kp_sjsj_di_4.png" path="/images/" exported="true" scale="9grid" scale9grid="68,7,20,14"/>
     <image id="j48o9b" name="yx_yilq.png" path="/images/"/>
@@ -176,7 +176,7 @@
     <image id="orsttis" name="pfjl_ywc.png" path="/images/" exported="true"/>
     <image id="orsttit" name="wpbb_di.png" path="/images/" exported="true"/>
     <image id="pu55tiw" name="pfjl_and.png" path="/images/"/>
-    <component id="ng0itiz" name="ComItemIcon.xml" path="/components/"/>
+    <component id="ng0itiz" name="ComIcon000.xml" path="/components/"/>
     <image id="qqattj1" name="zjm_kuang_2.png" path="/images/"/>
     <image id="qqattj2" name="zjm_gnkuang.png" path="/images/"/>
     <image id="uyuxtj3" name="tujian_zkanniu.png" path="/images/" exported="true"/>
@@ -276,8 +276,8 @@
     <image id="a0cf2l" name="lm_huizhangdk.png" path="/imagesNew/"/>
     <component id="o9ghtlr" name="ComHeadLv1.xml" path="/components/" exported="true"/>
     <image id="a0cf2k" name="lm_db_lvl.png" path="/imagesNew/"/>
-    <component id="9jv6tls" name="ComItemNew.xml" path="/components/" exported="true"/>
-    <component id="9jv6tlt" name="ComItemIconNew.xml" path="/components/"/>
+    <component id="9jv6tls" name="ComItem001_2.xml" path="/components/" exported="true"/>
+    <component id="9jv6tlt" name="ComIcon001.xml" path="/components/"/>
     <image id="9jv6tlu" name="lm_daoju_db.png" path="/images/"/>
     <image id="miy37t" name="tb_suo.png" path="/imagesNew/" exported="true"/>
     <component id="rv091p" name="BtnStyle1Big.xml" path="/components/" exported="true"/>
@@ -300,8 +300,8 @@
     <image id="l500tlv" name="wpk_db_1.png" path="/imagesNew/"/>
     <image id="l500tlw" name="wpk_sz_db.png" path="/imagesNew/"/>
     <image id="l500tlx" name="wpk_zz.png" path="/imagesNew/" exported="true"/>
-    <component id="qik1tly" name="ComItemNew1.xml" path="/components/" exported="true"/>
-    <component id="qik1tlz" name="ComItemIconNew1.xml" path="/components/" exported="true"/>
+    <component id="qik1tly" name="ComItem002.xml" path="/components/" exported="true"/>
+    <component id="qik1tlz" name="ComIcon002.xml" path="/components/" exported="true"/>
     <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>
     <image id="qik1tm0" name="dikuang_SkillLevel.png" path="/imagesNew/" scale="9grid" scale9grid="10,7,20,14"/>
     <component id="qik1tm1" name="BtnStyle000.xml" path="/components/" exported="true"/>
@@ -324,7 +324,7 @@
     <image id="qik1tca" name="lm_dt_zsx2.png" path="/componentsBg/"/>
     <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
     <image id="qik1tm7" name="db_jiajian_1.png" path="/images/"/>
-    <component id="mdmdtn5" name="ComItemBlue.xml" path="/components/" exported="true"/>
+    <component id="mdmdtn5" name="ComItem001_1.xml" path="/components/" exported="true"/>
     <image id="uxxstma" name="wpk_db_2.png" path="/imagesNew/" exported="true"/>
     <image id="uxxstm5" name="wpk_sz_db2.png" path="/imagesNew/" exported="true"/>
     <image id="mbf14" name="sj_dk.png" path="/imagesNew/" exported="true"/>
@@ -340,6 +340,7 @@
     <image id="idkdtnb" name="hl_jfscibt.png" path="/imagesNew/"/>
     <image id="qqhzk" name="an_yellow_1.png" path="/imagesNew/" exported="true"/>
     <image id="idkdtnc" name="xsqg_zsx.png" path="/imagesNew/" exported="true"/>
+    <component id="volstnd" name="ComIcon003.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

BIN
FGUIProject/assets/LuckyBox/imageNews/bt_tiaoguo.png


+ 1 - 0
FGUIProject/assets/LuckyBox/package.xml

@@ -71,6 +71,7 @@
     <image id="mbf1tak" name="cj_meirith.png" path="/images/"/>
     <image id="mbf1tal" name="cj_sj_db.png" path="/images/"/>
     <image id="mbf1tam" name="cj_tswz_db.png" path="/images/"/>
+    <image id="volstan" name="bt_tiaoguo.png" path="/imageNews/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIcon.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemIcon
+    public partial class UI_ComIcon000
     {
         public GComponent target;
         public GLoader m_loaIcon;
@@ -16,12 +16,12 @@ namespace UI.CommonGame
         public GGroup m_grpGot;
         public const string URL = "ui://eg2y0ldpng0itiz";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemIcon";
-        private static UI_ComItemIcon _proxy;
+        public const string RES_NAME = "ComIcon000";
+        private static UI_ComIcon000 _proxy;
 
-        public static UI_ComItemIcon Create(GObject gObject = null)
+        public static UI_ComIcon000 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemIcon();
+            var ui = new UI_ComIcon000();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -30,11 +30,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemIcon Proxy(GObject gObject = null)
+        public static UI_ComIcon000 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemIcon();
+                _proxy = new UI_ComIcon000();
             }
             var ui = _proxy;
             if(gObject == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 27270b2db69f5bb4a9bcdc40af3f3ee2
+guid: 6ab0ba8a5e22ea948a6f5e2dbe615dd4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemIconNew
+    public partial class UI_ComIcon001
     {
         public GComponent target;
         public GLoader m_bg;
@@ -18,12 +18,12 @@ namespace UI.CommonGame
         public GGroup m_grpGot;
         public const string URL = "ui://eg2y0ldp9jv6tlt";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemIconNew";
-        private static UI_ComItemIconNew _proxy;
+        public const string RES_NAME = "ComIcon001";
+        private static UI_ComIcon001 _proxy;
 
-        public static UI_ComItemIconNew Create(GObject gObject = null)
+        public static UI_ComIcon001 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemIconNew();
+            var ui = new UI_ComIcon001();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -32,11 +32,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemIconNew Proxy(GObject gObject = null)
+        public static UI_ComIcon001 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemIconNew();
+                _proxy = new UI_ComIcon001();
             }
             var ui = _proxy;
             if(gObject == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemBlue.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b37e991627d2d46ca8f4e2ecc8288820
+guid: 4ad5e828cb8d0004488ba34ffb26c6e0
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemIconNew1
+    public partial class UI_ComIcon002
     {
         public GComponent target;
         public GLoader m_loaIcon;
@@ -16,12 +16,12 @@ namespace UI.CommonGame
         public GGroup m_grpGot;
         public const string URL = "ui://eg2y0ldpqik1tlz";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemIconNew1";
-        private static UI_ComItemIconNew1 _proxy;
+        public const string RES_NAME = "ComIcon002";
+        private static UI_ComIcon002 _proxy;
 
-        public static UI_ComItemIconNew1 Create(GObject gObject = null)
+        public static UI_ComIcon002 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemIconNew1();
+            var ui = new UI_ComIcon002();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -30,11 +30,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemIconNew1 Proxy(GObject gObject = null)
+        public static UI_ComIcon002 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemIconNew1();
+                _proxy = new UI_ComIcon002();
             }
             var ui = _proxy;
             if(gObject == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIcon.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7a5d537a09290ee498209390a8913151
+guid: 8aa459e7d8832484abfa8f7737db7902
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 89 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon003.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComIcon003
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtHasCount;
+        public GLoader m_loaRarity;
+        public GImage m_imgHas;
+        public GImage m_imgNotHas;
+        public GImage m_imgShowTong;
+        public GGroup m_grpGot;
+        public const string URL = "ui://eg2y0ldpvolstnd";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComIcon003";
+        private static UI_ComIcon003 _proxy;
+
+        public static UI_ComIcon003 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComIcon003();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComIcon003 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComIcon003();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
+            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_imgHas = (GImage)comp.GetChild("imgHas");
+            m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
+            m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
+            m_grpGot = (GGroup)comp.GetChild("grpGot");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtHasCount = null;
+            m_loaRarity = null;
+            m_imgHas = null;
+            m_imgNotHas = null;
+            m_imgShowTong = null;
+            m_grpGot = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon003.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f7099fc706293db4d811169e4e3c899d
+guid: 8e9c5f8ad208b9448aa5016042fa8782
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 9 - 9
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem000.cs

@@ -4,20 +4,20 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItem
+    public partial class UI_ComItem000
     {
         public GComponent target;
-        public UI_ComItemIcon m_comItemIcon;
+        public UI_ComIcon000 m_comItemIcon;
         public GTextField m_txtCount;
         public GTextField m_txtName;
         public const string URL = "ui://eg2y0ldpj48o98";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItem";
-        private static UI_ComItem _proxy;
+        public const string RES_NAME = "ComItem000";
+        private static UI_ComItem000 _proxy;
 
-        public static UI_ComItem Create(GObject gObject = null)
+        public static UI_ComItem000 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItem();
+            var ui = new UI_ComItem000();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItem Proxy(GObject gObject = null)
+        public static UI_ComItem000 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItem();
+                _proxy = new UI_ComItem000();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,7 +57,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (UI_ComItemIcon)UI_ComItemIcon.Create(comp.GetChild("comItemIcon"));
+            m_comItemIcon = (UI_ComIcon000)UI_ComIcon000.Create(comp.GetChild("comItemIcon"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem000.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1a92c43219c83fc4588b7d799dd4ed57
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 9
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemBlue.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_1.cs

@@ -4,20 +4,20 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemBlue
+    public partial class UI_ComItem001_1
     {
         public GComponent target;
-        public UI_ComItemIconNew m_comItemIcon;
+        public UI_ComIcon001 m_comItemIcon;
         public GTextField m_txtCount;
         public GTextField m_txtName;
         public const string URL = "ui://eg2y0ldpmdmdtn5";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemBlue";
-        private static UI_ComItemBlue _proxy;
+        public const string RES_NAME = "ComItem001_1";
+        private static UI_ComItem001_1 _proxy;
 
-        public static UI_ComItemBlue Create(GObject gObject = null)
+        public static UI_ComItem001_1 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemBlue();
+            var ui = new UI_ComItem001_1();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemBlue Proxy(GObject gObject = null)
+        public static UI_ComItem001_1 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemBlue();
+                _proxy = new UI_ComItem001_1();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,7 +57,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (UI_ComItemIconNew)UI_ComItemIconNew.Create(comp.GetChild("comItemIcon"));
+            m_comItemIcon = (UI_ComIcon001)UI_ComIcon001.Create(comp.GetChild("comItemIcon"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_1.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d31759cc75019a944ab13e924dca08b8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 9
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_2.cs

@@ -4,20 +4,20 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemNew
+    public partial class UI_ComItem001_2
     {
         public GComponent target;
-        public UI_ComItemIconNew m_comItemIcon;
+        public UI_ComIcon001 m_comItemIcon;
         public GTextField m_txtCount;
         public GTextField m_txtName;
         public const string URL = "ui://eg2y0ldp9jv6tls";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemNew";
-        private static UI_ComItemNew _proxy;
+        public const string RES_NAME = "ComItem001_2";
+        private static UI_ComItem001_2 _proxy;
 
-        public static UI_ComItemNew Create(GObject gObject = null)
+        public static UI_ComItem001_2 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemNew();
+            var ui = new UI_ComItem001_2();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemNew Proxy(GObject gObject = null)
+        public static UI_ComItem001_2 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemNew();
+                _proxy = new UI_ComItem001_2();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,7 +57,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (UI_ComItemIconNew)UI_ComItemIconNew.Create(comp.GetChild("comItemIcon"));
+            m_comItemIcon = (UI_ComIcon001)UI_ComIcon001.Create(comp.GetChild("comItemIcon"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_2.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fb4d5413ab9538f4182de3b801f51b22
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 9
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem002.cs

@@ -4,20 +4,20 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemNew1
+    public partial class UI_ComItem002
     {
         public GComponent target;
-        public UI_ComItemIconNew1 m_comItemIcon;
+        public UI_ComIcon002 m_comItemIcon;
         public GTextField m_txtName;
         public GTextField m_txtCount;
         public const string URL = "ui://eg2y0ldpqik1tly";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemNew1";
-        private static UI_ComItemNew1 _proxy;
+        public const string RES_NAME = "ComItem002";
+        private static UI_ComItem002 _proxy;
 
-        public static UI_ComItemNew1 Create(GObject gObject = null)
+        public static UI_ComItem002 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemNew1();
+            var ui = new UI_ComItem002();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemNew1 Proxy(GObject gObject = null)
+        public static UI_ComItem002 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemNew1();
+                _proxy = new UI_ComItem002();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,7 +57,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (UI_ComItemIconNew1)UI_ComItemIconNew1.Create(comp.GetChild("comItemIcon"));
+            m_comItemIcon = (UI_ComIcon002)UI_ComIcon002.Create(comp.GetChild("comItemIcon"));
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
         }

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem002.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 39866ec1b63d9cd46a15d82adaa5f332
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew1.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 82763b2a154d64a6e9f64adfccfeca3f
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e56694fe656433347a8e56ddb1aabacd
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew1.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 45c34602b5cd145d6986388695fc4c4d
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 2
GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardPreView.cs

@@ -48,7 +48,6 @@ namespace GFGGame
         }
         private void ListItemRender(int index, GObject obj)
         {
-            UI_ComItem item = UI_ComItem.Proxy(obj);
             ItemData reward = _rewardDatas[index];
             if (obj.data == null)
             {
@@ -56,7 +55,6 @@ namespace GFGGame
             }
             (obj.data as ItemView).SetData(reward);
 
-            UI_ComItem.ClearProxy();
         }
 
     }

+ 2 - 4
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/FirstChargeBonusView.cs

@@ -57,7 +57,7 @@ namespace GFGGame
             var itemInfo = GlobalCfgArray.globalCfg.firstChargeBonusArr[0];
             var itemId = itemInfo[0];
             var itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-            if(itemCfg.suitId > 0)
+            if (itemCfg.suitId > 0)
             {
                 var suitCfg = SuitCfgArray.Instance.GetCfg(itemCfg.suitId);
                 _ui.m_txtName.text = suitCfg.name;
@@ -80,7 +80,7 @@ namespace GFGGame
             {
                 UpdateView();
             }
-        
+
         }
 
         private void OnNumericChange(EventContext context)
@@ -99,7 +99,6 @@ namespace GFGGame
 
         private void ListItemRender(int index, GObject obj)
         {
-            UI_ComItem item = UI_ComItem.Proxy(obj);
             int[] reward = GlobalCfgArray.globalCfg.firstChargeBonusArr[index];
             ItemData itemData = ItemUtil.createItemData(reward);
             if (obj.data == null)
@@ -107,7 +106,6 @@ namespace GFGGame
                 obj.data = new ItemView(obj as GComponent);
             }
                    (obj.data as ItemView).SetData(itemData);
-            UI_ComItem.ProxyEnd();
         }
 
     }

+ 0 - 2
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs

@@ -120,7 +120,6 @@ namespace GFGGame
         }
         private void RenderListRewardItem(int index, GObject obj)
         {
-            UI_ComItem item = UI_ComItem.Proxy(obj);
             int[] reward = GlobalCfgArray.globalCfg.firstChargeBonusArr[index];
             ItemData itemData = ItemUtil.createItemData(reward);
             if (obj.data == null)
@@ -128,7 +127,6 @@ namespace GFGGame
                 obj.data = new ItemView(obj as GComponent);
             }
             (obj.data as ItemView).SetData(itemData);
-            UI_ComItem.ProxyEnd();
         }
 
         private void OnBtnGetClick(EventContext context)

+ 0 - 2
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRewardGetView.cs

@@ -87,7 +87,6 @@ namespace GFGGame
 
         private void RenderListItem(int index, GObject obj)
         {
-            UI_ComItem item = UI_ComItem.Proxy(obj);
             ItemData reward = _rewardDatas[index];
             if (obj.data == null)
             {
@@ -97,7 +96,6 @@ namespace GFGGame
             // (obj.data as ItemView).SetComItemScale = 0.72f;
             // (obj.data as ItemView).SetTxtCountScale = 0.8f;
             // (obj.data as ItemView).SetTxtCountPos(185, 155);
-            UI_ComItem.ClearProxy();
         }
     }
 }

+ 1 - 2
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRewardView.cs

@@ -69,7 +69,7 @@ namespace GFGGame
         {
             int rewardIndex = (int)obj.parent.data;
             int[][] rewards = GalleryRewardCfgArray.Instance.dataArray[rewardIndex].itemsArr;
-            UI_ComItem item = UI_ComItem.Proxy(obj);
+            // UI_ComItem item = UI_ComItem.Proxy(obj);
             ItemData reward = ItemUtil.createItemData(rewards[index]);//_rewardDatas[index];
             if (obj.data == null)
             {
@@ -79,7 +79,6 @@ namespace GFGGame
             (obj.data as ItemView).SetComItemScale = 0.72f;
             // (obj.data as ItemView).SetTxtCountScale = 0.8f;
             (obj.data as ItemView).SetTxtCountPos(185, 155);
-            UI_ComItem.ClearProxy();
         }
     }
 }

+ 0 - 2
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRuleView.cs

@@ -75,7 +75,6 @@ namespace GFGGame
         {
             int rewardIndex = (int)obj.parent.data;
             int[][] rewards = GalleryRewardCfgArray.Instance.dataArray[rewardIndex].itemsArr;
-            UI_ComItem item = UI_ComItem.Proxy(obj);
             ItemData reward = ItemUtil.createItemData(rewards[index]);//_rewardDatas[index];
             if (obj.data == null)
             {
@@ -85,7 +84,6 @@ namespace GFGGame
             (obj.data as ItemView).SetComItemScale = 0.72f;
             // (obj.data as ItemView).SetTxtCountScale = 0.8f;
             (obj.data as ItemView).SetTxtCountPos(185, 155);
-            UI_ComItem.ClearProxy();
         }
     }
 }

+ 0 - 2
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingRewardView.cs

@@ -79,7 +79,6 @@ namespace GFGGame
         {
             int rewardIndex = (int)obj.parent.data;
             int[][] rewards = FilingRewardCfgArray.Instance.GetCfgsByid(StudioDataManager.Instance.filingChapterId)[rewardIndex].itemsArr;
-            UI_ComItem item = UI_ComItem.Proxy(obj);
             ItemData reward = ItemUtil.createItemData(rewards[index]);//_rewardDatas[index];
             if (obj.data == null)
             {
@@ -89,7 +88,6 @@ namespace GFGGame
             (obj.data as ItemView).GrpGotVisible = StudioDataManager.Instance.GetFilingRewardStateByIndex(StudioDataManager.Instance.filingChapterId, rewardIndex) == ConstBonusStatus.GOT ? true : false;
             (obj.data as ItemView).SetComItemScale = 0.6f;
             (obj.data as ItemView).SetTxtCountPos(175, 135);
-            UI_ComItem.ClearProxy();
         }
 
         private void OnBtnGetClcik()

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


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


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


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


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