zhaoyang 3 years ago
parent
commit
b394a37e02

+ 3 - 3
FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -2,7 +2,7 @@
 <component size="1080,1709" overflow="hidden" opaque="false">
   <controller name="ctrlFullStar" pages="0,,1," selected="0"/>
   <controller name="ctrlFullLv" pages="0,,1," selected="0"/>
-  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="1"/>
+  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="0"/>
   <displayList>
     <image id="n70_lc71" name="n70" src="842s6e" fileName="images/kp_bj_2.png" xy="0,209"/>
     <component id="n67_lc71" name="btnStory" src="ojlzl" fileName="components/btnStory.xml" xy="791,621"/>
@@ -13,11 +13,11 @@
     <group id="n30_842s" name="grpName" xy="13,902" size="1059,79"/>
     <loader id="n73_lc1j" name="n73" xy="30,1008" size="1020,673" url="ui://7l6lvkay842s6h" fill="scaleFree"/>
     <component id="n17_ojlz" name="btnLv" src="ojlzr" fileName="components/btnTab.xml" xy="136,1044" group="n22_842s">
-      <Button controller="ctrlTab" page="0"/>
+      <Button checked="true" controller="ctrlTab" page="0"/>
       <property target="title" propertyId="0" value="升级"/>
     </component>
     <component id="n18_ojlz" name="btnStar" src="ojlzr" fileName="components/btnTab.xml" xy="422,1044" group="n22_842s">
-      <Button checked="true" controller="ctrlTab" page="1"/>
+      <Button controller="ctrlTab" page="1"/>
       <property target="title" propertyId="0" value="升星"/>
     </component>
     <component id="n19_ojlz" name="btnSkill" src="ojlzr" fileName="components/btnTab.xml" xy="708,1044" group="n22_842s">

+ 4 - 4
FGUIProject/assets/ClothingShop/ClothingShopUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="2,,3,,4,,5," selected="2">
+  <controller name="c1" pages="2,,3,,4,,5," selected="0">
     <remark page="1" value="服装店"/>
     <remark page="2" value="落星商店"/>
     <remark page="3" value="活动商店"/>
@@ -21,7 +21,7 @@
     <image id="n21_hinb" name="n21" src="hinb5" fileName="images/fzd_diban_3.png" xy="0,1294" size="1080,5">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <list id="n43_hinb" name="listShop" xy="26,1398" size="1038,522" layout="flow_hz" overflow="scroll" colGap="30" defaultItem="ui://e5hnfx8ahinb1c" autoClearItems="true">
+    <list id="n43_hinb" name="listShop" xy="22,1398" size="1036,522" layout="flow_hz" overflow="scroll" colGap="10" defaultItem="ui://e5hnfx8ahinb1c" autoClearItems="true">
       <relation target="n44_hinb" sidePair="top-top"/>
       <item/>
       <item/>
@@ -76,12 +76,12 @@
       </item>
     </list>
     <loader id="n45_ugdz" name="n45" xy="0,0" size="1080,199" url="ui://e5hnfx8augdz1i" fill="scaleFree"/>
-    <component id="n2_hinb" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,107">
+    <component id="n2_hinb" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90">
       <gearXY controller="c1" pages="2,3,4,5" values="159,90|159,90|159,107|159,107"/>
     </component>
     <component id="n47_ugdz" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <image id="n49_f5bl" name="n49" src="lwri5x" fileName="images/hc_btkuang_1.png" pkg="eg2y0ldp" xy="282,103" group="n51_f5bl"/>
-    <text id="n50_f5bl" name="txtTitle" xy="540,98" pivot="0.5,0" anchor="true" size="154,51" group="n51_f5bl" fontSize="38" color="#fdf4e3" text="落星商店">
+    <text id="n50_f5bl" name="txtTitle" xy="540,98" pivot="0.5,0" anchor="true" size="154,51" group="n51_f5bl" fontSize="38" color="#fdf4e3" text="活动商店">
       <gearText controller="c1" pages="4" values="落星商店" default="活动商店"/>
     </text>
     <group id="n51_f5bl" name="grpTop" xy="282,98" size="516,60" advanced="true">

