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

FGUIProject/assets/CommonGame/components/ComIcon003.xml

@@ -5,10 +5,10 @@
     <loader id="n12_ehs9" name="loaIcon" xy="105,105" pivot="0.5,0.5" anchor="true" size="152,152" group="n30_9jv6" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
     <text id="n17_j48o" name="txtHasCount" xy="105,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="162,0" size="44,94" group="n30_9jv6" aspect="true" url="ui://eg2y0ldpo9ghtll" fill="scale" autoSize="true"/>
-    <image id="n23_slyz" name="imgHas" src="volstnm" fileName="imagesNew/wp_own.png" xy="16,91" size="178,40" group="n29_pu55" visible="false"/>
+    <image id="n23_slyz" name="imgHas" src="volstnm" fileName="imagesNew/wp_own.png" xy="16,95" group="n29_pu55" visible="false"/>
     <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="16,91" size="178,40" group="n29_pu55" visible="false"/>
     <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="25,91" size="160,40" group="n29_pu55" visible="false"/>
-    <group id="n29_pu55" name="n29" xy="16,91" size="178,40" group="n30_9jv6" advanced="true"/>
+    <group id="n29_pu55" name="n29" xy="16,91" size="182,40" group="n30_9jv6" advanced="true"/>
     <image id="n24_pu55" name="n24" src="l500tlx" fileName="imagesNew/wpk_zz.png" xy="49,49" group="n27_pu55"/>
     <image id="n26_pu55" name="n26" src="orsttis" fileName="images/pfjl_ywc.png" xy="63,80" size="85,49" group="n27_pu55"/>
     <group id="n27_pu55" name="grpGot" xy="49,49" size="112,112" group="n30_9jv6" visible="false" advanced="true"/>

FGUIProject/assets/CommonGame/components/ComItem003.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="210,210" pivot="0.5,0.5" overflow="hidden" opaque="false">
   <displayList>
-    <component id="n25_pu55" name="comItemIcon" src="volstnj" fileName="components/ComIcon003.xml" xy="0,0" pivot="0.5,0.5" aspect="true"/>
+    <component id="n25_pu55" name="comItemIcon" src="volstnd" fileName="components/ComIcon003.xml" xy="0,0" pivot="0.5,0.5" aspect="true"/>
     <text id="n26_r9ri" name="txtName" xy="105,224" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">
       <relation target="n25_pu55" sidePair="bottom-bottom"/>
     </text>

FGUIProject/assets/CommonGame/package.xml

@@ -300,7 +300,7 @@
     <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="ComItem002.xml" path="/components/" exported="true"/>
-    <component id="qik1tlz" name="ComIcon002.xml" path="/components/" exported="true"/>
+    <component id="qik1tlz" name="ComIcon002.xml" path="/components/"/>
     <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"/>
@@ -339,11 +339,11 @@
     <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"/>
+    <component id="volstnd" name="ComIcon003.xml" path="/components/"/>
     <image id="volstne" name="lm_fl_db.png" path="/bgimg/" exported="true"/>
     <component id="volstnf" name="BtnStyle005.xml" path="/components/"/>
     <component id="volstng" name="BtnStyle006.xml" path="/components/"/>
-    <component id="volstnh" name="ComItem003.xml" path="/components/"/>
+    <component id="volstnh" name="ComItem003.xml" path="/components/" exported="true"/>
     <image id="volstni" name="an_bt_bai.png" path="/imagesNew/"/>
     <image id="volstnj" name="an_bt_cut.png" path="/imagesNew/"/>
     <image id="volstnk" name="an_bt_jin.png" path="/imagesNew/"/>

