背包

FGUIProject/assets/Bag/BagExchangeUI.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="962,1019">
+  <displayList>
+    <component id="n0_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" pkg="eg2y0ldp" xy="0,-11" size="962,1041">
+      <relation target="" sidePair="height-height"/>
+    </component>
+    <text id="n5_si5z" name="txtName" xy="65,58" size="186,61" group="n12_si5z" fontSize="46" color="#8a7253" autoClearText="true" text="物品名字"/>
+    <text id="n6_si5z" name="txtOwned" xy="742,80" pivot="1,0" size="139,41" group="n12_si5z" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
+    <image id="n7_si5z" name="n7" src="si5ztia" fileName="imgnew/tc_xiant.png" xy="56,130" group="n12_si5z"/>
+    <loader id="n8_si5z" name="loaRarity" xy="40,164" size="44,94" group="n12_si5z" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
+    <loader id="n9_si5z" name="loaIcon" xy="165,253" pivot="0.5,0.5" anchor="true" size="200,200" group="n12_si5z" aspect="true" autoSize="true"/>
+    <image id="n10_si5z" name="n10" src="si5ztib" fileName="imgnew/tc_kuangk.png" xy="357,167" group="n12_si5z"/>
+    <text id="n11_si5z" name="txtDesc" xy="375,189" size="506,166" group="n12_si5z" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
+    <group id="n12_si5z" name="n12" xy="40,58" size="866,313"/>
+    <image id="n2_si5z" name="n2" src="si5ztic" fileName="imgnew/tc_zszs.png" xy="32,474" size="897,15" group="n4_si5z"/>
+    <text id="n3_si5z" name="n3" xy="359,452" size="244,54" group="n4_si5z" fontSize="40" color="#8a7253" text="选择使用数量"/>
+    <group id="n4_si5z" name="n4" xy="32,452" size="897,54"/>
+    <image id="n13_si5z" name="n13" src="si5ztik" fileName="images/tc_tyjjdi.png" xy="197,582" group="n19_si5z"/>
+    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="175,580" group="n19_si5z">
+      <Button icon="ui://2bsz6nelsi5ztii"/>
+    </component>
+    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button4.xml" xy="490,581" group="n19_si5z"/>
+    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="597,579" group="n19_si5z">
+      <Button icon="ui://2bsz6nelsi5ztil"/>
+    </component>
+    <text id="n22_si5z" name="txtCostCount" xy="338,587" pivot="0.5,0" size="54,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
+    <group id="n19_si5z" name="n19" xy="175,579" size="612,70"/>
+    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="124,882" group="n20_si5z"/>
+    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="544,882" group="n20_si5z">
+      <Button icon="ui://2bsz6nelsi5ztie"/>
+    </component>
+    <group id="n20_si5z" name="n20" xy="124,882" size="714,89"/>
+    <text id="n24_si5z" name="txtTips" xy="317,700" pivot="0.5,0" size="328,52" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具？"/>
+    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="359,792" pivot="0.5,0" group="n26_si5z"/>
+    <group id="n26_si5z" name="n26" xy="317,700" size="328,138" advanced="true" layout="vt" lineGap="40" excludeInvisibles="true">
+      <relation target="" sidePair="middle-middle"/>
+    </group>
+  </displayList>
+</component>

FGUIProject/assets/Bag/BagUI.xml

@@ -4,7 +4,17 @@
     <loader id="n13_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <list id="n0_lh8v" name="list" xy="65,266" size="949,1433" layout="flow_hz" overflow="scroll" lineGap="-30" colGap="20" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
+    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="79,90" group="n17_si5z">
+      <relation target="" sidePair="right-right,top-top"/>
+    </component>
+    <component id="n6_wet2" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="40,196" group="n17_si5z">
+      <relation target="" sidePair="left-left,top-top"/>
+      <Button icon="ui://eg2y0ldpsi5zti5"/>
+    </component>
+    <image id="n16_si5z" name="n16" src="si5zti3" fileName="images/wpbb_zi.png" xy="189,216" group="n17_si5z"/>
+    <image id="n14_si5z" name="n14" src="si5zti6" fileName="images/wpbb_xtxt.png" xy="54,312" group="n17_si5z"/>
+    <group id="n17_si5z" name="grpTop" xy="40,90" size="986,234"/>
+    <list id="n0_lh8v" name="list" xy="33,390" size="1013,1530" layout="flow_hz" overflow="scroll" lineGap="82" colGap="43" defaultItem="ui://2bsz6nelsi5zti7" autoClearItems="true">
       <relation target="" sidePair="center-center,top-top,bottomext-bottom"/>
       <item/>
       <item/>
@@ -13,11 +23,5 @@
       <item/>
       <item/>
     </list>
-    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90">
-      <relation target="" sidePair="right-right,top-top"/>
-    </component>
-    <component id="n6_wet2" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
-      <relation target="" sidePair="left-left,top-top"/>
-    </component>
   </displayList>
 </component>