+ 9 - 9
FGUIProject/assets/ClothingShop/components/ShopListItemRender.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="236,342">
+<component size="250,342">
   <displayList>
-    <image id="n22_hinb" name="n22" src="hinb19" fileName="images/fzd_diban_4.png" xy="0,0"/>
-    <loader id="n24_hinb" name="rarity" xy="188,6" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <text id="n26_hinb" name="txtName" xy="18,266" size="200,37" fontSize="26" color="#aa8e71" align="center" autoSize="none" text="名字"/>
-    <loader id="n27_hinb" name="icon" xy="38,32" size="160,160" aspect="true" url="ui://e5hnfx8ahinb1a" fill="scale"/>
-    <image id="n28_hinb" name="imgOwned" src="hinb1b" fileName="images/fzd_yyy.png" xy="44,166"/>
-    <loader id="n31_ugdz" name="iconPrice" xy="36,228" size="32,32" group="n33_ugdz" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n32_ugdz" name="txtPrice" xy="79,226" size="121,36" group="n33_ugdz" fontSize="26" color="#f2989b" ubb="true" bold="true" autoClearText="true" text="9999999"/>
-    <group id="n33_ugdz" name="n33" xy="36,226" size="164,36" advanced="true">
+    <image id="n22_hinb" name="n22" src="hinb19" fileName="images/fzd_diban_4.png" xy="5,9"/>
+    <loader id="n24_hinb" name="rarity" xy="198,15" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
+    <text id="n26_hinb" name="txtName" xy="25,275" size="200,37" fontSize="26" color="#aa8e71" align="center" autoSize="none" text="名字"/>
+    <loader id="n27_hinb" name="icon" xy="45,41" size="160,160" aspect="true" url="ui://e5hnfx8ahinb1a" fill="scale"/>
+    <image id="n28_hinb" name="imgOwned" src="hinb1b" fileName="images/fzd_yyy.png" xy="53,175"/>
+    <loader id="n31_ugdz" name="iconPrice" xy="43,237" size="32,32" group="n33_ugdz" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
+    <text id="n32_ugdz" name="txtPrice" xy="86,235" size="121,36" group="n33_ugdz" fontSize="26" color="#f2989b" ubb="true" bold="true" autoClearText="true" text="9999999"/>
+    <group id="n33_ugdz" name="n33" xy="43,235" size="164,36" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
   </displayList>

+ 3 - 0
FGUIProject/assets/ClothingShop/package.xml

@@ -41,6 +41,9 @@
     <component id="rlej5y" name="ButtonModle.xml" path="/components/"/>
     <image id="iakb5z" name="fzd_lxsdt.png" path="/images/"/>
     <image id="9cth60" name="fzd_xiant_1.png" path="/images/"/>
+    <movieclip id="lj7e62" name="MovieClip2.jta" path="/effect/"/>
+    <image id="lj7e63" name="hd.png" path="/images/"/>
+    <component id="jpnf64" name="ComSelect.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingShop" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 6 - 3
FGUIProject/assets/CommonGame/components/Button9.xml

@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="302,70" extention="Button">
+<component size="270,70" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_842s" name="n0" src="wr9a7p" fileName="images/kp_jnanniu_1.png" xy="0,0" size="302,70">
+    <image id="n0_842s" name="n0" src="wr9a7p" fileName="images/kp_jnanniu_1.png" xy="0,0" size="270,70">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_842s" name="title" xy="151,7" pivot="0.5,0" anchor="true" size="148,49" fontSize="36" color="#926651" text="自动选择">
+    <text id="n1_842s" name="title" xy="135,7" pivot="0.5,0" anchor="true" size="148,49" fontSize="36" color="#926651" text="自动选择">
       <relation target="" sidePair="center-center"/>
     </text>
+    <movieclip id="n2_lj7e" name="n2" src="lj7ea8" fileName="effect/MovieClip1.jta" xy="-12,-18" size="294,105" blend="screen">
+      <relation target="" sidePair="width-width,height-height"/>
+    </movieclip>
   </displayList>
   <Button/>
 </component>

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