FGUIProject/assets/LuckyBox/LuckyBoxPreShowUI.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1158">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n13_vols" name="n13" src="volstc4" fileName="imageNews/zx_tc_piaodai_shang.png" xy="-47,-130" group="n15_vols"/>
-    <image id="n14_vols" name="n14" src="volstc5" fileName="imageNews/zx_tc_piaodai_xia.png" xy="545,841" group="n15_vols"/>
-    <image id="n11_vols" name="n11" src="volstc3" fileName="imageNews/zx_tc_bg.png" xy="5,11" group="n15_vols"/>
+    <image id="n13_vols" name="n13" src="volstc9" fileName="imageNews/zx_tc_piaodai_shang.png" xy="-47,-130" group="n15_vols"/>
+    <image id="n14_vols" name="n14" src="volstca" fileName="imageNews/zx_tc_piaodai_xia.png" xy="545,841" group="n15_vols"/>
+    <image id="n11_vols" name="n11" src="volstc8" fileName="imageNews/zx_tc_bg.png" xy="5,11" group="n15_vols"/>
     <group id="n15_vols" name="n15" xy="-47,-130" size="1046,1353"/>
-    <image id="n16_vols" name="n16" src="volstbz" fileName="imageNews/zx_tc_title_zhuangshi.png" xy="28,62" group="n20_vols"/>
+    <image id="n16_vols" name="n16" src="volstcf" fileName="imageNews/zx_tc_title_zhuangshi.png" xy="28,62" group="n20_vols"/>
     <text id="n2_ga16" name="n2" xy="68,71" size="64,79" group="n20_vols" fontSize="60" color="#5a3e16" text="物"/>
     <text id="n17_vols" name="n17" xy="123,84" size="54,66" group="n20_vols" fontSize="50" color="#5a3e16" text="品"/>
     <text id="n18_vols" name="n18" xy="168,71" size="64,79" group="n20_vols" fontSize="60" color="#5a3e16" text="展"/>
     <text id="n19_vols" name="n19" xy="223,84" size="54,66" group="n20_vols" fontSize="50" color="#5a3e16" text="示"/>
     <group id="n20_vols" name="n20" xy="28,62" size="249,110" advanced="true"/>
-    <image id="n3_ga16" name="n3" src="volstc6" fileName="imageNews/zx_tc_tab_bg.png" xy="247,182" size="468,74" group="n10_dhoa"/>
-    <component id="n4_ga16" name="btnItem" src="ga165c" fileName="components/ButtonTab1.xml" xy="244,181" group="n10_dhoa">
-      <Button title="物品预览" controller="c1" page="0"/>
+    <image id="n3_ga16" name="n3" src="volstcb" fileName="imageNews/zx_tc_tab_bg.png" xy="247,182" size="468,74" group="n10_dhoa"/>
+    <component id="n4_ga16" name="btnItem" src="volstao" fileName="components/ButtonTab1.xml" xy="244,181" group="n10_dhoa">
+      <Button controller="c1" page="0"/>
     </component>
-    <component id="n5_ga16" name="btnProb" src="ga165c" fileName="components/ButtonTab1.xml" xy="479,181" group="n10_dhoa" controller="c1,1">
-      <Button checked="true" title="概率公示" controller="c1" page="1"/>
+    <component id="n5_ga16" name="btnProb" src="volstao" fileName="components/ButtonTab1.xml" xy="479,181" group="n10_dhoa" controller="c1,1">
+      <Button title="概率公示" controller="c1" page="1"/>
     </component>
-    <image id="n12_vols" name="n12" src="volstc7" fileName="imageNews/zx_tc_tab_biankuang.png" xy="33,181" group="n10_dhoa"/>
+    <image id="n12_vols" name="n12" src="volstcc" fileName="imageNews/zx_tc_tab_biankuang.png" xy="33,181" group="n10_dhoa"/>
     <group id="n10_dhoa" name="n10" xy="33,181" size="896,75"/>
     <list id="n6_ga16" name="list" xy="96,318" size="770,735" overflow="scroll" lineGap="20" defaultItem="ui://drx9d1usga16k" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
       <gearDisplay controller="c1" pages="0"/>

FGUIProject/assets/LuckyBox/combox/ComBox.xml

@@ -14,6 +14,9 @@
     <group id="n66_vols" name="n66" xy="861,241" size="226,148" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