FGUIProject/assets/Bag/components/Button1.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="294,89" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n1_si5z" name="icon" xy="0,0" size="294,89" url="ui://2bsz6nelsi5ztif" autoSize="true"/>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Bag/components/Button2.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="69,68" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
+  <displayList>
+    <loader id="n1_si5z" name="icon" xy="0,0" size="68,68" url="ui://2bsz6nelsi5ztii" autoSize="true">
+      <gearIcon controller="c1" pages="0,1" values="ui://2bsz6nelsi5ztii|ui://2bsz6nelsi5ztij"/>
+    </loader>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Bag/components/Button3.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="190,68" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
+  <displayList>
+    <loader id="n1_si5z" name="icon" xy="2,2" size="190,68" url="ui://2bsz6nelsi5ztid" autoSize="true">
+      <gearIcon controller="c1" pages="1" values="ui://2bsz6nelsi5ztid" default="ui://2bsz6nelsi5ztil"/>
+    </loader>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Bag/components/Button4.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="69,68" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
+  <displayList>
+    <loader id="n1_si5z" name="icon" xy="0,0" size="73,72" url="ui://2bsz6nelsi5ztih" autoSize="true">
+      <gearIcon controller="c1" pages="1" values="ui://2bsz6nelsi5ztih" default="ui://2bsz6nelsi5ztig"/>
+    </loader>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Bag/components/ComSelect.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="221,280">
-  <displayList>
-    <image id="n6_ohbx" name="n6" src="ohbx15" fileName="images/gxhd_gd_dik.png" xy="14,-1"/>
-  </displayList>
-</component>

FGUIProject/assets/Bag/components/ListItem.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="221,222">
+  <displayList>
+    <image id="n18_si5z" name="n18" src="si5zti4" fileName="images/wpbb_di.png" xy="0,0"/>
+    <loader id="n19_si5z" name="loaIcon" xy="41,42" size="138,138" aspect="true"/>
+    <text id="n20_si5z" name="txtCount" xy="135,166" pivot="1,0" size="69,49" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#5c4e3f" strokeSize="2" text="x{count=20}"/>
+  </displayList>
+</component>

FGUIProject/assets/Bag/package.xml

@@ -2,8 +2,27 @@
 <packageDescription id="2bsz6nel">
   <resources>
     <component id="ohbxn" name="BagUI.xml" path="/" exported="true"/>
-    <image id="ohbx15" name="gxhd_gd_dik.png" path="/images/" exported="true"/>
-    <component id="ohbxti2" name="ComSelect.xml" path="/components/" exported="true"/>
+    <image id="si5zti3" name="wpbb_zi.png" path="/images/"/>
+    <image id="si5zti4" name="wpbb_di.png" path="/images/"/>
+    <image id="si5zti6" name="wpbb_xtxt.png" path="/images/"/>
+    <component id="si5zti7" name="ListItem.xml" path="/components/"/>
+    <component id="si5zti8" name="BagExchangeUI.xml" path="/" exported="true"/>
+    <image id="si5ztia" name="tc_xiant.png" path="/imgnew/"/>
+    <image id="si5ztib" name="tc_kuangk.png" path="/imgnew/"/>
+    <image id="si5ztic" name="tc_zszs.png" path="/imgnew/" scale="9grid" scale9grid="374,2,104,6"/>
+    <image id="si5ztid" name="tc_tyzd_2.png" path="/images/"/>
+    <image id="si5ztie" name="tc_anniu_qd.png" path="/images/"/>
+    <image id="si5ztif" name="tc_anniu_qx.png" path="/images/"/>
+    <image id="si5ztig" name="tc_tyjia_1.png" path="/images/"/>
+    <image id="si5ztih" name="tc_tyjia_2.png" path="/images/"/>
+    <image id="si5ztii" name="tc_tyjian_1.png" path="/images/"/>
+    <image id="si5ztij" name="tc_tyjian_2.png" path="/images/"/>
+    <image id="si5ztik" name="tc_tyjjdi.png" path="/images/"/>
+    <image id="si5ztil" name="tc_tyzd_1.png" path="/images/"/>
+    <component id="si5ztim" name="Button1.xml" path="/components/"/>
+    <component id="si5ztin" name="Button2.xml" path="/components/"/>
+    <component id="si5ztio" name="Button3.xml" path="/components/"/>
+    <component id="si5ztip" name="Button4.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Bag" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/ComTipsApproach.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="886,394">
-  <displayList>
-    <image id="n19_ohbx" name="n19" src="lwri5x" fileName="images/hc_btkuang_1.png" xy="185,1" group="n21_ohbx"/>
-    <text id="n20_ohbx" name="n20" xy="369,0" size="148,49" group="n21_ohbx" fontSize="36" color="#f9e4c2" text="获取途径"/>
-    <group id="n21_ohbx" name="n21" xy="185,0" size="516,56"/>
-    <list id="n18_ohbx" name="list" xy="0,107" size="886,287" overflow="scroll" lineGap="15" defaultItem="ui://eg2y0ldpohbxti7">
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <text id="n24_ohbx" name="txtNone" xy="333,156" size="220,49" fontSize="36" color="#f9e4c2" text="暂无获取途径"/>
-  </displayList>
-</component>

FGUIProject/assets/CommonGame/GoodsItemTips.xml

@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,1054">
+<component size="962,1146">
   <displayList>
-    <image id="n0_s2cc" name="n0" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,1054">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="60,15" group="n17_ohbx"/>
-    <component id="n16_ohbx" name="comTipsScores" src="ohbxti4" fileName="components/ComTipsScores.xml" xy="29,287" group="n17_ohbx"/>
-    <component id="n5_s2cc" name="comTipsDesc" src="ohbxti5" fileName="components/ComTipsDesc.xml" xy="43,382" group="n17_ohbx"/>
-    <component id="n19_ohbx" name="comTipsApproach" src="ohbxti6" fileName="ComTipsApproach.xml" xy="25,593" group="n17_ohbx"/>
-    <group id="n17_ohbx" name="grpTips" xy="25,15" size="886,940" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
+    <component id="n21_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" xy="0,0" size="962,1146">
+      <relation target="" sidePair="height-height"/>
+    </component>
+    <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="0,15" group="n17_ohbx"/>
+    <component id="n19_ohbx" name="comTipsApproach" src="ohbxti6" fileName="ComTipsApproach.xml" xy="0,525" group="n17_ohbx"/>
+    <group id="n17_ohbx" name="grpTips" xy="0,15" size="962,1126" advanced="true" layout="vt" excludeInvisibles="true"/>
   </displayList>
   <relation target="n17_ohbx" sidePair="height-height"/>
 </component>

