Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

FGUIProject/assets/ClothingDecompose/ClothingDecomposeRuleUI.xml

@@ -5,7 +5,8 @@
     <image id="n3_qyr6" name="n3" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="44,120"/>
     <text id="n1_qyr6" name="txtTitle" xy="322,44" size="292,64" fontSize="48" color="#9b7853" text="服装分解规则"/>
     <text id="n2_qyr6" name="txtRule" xy="61,158" size="804,46" fontSize="34" color="#aa865f" autoSize="height" text="分解多余的衣服可获得金币和分解材料1.2."/>
-    <list id="n4_qyr6" name="listReward" xy="21,277" size="893,300" layout="row" colGap="40" defaultItem="ui://h9mv1l71wlc24" align="center">
+    <list id="n4_qyr6" name="listReward" xy="-106,315" pivot="0.5,0.5" size="1149,264" scale="0.78,0.78" layout="row" colGap="40" defaultItem="ui://h9mv1l71wlc24" align="center">
+      <item/>
       <item/>
       <item/>
       <item/>

FGUIProject/assets/CommonGame/components/Button9.xml

@@ -8,7 +8,7 @@
     <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">
+    <movieclip id="n2_lj7e" name="ani" src="lj7ea8" fileName="effect/MovieClip1.jta" xy="-12,-18" size="294,105" blend="screen">
       <relation target="" sidePair="width-width,height-height"/>
     </movieclip>
   </displayList>

FGUIProject/assets/DressUp/package.xml

@@ -32,25 +32,6 @@
     <component id="k6he16" name="TypeItem.xml" path="/components/"/>
     <image id="k6he17" name="hz_bjanniu.png" path="/images/"/>
     <image id="k6he18" name="hz_dakai_1.png" path="/images/"/>
-    <image id="k6he1c" name="hz_iconziej_1.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1d" name="hz_iconziej_2.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1e" name="hz_iconziej_3.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1f" name="hz_iconziej_4.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1g" name="hz_iconziej_5.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1h" name="hz_iconziej_6.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1i" name="hz_iconziej_7.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1j" name="hz_iconzi_1.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1k" name="hz_iconzi_10.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1l" name="hz_iconzi_11.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1m" name="hz_iconzi_12.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1n" name="hz_iconzi_2.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1o" name="hz_iconzi_3.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1p" name="hz_iconzi_4.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1q" name="hz_iconzi_5.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1r" name="hz_iconzi_6.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1s" name="hz_iconzi_7.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1t" name="hz_iconzi_8.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="k6he1u" name="hz_iconzi_9.png" path="/imagesExport/" exported="true" atlas="1"/>
     <component id="k6he1v" name="PartsList.xml" path="/components/"/>
     <image id="k6he1w" name="hz_fkdikuang.png" path="/images/"/>
     <image id="k6he1y" name="hz_minzikuang.png" path="/images/"/>
@@ -61,9 +42,6 @@
     <component id="k6he24" name="ComboBoxRarity_popup.xml" path="/components/"/>
     <component id="k6he25" name="ComboBoxRarity.xml" path="/components/"/>
     <component id="k6he26" name="PartsListItem.xml" path="/components/"/>
-    <image id="k6he27" name="hz_iconziej_10.png" path="/imagesExport/" exported="true"/>
-    <image id="k6he28" name="hz_iconziej_8.png" path="/imagesExport/" exported="true"/>
-    <image id="k6he29" name="hz_iconziej_9.png" path="/imagesExport/" exported="true"/>
     <image id="slb42a" name="hz_fenleituej_1.png" path="/imagesExport/" exported="true"/>
     <image id="slb42b" name="hz_fenleituej_10.png" path="/imagesExport/" exported="true"/>
     <image id="slb42c" name="hz_fenleituej_2.png" path="/imagesExport/" exported="true"/>

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_Button9
+    {
+        public GButton target;
+        public GMovieClip m_ani;
+        public const string URL = "ui://eg2y0ldp842s6q";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "Button9";
+        private static UI_Button9 _proxy;
+
+        public static UI_Button9 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button9();
+            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_Button9 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button9();
+            }
+            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_ani = (GMovieClip)comp.GetChild("ani");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_ani = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button9.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -143,6 +143,7 @@ namespace GFGGame
             _comFosterBottom.m_txtName.text = _cardData.itemCfg.name;
             _comFosterBottom.m_btnStory.visible = CardDataManager.GetStoryCfgsById(_cardData.id).Count > 0 ? true : false;
             _comFosterBottom.m_btnUpLv.grayed = true;