+    <image id="n72_vols" name="n72" src="volstcj" fileName="imageNews/cj_wz_jhsy.png" xy="101,376">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
     <image id="n68_vols" name="n68" src="qi041j" fileName="images/cj_zizi_2.png" xy="392,545" group="n71_vols"/>
     <image id="n69_vols" name="n69" src="mzf8tac" fileName="images/cj_zizi_3.png" xy="676,700" group="n71_vols"/>
     <text id="n70_vols" name="txtTime" xy="643,949" size="62,237" group="n71_vols" font="ui://eg2y0ldpwonotj9" fontSize="46" color="#fffbdd" align="center" vAlign="middle" autoSize="height" strokeColor="#a98538" strokeSize="2" text="剩余80天"/>

FGUIProject/assets/LuckyBox/components/ButtonTab1.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="238,74" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="1"/>
-  <controller name="c1" exported="true" pages="0,,1," selected="1"/>
+  <controller name="c1" exported="true" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n0_ga16" name="n0" src="volstc8" fileName="imageNews/zx_tc_tab_xuanzhong.png" xy="0,0" pivot="0.5,0.5" scale="-1,1">
+    <image id="n0_ga16" name="n0" src="volstcd" fileName="imageNews/zx_tc_tab_xuanzhong.png" xy="0,0" pivot="0.5,0.5" size="238,74">
       <gearDisplay controller="button" pages="1,2,3"/>
       <gearSize controller="c1" pages="1" values="238,74,-1,1" default="238,74,1,1"/>
       <relation target="" sidePair="width-width,height-height"/>

FGUIProject/assets/LuckyBox/components/CompLuckyBoxBonusListItem.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="770,355">
   <displayList>
-    <image id="n12_qr4e" name="n12" src="volstc9" fileName="imageNews/zx_tc_taozhuang_zhuagnshi.png" xy="21,22"/>
+    <image id="n12_qr4e" name="n12" src="volstce" fileName="imageNews/zx_tc_taozhuang_zhuagnshi.png" xy="21,22"/>
     <text id="n9_ga16" name="txtName" xy="57,6" size="84,54" fontSize="40" color="#5a3e16" text="示例"/>
-    <list id="n11_ga16" name="list" xy="0,65" size="770,290" layout="flow_hz" lineGap="25" colGap="70" lineItemCount="3" defaultItem="ui://eg2y0ldpvolstnk" autoClearItems="true">
+    <list id="n11_ga16" name="list" xy="0,65" size="770,290" layout="flow_hz" lineGap="25" colGap="70" lineItemCount="3" defaultItem="ui://eg2y0ldpvolstnh" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/LuckyBox/package.xml

@@ -109,7 +109,7 @@
     <image id="volstbm" name="zx_title_guangdian.png" path="/imageNews/"/>
     <image id="volstbn" name="bt_jiaobiao_bichu.png" path="/imageNews/"/>
     <image id="volstbo" name="bt_tiaoguo.png" path="/imageNews/"/>
-    <image id="volstbp" name="wp_bg_shuliang.png" path="/imageNews/"/>
+    <image id="volstbp" name="wp_bg_shuliang.png" path="/imageNews/" scale="9grid" scale9grid="24,9,48,18"/>
     <image id="volstbq" name="zx_bg_yueliang.png" path="/imageNews/"/>
     <image id="volstbr" name="zx_bg_zhuangshi.png" path="/imageNews/"/>
     <image id="volstbs" name="zx_jindu_bg.png" path="/imageNews/"/>
@@ -131,7 +131,7 @@
     <image id="volstc8" name="zx_tc_bg.png" path="/imageNews/"/>
     <image id="volstc9" name="zx_tc_piaodai_shang.png" path="/imageNews/"/>
     <image id="volstca" name="zx_tc_piaodai_xia.png" path="/imageNews/"/>
-    <image id="volstcb" name="zx_tc_tab_bg.png" path="/imageNews/"/>
+    <image id="volstcb" name="zx_tc_tab_bg.png" path="/imageNews/" scale="9grid" scale9grid="25,18,104,36"/>
     <image id="volstcc" name="zx_tc_tab_biankuang.png" path="/imageNews/"/>
     <image id="volstcd" name="zx_tc_tab_xuanzhong.png" path="/imageNews/"/>
     <image id="volstce" name="zx_tc_taozhuang_zhuagnshi.png" path="/imageNews/"/>
