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

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

@@ -82,6 +82,7 @@ namespace GFGGame
             {
                 EffectUI _effectUI = EffectUIPool.CreateEffectUI(item.m_holderfEff, "ui_Small_parts", "store_Value");
                 _effectUIs.Add(_effectUI);
+                item.m_holderfEff.visible = shopCfg.price < shopCfg.originalPrice;
             }
             item.m_txtDesc.text = shopCfg.price <= 0 ? "" : ShopDataManager.Instance.GetShopGoodsDiscount(shopCfg.id).ToString();
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListChargeItem.cs

@@ -11,8 +11,8 @@ namespace UI.Store
         public GTextField m_txtName;
         public UI_Component2 m_btnBuy;
         public GTextField m_txtDesc;
-        public GGraph m_holderfEff;
         public GGroup m_grpDouble;
+        public GGraph m_holderfEff;
         public const string URL = "ui://p9mtgheohhx91i";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "ListChargeItem";
@@ -64,8 +64,8 @@ namespace UI.Store
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnBuy = (UI_Component2)UI_Component2.Create(comp.GetChild("btnBuy"));
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
-            m_holderfEff = (GGraph)comp.GetChild("holderfEff");
             m_grpDouble = (GGroup)comp.GetChild("grpDouble");
+            m_holderfEff = (GGraph)comp.GetChild("holderfEff");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -74,8 +74,8 @@ namespace UI.Store
             m_btnBuy.Dispose();
             m_btnBuy = null;
             m_txtDesc = null;
-            m_holderfEff = null;
             m_grpDouble = null;
+            m_holderfEff = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListShopItem.cs

@@ -10,9 +10,9 @@ namespace UI.Store
         public Controller m_c1;
         public Controller m_c2;
         public GImage m_imgDouble;
+        public GGroup m_grpDiscount;
         public GGraph m_holderfEff;
         public GTextField m_txtDesc;
-        public GGroup m_grpDiscount;
         public GLoader m_icon;
         public GTextField m_txtName;
         public GTextField m_txtEndTime;
@@ -69,9 +69,9 @@ namespace UI.Store
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
             m_imgDouble = (GImage)comp.GetChild("imgDouble");
+            m_grpDiscount = (GGroup)comp.GetChild("grpDiscount");
             m_holderfEff = (GGraph)comp.GetChild("holderfEff");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
-            m_grpDiscount = (GGroup)comp.GetChild("grpDiscount");
             m_icon = (GLoader)comp.GetChild("icon");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtEndTime = (GTextField)comp.GetChild("txtEndTime");
@@ -84,9 +84,9 @@ namespace UI.Store
             m_c1 = null;
             m_c2 = null;
             m_imgDouble = null;
+            m_grpDiscount = null;
             m_holderfEff = null;
             m_txtDesc = null;
-            m_grpDiscount = null;
             m_icon = null;
             m_txtName = null;
             m_txtEndTime = null;

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRoundResultView.cs

@@ -70,6 +70,7 @@ namespace GFGGame
 
             if (isFinallyFight)
             {
+                MusicManager.Instance.PlayCroutine(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
                 FinishFight();
             }
         }

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

@@ -111,6 +111,7 @@ namespace GFGGame
             int count = 0;//套装当前拥有的部件数量
             int totalCount = 1;
             // int suitId = 0;
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("bg_zhuxian");
             DressUpMenuSuitDataManager.GetSuitProgressBySuitId(suitId, out count, out totalCount);
             // totalCount = SuitCfgManager.Instance.GetTotalCountOfOneSuit(suitId);
             if (suitId > 0)
@@ -119,10 +120,14 @@ namespace GFGGame
                 _ui.m_txtName.text = "套装·" + suitCfg.name;
                 int targetY = (int)(_ui.m_item.y + _ui.m_item.height + 50);
             }
-            _ui.m_probar.max = totalCount;
-            _ui.m_probar.value = count;
+            //_ui.m_probar.max = totalCount;
+            //_ui.m_probar.value = count;
+            _ui.m_probar.visible = false;
+            AlertUI.Show(string.Format("套装进度:{0}/{1}", count, totalCount))
+            .SetLeftButton(false)
+            .SetRightButton(true, "确定");
             // UpdateItem(itemId);
-            
+
             _dressUpObjUI.ResetSceneObj(70, false, true, null,  false);
             _dressUpObjUI.dressUpObj.PutOnSuitCfg(suitId, false, null, false, false);
             _dressUpObjUI.UpdateWrapper(_ui.m_holder);

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -1049,11 +1049,11 @@ namespace GFGGame
                 typeItem.m_itemType.selectedIndex = 0;
                 var subType = ItemUtilCS.GetItemSubType(_fightCfg.needItemId);
                 typeItem.m_imgNeed.visible = subType == item2.type;
-                typeItem.m_imgNew.visible = DressUpMenuItemDataManager.CheckIsSecondMenuNew(item2.id);
             }
             else
                 typeItem.m_itemType.selectedIndex = 1;
 
+            typeItem.m_imgNew.visible = DressUpMenuItemDataManager.CheckIsSecondMenuNew(item2.id);
             UI_TypeItem.ProxyEnd();
         }
 

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

@@ -116,8 +116,8 @@ namespace GFGGame
                 PrefabManager.Instance.Restore(_sceneObject);
                 _sceneObject = null;
             }
-
-            MusicManager.Instance.PlayCroutine(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
+            //这里屏蔽是由于打开其他界面时，会调用这个方法
+            //MusicManager.Instance.PlayCroutine(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
 
             // _ui.m_comResult.target.height = 0;
             _ui.m_comResult.m_t1.Play();

GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeView.cs

@@ -106,6 +106,7 @@ namespace GFGGame
             if (isDouble) {
                 EffectUI _effectUI = EffectUIPool.CreateEffectUI(item.m_holderfEff, "ui_Small_parts", "store_FirstCharge_Double");
                 _effectUIs.Add(_effectUI);
+                item.m_holderfEff.visible = isDouble;
             }
             UI_ListChargeItem.ProxyEnd();
         }

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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 1120223668e7830469dea9bccc7612be
+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_7.png.meta

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