@@ -185,6 +185,7 @@
     <component id="dcrotaa" name="Component2.xml" path="/components/"/>
     <image id="ohuntac" name="zhuxian_shuoto.png" path="/imagesExport/" exported="true"/>
     <image id="ohuntad" name="zhangjie_bg_1.jpg" path="/bgimg/" exported="true" atlas="alone_npot"/>
+    <movieclip id="lj7ea8" name="MovieClip1.jta" path="/effect/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 3 - 3
FGUIProject/assets/Field/components/Button1.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="248,70" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="c1" alias="是否开启" pages="0,,1," selected="0">
     <remark page="0" value="未开启"/>
     <remark page="1" value="已开启"/>
@@ -9,14 +9,14 @@
     <image id="n6_ohun" name="n6" src="ohunj" fileName="images/tydc_jbkuang_2.png" xy="2,0">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <text id="n3_s20j" name="title" xy="-18,0" size="248,67" fontSize="38" color="#fff8df" align="center" vAlign="middle" autoSize="none" singleLine="true" text="初级">
+    <text id="n3_s20j" name="title" xy="-18,0" size="248,67" fontSize="38" color="#e3d49f" align="center" vAlign="middle" autoSize="none" singleLine="true" text="初级">
       <gearDisplay controller="button" pages="0"/>
       <gearColor controller="button" pages="1" values="#fff8df,#fef6d9" default="#e3d49f,#000000"/>
     </text>
     <loader id="n7_ohun" name="icon" xy="61,11" size="88,51" url="ui://5oh3t798ohunk" autoSize="true">
       <gearDisplay controller="button" pages="1"/>
     </loader>
-    <image id="n8_ohun" name="n8" src="ohuntac" fileName="imagesExport/zhuxian_shuoto.png" pkg="eg2y0ldp" xy="149,25" scale="0.7,0.7">
+    <image id="n8_ohun" name="imgLock" src="ohuntac" fileName="imagesExport/zhuxian_shuoto.png" pkg="eg2y0ldp" xy="149,25" scale="0.7,0.7">
       <gearDisplay controller="c1" pages="0"/>
     </image>
   </displayList>

+ 2 - 2
FGUIProject/assets/LuckyBox/LuckyBoxUI.xml

@@ -39,7 +39,7 @@
     <group id="n31_vek8" name="grpBottom" xy="91,1663" size="989,250" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
-    <component id="n33_ly9g" name="btnLeft" src="ly9g1e" fileName="components/Button5.xml" xy="74,960" pivot="0.5,0.5" anchor="true" rotation="180" pkg="eg2y0ldp"/>
-    <component id="n39_ly9g" name="btnRight" src="ly9g1e" fileName="components/Button5.xml" xy="1000,960" pivot="0.5,0.5" anchor="true" pkg="eg2y0ldp"/>
+    <component id="n33_ly9g" name="btnLeft" src="ly9g1e" fileName="components/Button13.xml" pkg="eg2y0ldp" xy="74,960" pivot="0.5,0.5" anchor="true" rotation="180"/>
+    <component id="n39_ly9g" name="btnRight" src="ly9g1e" fileName="components/Button13.xml" pkg="eg2y0ldp" xy="1000,960" pivot="0.5,0.5" anchor="true"/>
   </displayList>
 </component>

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

@@ -47,6 +47,9 @@
     <image id="o1391i" name="cj_tp_2.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
     <image id="qi041j" name="cj_zizi_2.png" path="/images/"/>
     <component id="xg6g1k" name="ComHolder.xml" path="/components/" exported="true"/>
+    <image id="lj7e1l" name="ui_ck_zwt_yl.png" path="/effect/"/>
+    <image id="lj7e1m" name="ui_ck_tst_yl.png" path="/effect/"/>
+    <movieclip id="lj7e1o" name="MovieClip1.jta" path="/effect/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_Button1.cs