FGUIProject/assets/CommonGame/components/ButtonApproach.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="450,70" extention="Button">
+<component size="202,71" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_lwri" name="bg" src="lwri5v" fileName="imagesExport/hc_anniu_2.png" xy="0,0" size="450,70">
+    <image id="n0_lwri" name="bg" src="si5ztib" fileName="imgnew/tc_qianwang.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_lwri" name="title" xy="191,13" pivot="0.5,0" size="68,44" fontSize="32" color="#926651" align="center" vAlign="middle" singleLine="true" autoClearText="true" text="示例">
+    <text id="n1_lwri" name="title" xy="67,13" pivot="0.5,0" size="68,44" visible="false" fontSize="32" color="#926651" align="center" vAlign="middle" singleLine="true" autoClearText="true" text="示例">
       <relation target="" sidePair="center-center"/>
     </text>
   </displayList>

FGUIProject/assets/CommonGame/components/ButtonBack1.xml

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="92,95" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_9xlo" src="9xlo2" name="n0" xy="0,0">
-      <relation target="" sidePair="width,height"/>
-    </image>
+    <loader id="n1_si5z" name="icon" xy="46,47" pivot="0.5,0.5" anchor="true" size="92,95" url="ui://eg2y0ldp9xlo2" autoSize="true"/>
   </displayList>
+  <Button/>
 </component>

FGUIProject/assets/CommonGame/components/ComBg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="962,1133" overflow="hidden">
+  <displayList>
+    <image id="n20_si5z" name="n20" src="si5ztid" fileName="imgnew/tc_tydikua_1.png" xy="0,5"/>
+    <image id="n21_si5z" name="n21" src="si5ztie" fileName="imgnew/tc_tydikua_3.png" xy="0,0"/>
+    <image id="n22_si5z" name="n22" src="si5ztif" fileName="imgnew/tc_tydikua_52.png" xy="0,1119">
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/components/ComCostCurrency.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="285,42">
+<component size="243,46">
   <displayList>
-    <image id="n4_a713" name="n4" src="a71377" fileName="imagesExport/kp_dikuang_3.png" xy="60,3"/>
-    <text id="n2_ojlz" name="n2" xy="0,0" size="65,42" fontSize="30" color="#7d634a" autoSize="none" text="消耗"/>
-    <loader id="n1_ojlz" name="loaIcon" xy="70,-9" size="60,60" url="ui://eg2y0ldpq08x3" autoSize="true"/>
-    <text id="n6_j5a5" name="txtNeed" xy="165,1" pivot="0.5,0" size="73,39" fontSize="28" color="#ffffff" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9993"/>
+    <text id="n2_ojlz" name="n2" xy="0,0" size="76,46" group="n7_si5z" fontSize="34" color="#8e7c6b" autoSize="none" text="消耗"/>
+    <loader id="n1_ojlz" name="loaIcon" xy="91,-2" size="50,50" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
+    <text id="n6_j5a5" name="txtNeed" xy="156,0" size="87,46" group="n7_si5z" fontSize="34" color="#8e7c6b" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999"/>
+    <group id="n7_si5z" name="n7" xy="0,-2" size="243,50" advanced="true" layout="hz" colGap="15" excludeInvisibles="true"/>
   </displayList>
+  <relation target="n7_si5z" sidePair="width-width"/>
 </component>

FGUIProject/assets/CommonGame/components/ComTipsApproach.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="962,616">
+  <displayList>
+    <image id="n25_si5z" name="n25" src="si5zti8" fileName="imgnew/tc_zszs.png" xy="68,22" group="n21_ohbx"/>
+    <text id="n20_ohbx" name="n20" xy="399,0" size="164,54" group="n21_ohbx" fontSize="40" color="#8a7253" text="获取途径"/>
+    <group id="n21_ohbx" name="n21" xy="68,0" size="825,54"/>
+    <list id="n18_ohbx" name="list" xy="47,80" size="867,486" overflow="scroll" lineGap="20" defaultItem="ui://eg2y0ldpohbxti7">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <text id="n24_ohbx" name="txtNone" xy="350,833" size="220,49" fontSize="36" color="#f9e4c2" text="暂无获取途径"/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/components/ComTipsBase.xml

@@ -1,9 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="846,242">
+<component size="962,510">
   <displayList>