@@ -139,6 +139,7 @@
     <image id="volstcg" name="zx_title_bg.png" path="/imageNews/"/>
     <image id="volstch" name="zx_lianxian_lan_shang.png" path="/imageNews/"/>
     <image id="volstci" name="zx_zhuangshi_xinggui.png" path="/imageNews/"/>
+    <image id="volstcj" name="cj_wz_jhsy.png" path="/imageNews/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -20,13 +20,13 @@
     <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="170,127" pivot="0,0.5" anchor="true">
       <ProgressBar value="100" max="100"/>
     </component>
-    <component id="n54_psph" name="comTargetCard" src="psphiz" fileName="components/ComTargetCard.xml" xy="1180,540" pivot="0.5,0.5" anchor="true" size="174,250" aspect="true"/>
+    <component id="n54_psph" name="comTargetCard" src="volsov" fileName="components/ComTargetSkillShow.xml" xy="1180,420" pivot="0.5,0.5" anchor="true" aspect="true" scale="0.3,0.3"/>
     <component id="n55_psph" name="comDeduction" src="psphix" fileName="components/ComDeduction.xml" xy="102,500" pivot="0.5,0.5" anchor="true" scale="0,0"/>
   </displayList>
   <transition name="t1">
-    <item time="0" type="Scale" target="n54_psph" value="1,1"/>
-    <item time="0" type="XY" target="n54_psph" tween="true" startValue="1180,540" endValue="995,540" duration="6" ease="Linear"/>
-    <item time="24" type="Scale" target="n54_psph" tween="true" startValue="1,1" endValue="0,0" duration="6" ease="Linear"/>
+    <item time="0" type="Scale" target="n54_psph" value="0.3,0.3"/>
+    <item time="0" type="XY" target="n54_psph" tween="true" startValue="1180,420" endValue="995,420" duration="6" ease="Linear"/>
+    <item time="24" type="Scale" target="n54_psph" tween="true" startValue="0.3,0.3" endValue="0,0" duration="6" ease="Linear"/>
   </transition>
   <transition name="t2">
     <item time="0" type="Scale" target="n55_psph" tween="true" startValue="0,0" endValue="1,1" duration="6" ease="Linear"/>