@@ -8,6 +8,7 @@ namespace UI.Field
     {
         public GButton target;
         public Controller m_c1;
+        public GImage m_imgLock;
         public const string URL = "ui://5oh3t798s20j4";
         public const string PACKAGE_NAME = "Field";
         public const string RES_NAME = "Button1";
@@ -56,10 +57,12 @@ namespace UI.Field
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_imgLock = (GImage)comp.GetChild("imgLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_imgLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 16 - 9
GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -23,7 +23,7 @@ namespace GFGGame
         private DressUpObjDataCache _dressUpObjDataCache;
         private ValueBarController _valueBarController;
         private List<ShopCfg> _dataList;
-        private GLoader _imgSelected;
+        private GComponent _comSelected;
         private ShopCfg _cfgSelected;
         private const int MAX_COUNT = 99;
         private const int INIT_COUNT = 1;
@@ -45,10 +45,10 @@ namespace GFGGame
                 GameObject.Destroy(_scenePrefab);
                 _scenePrefab = null;
             }
-            if (_imgSelected != null)
+            if (_comSelected != null)
             {
-                _imgSelected.RemoveFromParent();
-                _imgSelected.Dispose();
+                _comSelected.RemoveFromParent();
+                _comSelected.Dispose();
             }
             if (_dressUpObjDataCache != null)
             {
@@ -73,10 +73,10 @@ namespace GFGGame
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneDressUp"));
             _dressUpObjDataCache = new DressUpObjDataCache();
 
-            _imgSelected = new GLoader();
-            _imgSelected.x = -5;
-            _imgSelected.y = -3;
-            _imgSelected.url = "ui://ClothingShop/fzd_fzxzhong";
+            _comSelected = new GComponent();
+            _comSelected.x = -5;
+            _comSelected.y = -3;
+            _comSelected = UIPackage.CreateObject(UI_ClothingShopUI.PACKAGE_NAME, "ComSelect").asCom;
             _ui.m_listShop.itemRenderer = ListShopItemRender;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
@@ -301,6 +301,9 @@ namespace GFGGame
         private void OnClickListShopItem(EventContext context)
         {
             _selectedItemId = 0;
+            // UI_ShopListItemRender selectedListItem = UI_ShopListItemRender.Proxy(_selectedListItem);
+            // selectedListItem.m_grpSelect.visible = false;
+
             UpdateSelectedItemInfo(context.data as GComponent, true);
         }
 
@@ -309,6 +312,7 @@ namespace GFGGame
             UI_ShopListItemRender listItem = UI_ShopListItemRender.Proxy(item);
             ShopCfg cfg = _dataList[index];
             listItem.target.data = cfg;
+            // listItem.m_grpSelect.visible = false;
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.itemID);
             listItem.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
             string itemName = itemCfg.name;
@@ -323,7 +327,10 @@ namespace GFGGame
         private void UpdateSelectedItemInfo(GComponent listItem, bool tween)
         {
             _selectedListItem = listItem;
-            listItem.AddChild(_imgSelected);
+            listItem.AddChild(_comSelected);
+            // UI_ShopListItemRender item = UI_ShopListItemRender.Proxy(listItem);
+            // item.m_grpSelect.visible = true;
+            // item.target.AddChild()
             ShopCfg cfg = listItem.data as ShopCfg;
             _cfgSelected = cfg;
             UpdateRole(tween);

+ 6 - 0
GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs

@@ -37,7 +37,13 @@ namespace GFGGame
             FieldDataManager.Instance.difficulty = _ui.m_c1.selectedIndex;
             _curCfg = FieldDataManager.Instance.GetFieldCfgByDifficulty(_ui.m_c1.selectedIndex);
             _curLevelId = FieldDataManager.Instance.GetLevelIdByDifficulty(_ui.m_c1.selectedIndex);
+            FieldCfg[] cfgs = FieldCfgArray.Instance.dataArray;
+            for (int i = 0; i < cfgs.Length; i++)
+            {
+                //             bool isPass = InstanceZonesDataManager.CheckLevelPass(cfgs[i].s);
 
+                // _ui.target.GetChild("btn"+i).asButton.GetChild("imgLock").asImage.visible=
+            }
             UpdateView();
             _ui.m_proTaskReward.max = 100;
             _ui.m_proTaskReward.value = 88;

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


BIN
GameClient/Assets/ResIn/UI/Card/Card_fui.bytes


BIN
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0.png


BIN
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_fui.bytes


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


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


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


BIN
GameClient/Assets/ResIn/UI/Field/Field_fui.bytes