-    <component id="n2_s2cc" name="goodsItem" src="j48o98" fileName="components/ComItem.xml" xy="0,43" size="216,199"/>
-    <text id="n1_s2cc" name="txtName" xy="274,59" size="186,61" fontSize="46" color="#8d754e" autoClearText="true" text="物品名字"/>
-    <text id="n3_s2cc" name="txtOwned" xy="280,153" size="136,46" fontSize="34" color="#a38e66" vars="true" text="已拥有:{count=0}"/>
-    <loader id="n6_ohbx" name="rarity" xy="802,0" size="44,94" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
+    <text id="n1_s2cc" name="txtName" xy="65,50" size="186,61" fontSize="46" color="#8a7253" autoClearText="true" text="物品名字"/>
+    <text id="n3_s2cc" name="txtOwned" xy="742,72" pivot="1,0" size="139,42" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
+    <image id="n7_si5z" name="n7" src="si5ztig" fileName="imgnew/tc_xiant.png" xy="56,122"/>
+    <loader id="n6_ohbx" name="loaRarity" xy="249,156" size="44,94" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
+    <loader id="n8_si5z" name="loaIcon" xy="165,245" pivot="0.5,0.5" anchor="true" size="200,200" aspect="true" autoSize="true"/>
+    <image id="n10_si5z" name="n10" src="si5ztia" fileName="imgnew/tc_kuangk.png" xy="357,159"/>
+    <text id="n9_si5z" name="txtDesc" xy="375,181" size="506,166" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
+    <image id="n11_si5z" name="n11" src="842s6h" fileName="imagesExport/kp_sx_1.png" xy="75,420" size="50,50" group="n19_si5z"/>
+    <image id="n12_si5z" name="n12" src="842s6i" fileName="imagesExport/kp_sx_2.png" xy="300,420" size="50,50" group="n19_si5z"/>
+    <image id="n13_si5z" name="n13" src="842s6j" fileName="imagesExport/kp_sx_3.png" xy="525,420" size="50,50" group="n19_si5z"/>
+    <image id="n14_si5z" name="n14" src="842s6k" fileName="imagesExport/kp_sx_4.png" xy="750,420" size="50,50" group="n19_si5z"/>
+    <text id="n15_si5z" name="txtGong" xy="135,424" size="77,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n16_si5z" name="txtShang" xy="360,424" size="77,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n17_si5z" name="txtJue" xy="585,424" size="77,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n18_si5z" name="txtZhi" xy="810,424" size="77,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <group id="n19_si5z" name="grpScore" xy="75,420" size="812,50" advanced="true"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/components/ComTipsDesc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="850,181" overflow="scroll">
-  <displayList>
-    <image id="n6_ohbx" name="n6" src="s2cc4h" fileName="imagesExport/zx_tsk_xian.png" xy="1,0"/>
-    <text id="n5_s2cc" name="txtDesc" xy="17,25" size="815,133" fontSize="34" color="#9f8e70" ubb="true" autoSize="height" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
-  </displayList>
-</component>

FGUIProject/assets/CommonGame/components/ComTipsScores.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="878,65">
-  <displayList>
-    <graph id="n16_ohbx" name="n16" xy="0,0" size="878,65" type="rect" lineSize="0" fillColor="#ffe9dcce"/>
-    <image id="n7_ohbx" name="n7" src="842s6h" fileName="imagesExport/kp_sx_1.png" xy="54,7" size="50,50" group="n15_ohbx"/>
-    <image id="n8_ohbx" name="n8" src="842s6i" fileName="imagesExport/kp_sx_2.png" xy="258,7" size="50,50" group="n15_ohbx"/>
-    <image id="n9_ohbx" name="n9" src="842s6j" fileName="imagesExport/kp_sx_3.png" xy="462,7" size="50,50" group="n15_ohbx"/>
-    <image id="n10_ohbx" name="n10" src="842s6k" fileName="imagesExport/kp_sx_4.png" xy="666,7" size="50,50" group="n15_ohbx"/>
-    <text id="n11_ohbx" name="txtGong" xy="125,7" size="87,46" group="n15_ohbx" fontSize="34" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n12_ohbx" name="txtShang" xy="329,7" size="87,46" group="n15_ohbx" fontSize="34" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n13_ohbx" name="txtJue" xy="533,7" size="87,46" group="n15_ohbx" fontSize="34" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n14_ohbx" name="txtZhi" xy="737,8" size="87,46" group="n15_ohbx" fontSize="34" color="#aa865f" autoClearText="true" text="5000"/>
-    <group id="n15_ohbx" name="n15" xy="54,7" size="770,50"/>
-  </displayList>
-</component>

FGUIProject/assets/CommonGame/components/ListSourceItem.xml

@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="860,70">
+<component size="866,149">
   <displayList>
-    <text id="n22_ohbx" name="txtSourceName" xy="40,12" size="196,44" fontSize="32" color="#926651" vAlign="middle" singleLine="true" autoClearText="true" text="示例巴拉巴拉"/>
-    <component id="n23_ohbx" name="btnGo" src="lwri5y" fileName="components/ButtonApproach.xml" xy="662,0" size="198,70">
+    <image id="n25_si5z" name="n25" src="si5zti9" fileName="imgnew/tc_fzfjk.png" xy="0,0"/>
+    <text id="n22_ohbx" name="txtSourceName" xy="212,48" size="230,52" fontSize="38" color="#9e7c50" vAlign="middle" singleLine="true" autoClearText="true" text="示例巴拉巴拉"/>
+    <component id="n23_ohbx" name="btnGo" src="lwri5y" fileName="components/ButtonApproach.xml" xy="640,39" size="198,70">
       <Button title="前往"/>
     </component>
+    <image id="n24_si5z" name="n24" src="si5ztic" fileName="imgnew/tc_txbiao.png" xy="56,15" group="n27_si5z"/>
+    <loader id="n26_si5z" name="loaIcon" xy="61,20" size="103,103" group="n27_si5z" aspect="true" url="ui://eg2y0ldpsi5ztii" fill="scale"/>
+    <group id="n27_si5z" name="n27" xy="56,15" size="113,113"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -194,10 +194,20 @@
     <image id="q08xs" name="hz_xzkuang.png" path="/imagesExport/" exported="true"/>
     <component id="lh8v7" name="RewardPreviewUI.xml" path="/" exported="true"/>
     <component id="ohbxti3" name="ComTipsBase.xml" path="/components/"/>