FGUIProject/assets/Main/components/ComTargetSkillShow.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="546,997" overflow="hidden">
+  <displayList>
+    <image id="n18_vols" name="n18" src="qkjsjv" fileName="imagesNew/dikuang_card_light2.png" xy="-267,-67" group="n14_idkd"/>
+    <graph id="n15_idkd" name="holderBottom" xy="268,538" size="10,10" group="n14_idkd" type="rect"/>
+    <image id="n13_idkd" name="n13" src="qkjskb" fileName="imagesNew/dikuang_card.png" xy="0,96" group="n14_idkd"/>
+    <component id="n0_py00" name="comSkillCard" src="py009o" fileName="components/ComSkillCard.xml" xy="11,95" pivot="0.5,0.5" group="n14_idkd"/>
+    <component id="n6_om9f" name="ComSkillScore" src="om9f9w" fileName="components/ComSkillScore.xml" xy="322,129" pivot="0.5,0.5" group="n14_idkd"/>
+    <text id="n17_idkd" name="txtName" xy="46,0" size="454,79" group="n21_vols" visible="false" font="ui://eg2y0ldpa0cftks" fontSize="60" color="#fefef6" align="center" ubb="true" autoSize="none" text="月中天"/>
+    <graph id="n16_idkd" name="holderTop" xy="275,512" size="10,10" group="n21_vols" type="rect"/>
+    <image id="n19_vols" name="n19" src="qkjsky" fileName="imagesNew/skill_card_light1.png" xy="404,22" group="n21_vols"/>
+    <image id="n20_vols" name="n20" src="qkjsky" fileName="imagesNew/skill_card_light1.png" xy="0,22" pivot="0.5,0" group="n21_vols" scale="-1,1"/>
+    <group id="n21_vols" name="n21" xy="0,0" size="546,522" group="n14_idkd" visible="false" advanced="true"/>
+    <group id="n14_idkd" name="n14" xy="-267,-67" size="1080,1156"/>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n0_py00" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+    <item time="0" type="Alpha" target="n13_idkd" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+    <item time="0" type="Visible" target="n15_idkd" value="true"/>
+    <item time="0" type="Visible" target="n16_idkd" value="true"/>
+    <item time="0" type="Visible" target="n17_idkd" value="false"/>
+    <item time="0" type="Visible" target="n6_om9f" value="false"/>
+    <item time="0" type="XY" target="n0_py00" tween="true" startValue="-802,0" endValue="11,0" duration="18" ease="Expo.Out"/>
+    <item time="0" type="XY" target="n13_idkd" tween="true" startValue="802,1" endValue="0,1" duration="18" ease="Expo.Out"/>
+    <item time="18" type="Scale" target="n6_om9f" tween="true" startValue="0,0" endValue="1.4,1.4" duration="6" ease="Linear"/>
+    <item time="18" type="Visible" target="n17_idkd" value="true"/>
+    <item time="18" type="Visible" target="n6_om9f" value="true"/>
+    <item time="24" type="Scale" target="n6_om9f" tween="true" startValue="1.4,1.4" endValue="1,1" duration="6" ease="Linear"/>
+    <item time="60" type="Visible" target="n17_idkd" value="true"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Alpha" target="n0_py00" tween="true" startValue="1" endValue="0" duration="18" ease="Linear"/>
+    <item time="0" type="Alpha" target="n13_idkd" tween="true" startValue="1" endValue="0" duration="18" ease="Linear"/>
+    <item time="0" type="Visible" target="n15_idkd" value="false"/>
+    <item time="0" type="Visible" target="n16_idkd" value="false"/>
+    <item time="0" type="Visible" target="n17_idkd" value="false"/>
+    <item time="0" type="Visible" target="n6_om9f" value="false"/>
+    <item time="0" type="XY" target="n0_py00" tween="true" startValue="11,0" endValue="-802,0" duration="18" ease="Expo.In"/>
+    <item time="0" type="XY" target="n13_idkd" tween="true" startValue="0,1" endValue="802,1" duration="18" ease="Expo.In"/>
+  </transition>
+</component>

FGUIProject/assets/Main/package.xml

@@ -643,6 +643,7 @@
     <component id="volsos" name="ComAd.xml" path="/components/"/>
     <component id="volsot" name="ListAdItem.xml" path="/components/"/>
     <component id="volsou" name="ComAdSelectItem.xml" path="/components/"/>
+    <component id="volsov" name="ComTargetSkillShow.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -143,6 +143,7 @@ namespace GFGGame
                     }
                     return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount(), name);
                 case ConstTaskType.UseItem:
+                case ConstTaskType.Suitsynthesis:
                     var cfg = ItemCfgArray.Instance.GetCfg(taskCfg.paramsArr[0]);
                     return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount(), cfg.name);
                 case ConstTaskType.UpgradeCardLvl:

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComTargetCard.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem003.cs

@@ -2,21 +2,22 @@
 
 using FairyGUI;
 