+            _comFosterBottom.m_btnUpLv.GetChild("ani").asMovieClip.visible = true;
             _comFosterBottom.m_loaRarity.url = ResPathUtil.GetCommonGameResPath("kp_sx_da_" + _cardData.itemCfg.rarity);
             _valueBarController = new ValueBarController(_ui.m_ComFosterTop.m_comValueBar, 5);
             _valueBarController.OnShown();
@@ -229,6 +230,7 @@ namespace GFGGame
             _comFosterBottom.m_txtCurExp.text = _showExp.ToString();
             //    = "0";
             _comFosterBottom.m_btnUpLv.grayed = _comLvConsumeGold.m_txtNeed.text == "0" ? true : false;
+            _comFosterBottom.m_btnUpLv.GetChild("ani").asMovieClip.visible = !_comFosterBottom.m_btnUpLv.grayed;
 
             _comFosterBottom.m_ctrlFullLv.selectedIndex = CardDataManager.isFullLv(_cardData.id, _cardData.lv, false) ? 1 : 0;
 
@@ -497,6 +499,8 @@ namespace GFGGame
 
 
                 _comFosterBottom.m_btnUpStar.grayed = int.Parse(_comFosterBottom.m_btnUpStar.data.ToString()) == 1 ? true : false;
+                _comFosterBottom.m_btnUpStar.GetChild("ani").asMovieClip.visible = !_comFosterBottom.m_btnUpStar.grayed;
+
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs

@@ -73,7 +73,8 @@ namespace GFGGame
             _ui.m_effEnd.visible = false;
             _rewardList = LuckyBoxDataManager.Instance.RewardList;
             _ui.m_ctrlBuyType.selectedIndex = _rewardList != null && _rewardList.Count > 1 ? 1 : 0;
-            _ui.m_ctrlRewardsType.selectedIndex = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.Instance.currentBoxId);
+            _ui.m_ctrlRewardsType.selectedIndex = LuckyBoxDataManager.Instance.currentBoxId - 1; Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.Instance.currentBoxId);
+            // _ui.m_bg.url = ResPathUtil.GetBgImgPath("cj_tp_" + LuckyBoxDataManager.Instance.currentBoxId);
             isFirst = true;
             ResetStartView();
         }
@@ -222,7 +223,7 @@ namespace GFGGame
             comStar.m_imgLine.visible = false;
 
 
-            if (showGuide && comStars.Count > 0)
+            if (showGuide && clickComStars.Count < 2)
             {
                 isFirst = false;
                 ResetStartView();
@@ -320,12 +321,12 @@ namespace GFGGame
         {
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX, 5, "点击将星星全部链接在一起", -1, true, (int)(this.viewCom.height - 150));
+            GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX, 5, "点击将星星链接在一起", -1, true, (int)(this.viewCom.height - 150));
             TryCompleteGuide();
         }
         protected override void TryCompleteGuide()
         {
-            if (comStars.Count == 0)
+            if (clickComStars.Count >= 2)
             {
                 GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX);
 

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -235,6 +235,7 @@ namespace GFGGame
             bgIndex++;
             if (bgIndex == resArr.Length) bgIndex = 0;
             item.m_loaBg.url = string.Format("ui://LuckyBox/{0}", resArr[bgIndex]);
+            // item.m_loaBg.url = ResPathUtil.GetBgImgPath(resArr[bgIndex]);
         }
         protected override void OnHide()
         {

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

@@ -32,9 +32,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1

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

@@ -32,9 +32,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1

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

@@ -32,9 +32,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1

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

@@ -32,9 +32,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1

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

@@ -32,9 +32,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1

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

@@ -32,9 +32,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1