-    <component id="ohbxti4" name="ComTipsScores.xml" path="/components/"/>
-    <component id="ohbxti5" name="ComTipsDesc.xml" path="/components/"/>
-    <component id="ohbxti6" name="ComTipsApproach.xml" path="/"/>
+    <component id="ohbxti6" name="ComTipsApproach.xml" path="/components/"/>
     <component id="ohbxti7" name="ListSourceItem.xml" path="/components/"/>
+    <image id="si5zti5" name="wpbb_fh.png" path="/imagesExport/" exported="true"/>
+    <image id="si5zti8" name="tc_zszs.png" path="/imgnew/"/>
+    <image id="si5zti9" name="tc_fzfjk.png" path="/imgnew/"/>
+    <image id="si5ztia" name="tc_kuangk.png" path="/imgnew/"/>
+    <image id="si5ztib" name="tc_qianwang.png" path="/imgnew/"/>
+    <image id="si5ztic" name="tc_txbiao.png" path="/imgnew/"/>
+    <image id="si5ztid" name="tc_tydikua_1.png" path="/imgnew/"/>
+    <image id="si5ztie" name="tc_tydikua_3.png" path="/imgnew/"/>
+    <image id="si5ztif" name="tc_tydikua_52.png" path="/imgnew/"/>
+    <image id="si5ztig" name="tc_xiant.png" path="/imgnew/"/>
+    <component id="si5ztih" name="ComBg.xml" path="/components/" exported="true"/>
+    <image id="si5ztii" name="tc_txbiao_1.png" path="/imgnew/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/MainUI.xml

@@ -44,7 +44,7 @@
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="bottom-bottom"/>
     </image>
-    <list id="n41_wg7t" name="list" xy="148,1760" size="994,99" layout="row" overflow="scroll" scroll="horizontal" colGap="14" foldInvisibleItems="true">
+    <list id="n41_wg7t" name="list" xy="148,1760" size="932,99" layout="row" overflow="scroll" scroll="horizontal" colGap="14" foldInvisibleItems="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="bottom-bottom"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnGongGao"/>

GameClient/Assets/Editor/Excel/Scanner/ShopScanner.cs

@@ -15,7 +15,6 @@ namespace GFGEditor
 
         public static void StartScan()
         {
-
             WriteClothingShop();
             WriteCJShop();
             WriteCJAShop();

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

@@ -42,7 +42,7 @@ namespace GFGGame
             {
                 ItemCfg itemCfgA = ItemCfgArray.Instance.GetCfg(a.id);
                 ItemCfg itemCfgB = ItemCfgArray.Instance.GetCfg(b.id);
-                if (itemCfgB.useType > itemCfgA.useType)
+                if (itemCfgB.subType > itemCfgA.subType)
                 {
                     return -1;
                 }

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

@@ -50,7 +50,7 @@ namespace GFGGame
                     if (listSceneData.IndexOf(itemID) < 0) listSceneData.Add(itemID);
                 }
             }