-namespace UI.Main
+namespace UI.CommonGame
 {
-    public partial class UI_ComTargetCard
+    public partial class UI_ComItem003
     {
         public GComponent target;
-        public GLoader m_loaCard;
-        public GTextField m_txtScore;
-        public const string URL = "ui://mfvz4q8kpsphiz";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComTargetCard";
-        private static UI_ComTargetCard _proxy;
+        public UI_ComIcon003 m_comItemIcon;
+        public GTextField m_txtName;
+        public GTextField m_txtCount;
+        public const string URL = "ui://eg2y0ldpvolstnh";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComItem003";
+        private static UI_ComItem003 _proxy;
 
-        public static UI_ComTargetCard Create(GObject gObject = null)
+        public static UI_ComItem003 Create(GObject gObject = null)
         {
-            var ui = new UI_ComTargetCard();
+            var ui = new UI_ComItem003();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +26,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ComTargetCard Proxy(GObject gObject = null)
+        public static UI_ComItem003 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComTargetCard();
+                _proxy = new UI_ComItem003();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -56,13 +57,16 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_loaCard = (GLoader)comp.GetChild("loaCard");
-            m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_comItemIcon = (UI_ComIcon003)UI_ComIcon003.Create(comp.GetChild("comItemIcon"));
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaCard = null;
-            m_txtScore = null;
+            m_comItemIcon.Dispose();
+            m_comItemIcon = null;
+            m_txtName = null;
+            m_txtCount = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComTargetCard.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem003.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d96de092cb5e39e4e8b216fb575a111d
+guid: dd3f87a14b967fd45b529541ea799c45
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ButtonTab1.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_ButtonTab1
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://drx9d1usvolstao";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "ButtonTab1";
+        private static UI_ButtonTab1 _proxy;
+
+        public static UI_ButtonTab1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonTab1();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ButtonTab1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonTab1();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ButtonTab1.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxPreShowUI.cs

@@ -8,8 +8,8 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public Controller m_c1;
-        public GComponent m_btnItem;
-        public GComponent m_btnProb;
+        public UI_ButtonTab1 m_btnItem;
+        public UI_ButtonTab1 m_btnProb;
         public GList m_list;
         public UI_Component1 m_compText;
         public const string URL = "ui://drx9d1usga16e";
@@ -60,15 +60,17 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_btnItem = (GComponent)comp.GetChild("btnItem");
-            m_btnProb = (GComponent)comp.GetChild("btnProb");
+            m_btnItem = (UI_ButtonTab1)UI_ButtonTab1.Create(comp.GetChild("btnItem"));
+            m_btnProb = (UI_ButtonTab1)UI_ButtonTab1.Create(comp.GetChild("btnProb"));
             m_list = (GList)comp.GetChild("list");
             m_compText = (UI_Component1)UI_Component1.Create(comp.GetChild("compText"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_btnItem.Dispose();
             m_btnItem = null;
+            m_btnProb.Dispose();
             m_btnProb = null;
             m_list = null;
             m_compText.Dispose();

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

@@ -0,0 +1,91 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComTargetSkillShow
+    {
+        public GComponent target;
+        public GGraph m_holderBottom;
+        public UI_ComSkillCard m_comSkillCard;
+        public UI_ComSkillScore m_ComSkillScore;
+        public GTextField m_txtName;
+        public GGraph m_holderTop;
+        public Transition m_t0;
+        public Transition m_t1;
+        public const string URL = "ui://mfvz4q8kvolsov";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComTargetSkillShow";
+        private static UI_ComTargetSkillShow _proxy;
+
+        public static UI_ComTargetSkillShow Create(GObject gObject = null)
+        {
+            var ui = new UI_ComTargetSkillShow();
+            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_ComTargetSkillShow Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComTargetSkillShow();
+            }
+            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_holderBottom = (GGraph)comp.GetChild("holderBottom");
+            m_comSkillCard = (UI_ComSkillCard)UI_ComSkillCard.Create(comp.GetChild("comSkillCard"));
+            m_ComSkillScore = (UI_ComSkillScore)UI_ComSkillScore.Create(comp.GetChild("ComSkillScore"));
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_holderTop = (GGraph)comp.GetChild("holderTop");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holderBottom = null;
+            m_comSkillCard.Dispose();
+            m_comSkillCard = null;
+            m_ComSkillScore.Dispose();
+            m_ComSkillScore = null;
+            m_txtName = null;
+            m_holderTop = null;
+            m_t0 = null;
+            m_t1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComTargetSkillShow.cs.meta

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

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

@@ -14,7 +14,7 @@ namespace UI.Main
         public GComponent m_myHead;
         public GComponent m_targetHead;
         public UI_ProgressBarTargetScore m_proScore;
-        public UI_ComTargetCard m_comTargetCard;
+        public UI_ComTargetSkillShow m_comTargetCard;
         public UI_ComDeduction m_comDeduction;
         public Transition m_t1;
         public Transition m_t2;
@@ -72,7 +72,7 @@ namespace UI.Main
             m_myHead = (GComponent)comp.GetChild("myHead");
             m_targetHead = (GComponent)comp.GetChild("targetHead");
             m_proScore = (UI_ProgressBarTargetScore)UI_ProgressBarTargetScore.Create(comp.GetChild("proScore"));
-            m_comTargetCard = (UI_ComTargetCard)UI_ComTargetCard.Create(comp.GetChild("comTargetCard"));
+            m_comTargetCard = (UI_ComTargetSkillShow)UI_ComTargetSkillShow.Create(comp.GetChild("comTargetCard"));
             m_comDeduction = (UI_ComDeduction)UI_ComDeduction.Create(comp.GetChild("comDeduction"));
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -53,7 +53,7 @@ namespace GFGGame
             _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(_activityCfg.paramsArr[0]);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_activityCfg.res);
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hb_" + _activityCfg.res);
             Timers.inst.Add(1, 0, UpdateTime);
         }
         protected override void OnHide()

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

@@ -334,7 +334,8 @@ namespace GFGGame
             if (t_skillScoreSelf > 0)
             {
                 _targetScore += t_skillScoreSelf;
-                _ui.m_comTargetCard.m_txtScore.text = t_skillScoreSelf.ToString();
+                _ui.m_comTargetCard.m_ComSkillScore.m_txtCount.text = t_skillScoreSelf.ToString();
+                _ui.m_comTargetCard.m_comSkillCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardPath(ItemCfgArray.Instance.GetCfg(targetData.cardId).res);
                 _ui.m_t1.timeScale = FightDataManager.Instance.fightSpeed;
                 _ui.m_t1.Play();
             }
@@ -370,7 +371,8 @@ namespace GFGGame
             if (t_skillScoreSelf > 0)
             {
                 _targetSkillScore += t_skillScoreSelf;
-                _ui.m_comTargetCard.m_txtScore.text = t_skillScoreSelf.ToString();
+                _ui.m_comTargetCard.m_comSkillCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardPath(ItemCfgArray.Instance.GetCfg(targetData.cardId).res);
+                _ui.m_comTargetCard.m_ComSkillScore.m_txtCount.text = t_skillScoreSelf.ToString();
                 _ui.m_t1.timeScale = FightDataManager.Instance.fightSpeed;
                 _ui.m_t1.Play();
             }

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

@@ -66,7 +66,7 @@ namespace GFGGame
                 string res = skillCfg.res;
                 if (string.IsNullOrEmpty(skillCfg.res))
                 {
-                    res = "kp_mengying";
+                    res = ItemCfgArray.Instance.GetCfg(skillCfg.cardId).res;
                     ET.Log.Error("技能" + skillCfg.skillId + "  未配资源");
                 }
                 _ui.m_comSkillShow.m_comSkillCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardPath(res);

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -246,7 +246,6 @@ namespace GFGGame
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
             }
-            _adIds.Clear();
             _valueBarController.OnHide();
             Timers.inst.Remove(Update);
             Timers.inst.Remove(CheckGuide);
@@ -836,7 +835,7 @@ namespace GFGGame
         private void UpdateBtnFirstRecharge()
         {
             _ui.m_btnFirstRecharge.target.visible = ActivityDataManager.Instance.firstChargeBonusStatus != ConstBonusStatus.GOT;
-            if(_ui.m_btnFirstRecharge.target.visible)
+            if (_ui.m_btnFirstRecharge.target.visible)
             {
                 bool canget = ActivityDataManager.Instance.firstChargeBonusStatus == ConstBonusStatus.CAN_GET;
                 RedDotController.Instance.SetComRedDot(_ui.m_btnFirstRecharge.target, canget);

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: b24f53d674cdb124aba65f65b7fabe25
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 591f4134b05ced347bc606d8c5909316
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: b038fe94dd528f248b9a962cd84743fc
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

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