-            else if (itemCfg.itemType == ConstItemType.ITEM)
+            else if (itemCfg.itemType == ConstItemType.PHOTOGRAPH)
             {
                 if (itemCfg.subType == ConstItemSubType.NPC)
                 {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_BagExchangeUI.cs

@@ -0,0 +1,113 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Bag
+{
+    public partial class UI_BagExchangeUI
+    {
+        public GComponent target;
+        public GComponent m_comBg;
+        public GTextField m_txtName;
+        public GTextField m_txtOwned;
+        public GLoader m_loaRarity;
+        public GLoader m_loaIcon;
+        public GTextField m_txtDesc;
+        public UI_Button2 m_btnMinus;
+        public UI_Button4 m_btnAdd;
+        public UI_Button3 m_btnMax;
+        public GTextField m_txtCostCount;
+        public GButton m_btnCancle;
+        public GButton m_btnConfirm;
+        public GTextField m_txtTips;
+        public GComponent m_comCost;
+        public const string URL = "ui://2bsz6nelsi5zti8";
+        public const string PACKAGE_NAME = "Bag";
+        public const string RES_NAME = "BagExchangeUI";
+        private static UI_BagExchangeUI _proxy;
+
+        public static UI_BagExchangeUI Create(GObject gObject = null)
+        {
+            var ui = new UI_BagExchangeUI();
+            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_BagExchangeUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BagExchangeUI();
+            }
+            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_comBg = (GComponent)comp.GetChild("comBg");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
+            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_btnMinus = (UI_Button2)UI_Button2.Create(comp.GetChild("btnMinus"));
+            m_btnAdd = (UI_Button4)UI_Button4.Create(comp.GetChild("btnAdd"));
+            m_btnMax = (UI_Button3)UI_Button3.Create(comp.GetChild("btnMax"));
+            m_txtCostCount = (GTextField)comp.GetChild("txtCostCount");
+            m_btnCancle = (GButton)comp.GetChild("btnCancle");
+            m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_comCost = (GComponent)comp.GetChild("comCost");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comBg = null;
+            m_txtName = null;
+            m_txtOwned = null;
+            m_loaRarity = null;
+            m_loaIcon = null;
+            m_txtDesc = null;
+            m_btnMinus.Dispose();
+            m_btnMinus = null;
+            m_btnAdd.Dispose();
+            m_btnAdd = null;
+            m_btnMax.Dispose();
+            m_btnMax = null;
+            m_txtCostCount = null;
+            m_btnCancle = null;
+            m_btnConfirm = null;
+            m_txtTips = null;
+            m_comCost = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsDesc.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_BagExchangeUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c5e44eae58bab3e419c8f526492e4efc
+guid: 334db0b6c99615349b0303a89993d2ef
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_BagUI.cs

@@ -8,9 +8,9 @@ namespace UI.Bag
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GList m_list;
         public GComponent m_comValueBar;
         public GButton m_btnback;
+        public GList m_list;
         public const string URL = "ui://2bsz6nelohbxn";
         public const string PACKAGE_NAME = "Bag";
         public const string RES_NAME = "BagUI";
@@ -59,16 +59,16 @@ namespace UI.Bag
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_list = (GList)comp.GetChild("list");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnback = (GButton)comp.GetChild("btnback");
+            m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_list = null;
             m_comValueBar = null;
             m_btnback = null;
+            m_list = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_Button2.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Bag
+{
+    public partial class UI_Button2
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://2bsz6nelsi5ztin";
+        public const string PACKAGE_NAME = "Bag";
+        public const string RES_NAME = "Button2";
+        private static UI_Button2 _proxy;
+
+        public static UI_Button2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button2();
+            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_Button2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button2();
+            }
+            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/CommonGame/UI_ComTipsScores.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_Button2.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 394fba6aaa1f04241b063793cfc3539f
+guid: e3bea0b0716fd0641893f728ceb4008e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_Button3.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Bag
+{
+    public partial class UI_Button3
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://2bsz6nelsi5ztio";
+        public const string PACKAGE_NAME = "Bag";
+        public const string RES_NAME = "Button3";
+        private static UI_Button3 _proxy;
+
+        public static UI_Button3 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button3();
+            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_Button3 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button3();
+            }
+            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/Bag/UI_Button3.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_Button4.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Bag
+{
+    public partial class UI_Button4
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://2bsz6nelsi5ztip";
+        public const string PACKAGE_NAME = "Bag";
+        public const string RES_NAME = "Button4";
+        private static UI_Button4 _proxy;
+
+        public static UI_Button4 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button4();
+            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_Button4 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button4();
+            }
+            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/Bag/UI_Button4.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsDesc.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_ListItem.cs

@@ -2,20 +2,21 @@
 
 using FairyGUI;
 
-namespace UI.CommonGame
+namespace UI.Bag
 {
-    public partial class UI_ComTipsDesc
+    public partial class UI_ListItem
     {
         public GComponent target;
-        public GTextField m_txtDesc;
-        public const string URL = "ui://eg2y0ldpohbxti5";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComTipsDesc";
-        private static UI_ComTipsDesc _proxy;
+        public GLoader m_loaIcon;
+        public GTextField m_txtCount;
+        public const string URL = "ui://2bsz6nelsi5zti7";
+        public const string PACKAGE_NAME = "Bag";
+        public const string RES_NAME = "ListItem";
+        private static UI_ListItem _proxy;
 
-        public static UI_ComTipsDesc Create(GObject gObject = null)
+        public static UI_ListItem Create(GObject gObject = null)
         {
-            var ui = new UI_ComTipsDesc();
+            var ui = new UI_ListItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +25,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComTipsDesc Proxy(GObject gObject = null)
+        public static UI_ListItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComTipsDesc();
+                _proxy = new UI_ListItem();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,11 +56,13 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtDesc = null;
+            m_loaIcon = null;
+            m_txtCount = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_ListItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsBase.cs

@@ -7,10 +7,16 @@ namespace UI.CommonGame
     public partial class UI_ComTipsBase
     {
         public GComponent target;
-        public UI_ComItem m_goodsItem;
         public GTextField m_txtName;
         public GTextField m_txtOwned;
-        public GLoader m_rarity;
+        public GLoader m_loaRarity;
+        public GLoader m_loaIcon;
+        public GTextField m_txtDesc;
+        public GTextField m_txtGong;
+        public GTextField m_txtShang;
+        public GTextField m_txtJue;
+        public GTextField m_txtZhi;
+        public GGroup m_grpScore;
         public const string URL = "ui://eg2y0ldpohbxti3";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComTipsBase";
@@ -58,18 +64,29 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_goodsItem = (UI_ComItem)UI_ComItem.Create(comp.GetChild("goodsItem"));
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
-            m_rarity = (GLoader)comp.GetChild("rarity");
+            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_txtGong = (GTextField)comp.GetChild("txtGong");
+            m_txtShang = (GTextField)comp.GetChild("txtShang");
+            m_txtJue = (GTextField)comp.GetChild("txtJue");
+            m_txtZhi = (GTextField)comp.GetChild("txtZhi");
+            m_grpScore = (GGroup)comp.GetChild("grpScore");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_goodsItem.Dispose();
-            m_goodsItem = null;
             m_txtName = null;
             m_txtOwned = null;
-            m_rarity = null;
+            m_loaRarity = null;
+            m_loaIcon = null;
+            m_txtDesc = null;
+            m_txtGong = null;
+            m_txtShang = null;
+            m_txtJue = null;
+            m_txtZhi = null;
+            m_grpScore = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsScores.cs

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_ComTipsScores
-    {
-        public GComponent target;
-        public GTextField m_txtGong;
-        public GTextField m_txtShang;
-        public GTextField m_txtJue;
-        public GTextField m_txtZhi;
-        public const string URL = "ui://eg2y0ldpohbxti4";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComTipsScores";
-        private static UI_ComTipsScores _proxy;
-
-        public static UI_ComTipsScores Create(GObject gObject = null)
-        {
-            var ui = new UI_ComTipsScores();
-            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_ComTipsScores Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComTipsScores();
-            }
-            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_txtGong = (GTextField)comp.GetChild("txtGong");
-            m_txtShang = (GTextField)comp.GetChild("txtShang");
-            m_txtJue = (GTextField)comp.GetChild("txtJue");
-            m_txtZhi = (GTextField)comp.GetChild("txtZhi");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_txtGong = null;
-            m_txtShang = null;
-            m_txtJue = null;
-            m_txtZhi = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GoodsItemTips.cs

@@ -7,9 +7,8 @@ namespace UI.CommonGame
     public partial class UI_GoodsItemTips
     {
         public GComponent target;
+        public GComponent m_comBg;
         public UI_ComTipsBase m_comTipsBase;
-        public UI_ComTipsScores m_comTipsScores;
-        public UI_ComTipsDesc m_comTipsDesc;
         public UI_ComTipsApproach m_comTipsApproach;
         public GGroup m_grpTips;
         public const string URL = "ui://eg2y0ldps2cc4g";
@@ -59,20 +58,16 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
+            m_comBg = (GComponent)comp.GetChild("comBg");
             m_comTipsBase = (UI_ComTipsBase)UI_ComTipsBase.Create(comp.GetChild("comTipsBase"));
-            m_comTipsScores = (UI_ComTipsScores)UI_ComTipsScores.Create(comp.GetChild("comTipsScores"));
-            m_comTipsDesc = (UI_ComTipsDesc)UI_ComTipsDesc.Create(comp.GetChild("comTipsDesc"));
             m_comTipsApproach = (UI_ComTipsApproach)UI_ComTipsApproach.Create(comp.GetChild("comTipsApproach"));
             m_grpTips = (GGroup)comp.GetChild("grpTips");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_comBg = null;
             m_comTipsBase.Dispose();
             m_comTipsBase = null;
-            m_comTipsScores.Dispose();
-            m_comTipsScores = null;
-            m_comTipsDesc.Dispose();
-            m_comTipsDesc = null;
             m_comTipsApproach.Dispose();
             m_comTipsApproach = null;
             m_grpTips = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListSourceItem.cs

@@ -9,6 +9,7 @@ namespace UI.CommonGame
         public GComponent target;
         public GTextField m_txtSourceName;
         public UI_ButtonApproach m_btnGo;
+        public GLoader m_loaIcon;
         public const string URL = "ui://eg2y0ldpohbxti7";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ListSourceItem";
@@ -58,12 +59,14 @@ namespace UI.CommonGame
         {
             m_txtSourceName = (GTextField)comp.GetChild("txtSourceName");
             m_btnGo = (UI_ButtonApproach)UI_ButtonApproach.Create(comp.GetChild("btnGo"));
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_txtSourceName = null;
             m_btnGo.Dispose();
             m_btnGo = null;
+            m_loaIcon = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/Bag/BagExchangeView.cs

@@ -0,0 +1,124 @@
+
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.Bag;
+using UI.CommonGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class BagExchangeView : BaseWindow
+    {
+        private UI_BagExchangeUI _ui;
+        private int _itemId;
+        private int _count;
+        public override void Dispose()
+        {
+            base.Dispose();
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+
+            packageName = UI_BagExchangeUI.PACKAGE_NAME;
+            _ui = UI_BagExchangeUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_btnAdd.target.onClick.Add(OnBtnAddClick);
+            _ui.m_btnMinus.target.onClick.Add(OnBtnMinusClick);
+            _ui.m_btnMax.target.onClick.Add(OnBtnMaxClick);
+            _ui.m_btnConfirm.onClick.Add(OnBtnConfirmClick);
+            _ui.m_btnCancle.onClick.Add(OnBtnCancleClick);
+
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _itemId = (int)this.viewData;
+            _count = 1;
+
+            UpdateView();
+            UpdateUseView();
+        }
+
+        protected override void OnHide()
+        {
+
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            // EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateList);
+        }
+
+        private void UpdateView()
+        {
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemId);
+            _ui.m_txtName.text = itemCfg.name;
+            _ui.m_txtOwned.SetVar("count", "" + ItemDataManager.GetItemNum(itemCfg.id)).FlushVars();
+            _ui.m_txtDesc.text = string.IsNullOrEmpty(itemCfg.desc) ? "暂无描述" : itemCfg.desc;
+            _ui.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            RarityIconController.UpdateRarityIcon(_ui.m_loaRarity, itemCfg.id, false);
+            _ui.m_loaRarity.visible = itemCfg.itemType == ConstItemType.DRESS_UP;
+            _ui.m_comCost.visible = false;
+        }
+
+        private void UpdateUseView()
+        {
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemId);
+            _ui.m_txtCostCount.text = _count.ToString();
+            _ui.m_btnMinus.m_c1.selectedIndex = _count == 1 ? 1 : 0;
+            _ui.m_btnMinus.target.touchable = _count == 1 ? false : true;
+            int hasCount = ItemDataManager.GetItemNum(_itemId);
+            _ui.m_btnAdd.m_c1.selectedIndex = _count == hasCount ? 1 : 0;
+            _ui.m_btnAdd.target.touchable = _count == hasCount ? false : true;
+            _ui.m_btnMax.m_c1.selectedIndex = _count == hasCount ? 1 : 0;
+            _ui.m_btnMax.target.touchable = _count == hasCount ? false : true;
+
+            _ui.m_txtTips.text = string.Format("是否使用{0}个{1}", _count, itemCfg.name);
+        }
+
+        private void OnBtnAddClick()
+        {
+            _count++;
+            int hasCount = ItemDataManager.GetItemNum(_itemId);
+            _count = Math.Min(hasCount, _count);
+            UpdateUseView();
+        }
+        private void OnBtnMinusClick()
+        {
+            _count--;
+            _count = Math.Max(1, _count);
+            UpdateUseView();
+        }
+        private void OnBtnMaxClick()
+        {
+            _count = ItemDataManager.GetItemNum(_itemId);
+            UpdateUseView();
+        }
+        private void OnBtnConfirmClick()
+        {
+
+        }
+        private void OnBtnCancleClick()
+        {
+            this.Hide();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/Bag/BagExchangeView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Bag/BagView.cs

@@ -12,7 +12,6 @@ namespace GFGGame
     {
         private UI_BagUI _ui;
         private ValueBarController _valueBarController;
-        private GComponent _imgSelected;
         private List<ItemView> _listItemViews = new List<ItemView>();
         private int _curItemId = -1;
         public override void Dispose()
@@ -29,11 +28,6 @@ namespace GFGGame
                 _listItemViews[i] = null;
             }
 
-            if (_imgSelected != null)
-            {
-                _imgSelected.RemoveFromParent();
-                _imgSelected.Dispose();
-            }
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -56,10 +50,8 @@ namespace GFGGame
             _ui.m_list.itemRenderer = ListItemRender;
             _ui.m_list.onClickItem.Add(OnListItemClick);
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("mrqd_bjbj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tc_bjbj");
 
-            _imgSelected = new GComponent();
-            _imgSelected = UIPackage.CreateObject(UI_BagUI.PACKAGE_NAME, "ComSelect").asCom;
         }
         protected override void AddEventListener()
         {
@@ -95,7 +87,6 @@ namespace GFGGame
                 _ui.m_list.selectedIndex = index;
                 int childIndex = _ui.m_list.ItemIndexToChildIndex(index);
                 GComponent comItem = _ui.m_list.GetChildAt(childIndex).asCom;
-                ChangeSelect(comItem);
             }
         }
 
@@ -119,16 +110,11 @@ namespace GFGGame
             GComponent comItem = (context.data as GComponent);
             ItemView itemData = comItem.data as ItemView;
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.ItemData.id);
-            if (itemCfg.useType == 0)
+            if (itemCfg.subType == 0)
             {
                 object[] sourceDatas = new object[] { itemCfg.id, new object[] { typeof(BagView).FullName, this.viewData } };
                 GoodsItemTipsController.ShowItemTips(itemCfg.id, sourceDatas);
             }
-            ChangeSelect(comItem);
-        }
-        private void ChangeSelect(GComponent comItem)
-        {
-            comItem.AddChildAt(_imgSelected, 0);
         }
 
         private void OnBtnBackClick()

GameClient/Assets/Game/HotUpdate/Views/CommonGame/GoodsItemTipsView.cs

@@ -46,7 +46,6 @@ namespace GFGGame
 
             UpdateBase();
             UpdateScore();
-            _ui.m_comTipsDesc.m_txtDesc.text = string.IsNullOrEmpty(itemCfg.desc) ? "暂无描述" : itemCfg.desc;
             UpdateSourec(sourceDatas);
         }
         protected override void OnHide()
@@ -65,30 +64,24 @@ namespace GFGGame
 
         private void UpdateBase()
         {
-            _ui.m_comTipsBase.m_txtOwned.SetVar("count", "" + ItemDataManager.GetItemNum(itemCfg.id)).FlushVars();
             _ui.m_comTipsBase.m_txtName.text = itemCfg.name;
+            _ui.m_comTipsBase.m_txtOwned.SetVar("count", "" + ItemDataManager.GetItemNum(itemCfg.id)).FlushVars();
+            _ui.m_comTipsBase.m_txtDesc.text = string.IsNullOrEmpty(itemCfg.desc) ? "暂无描述" : itemCfg.desc;
+            _ui.m_comTipsBase.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            RarityIconController.UpdateRarityIcon(_ui.m_comTipsBase.m_loaRarity, itemCfg.id, false);
 
-            if (itemView == null)
-            {
-                itemView = new ItemView(_ui.m_comTipsBase.m_goodsItem.target);
-            }
-            ItemData itemData = ItemUtil.createItemData(new int[] { itemCfg.id, 1 });
-            itemView.SetData(itemData);
-            itemView.ShowCount = false;
-            itemView.ShowTips = false;
-            itemView.ShowRarity = false;
 
         }
         private void UpdateScore()
         {
             bool isDressUp = itemCfg.itemType == ConstItemType.DRESS_UP;
-            _ui.m_comTipsBase.m_rarity.visible = isDressUp;
-            _ui.m_comTipsScores.target.visible = isDressUp;
+            _ui.m_comTipsBase.m_loaRarity.visible = isDressUp;
+            _ui.m_comTipsBase.m_grpScore.visible = isDressUp;
             if (!isDressUp) return;
-            _ui.m_comTipsScores.m_txtGong.text = "" + itemCfg.score1;
-            _ui.m_comTipsScores.m_txtShang.text = "" + itemCfg.score2;
-            _ui.m_comTipsScores.m_txtJue.text = "" + itemCfg.score3;
-            _ui.m_comTipsScores.m_txtZhi.text = "" + itemCfg.score4;
+            _ui.m_comTipsBase.m_txtGong.text = "" + itemCfg.score1;
+            _ui.m_comTipsBase.m_txtShang.text = "" + itemCfg.score2;
+            _ui.m_comTipsBase.m_txtJue.text = "" + itemCfg.score3;
+            _ui.m_comTipsBase.m_txtZhi.text = "" + itemCfg.score4;
         }
         private void UpdateSourec(object[] sourceDatas)
         {

GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: a711b21060dc27145b471fda8ae96b4f
+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/CommonGame/CommonGame_atlas0_1.png.meta

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