Merge remote-tracking branch 'origin/master' into ios

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

@@ -9,8 +9,8 @@ namespace GFGGame
     {
         private UI_SuitItemUI _ui;
         private int suitID;
-        private int countSuitId;//当前获得的物品还有多少个相同套装的部件需要展示
-        private int count = 0;//套装当前拥有的部件数量
+        private int countSuitId;//褰撳墠鑾峰緱鐨勭墿鍝佽繕鏈夊�灏戜釜鐩稿悓濂楄�鐨勯儴浠堕渶瑕佸睍绀�
+        private int count = 0;//濂楄�褰撳墠鎷ユ湁鐨勯儴浠舵暟閲�
         private int totalCount = 1;
 
         private EffectUI _effectUI1;
@@ -63,7 +63,7 @@ namespace GFGGame
             if (suitID > 0)
             {
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitID);
-                _ui.m_txtName.text = "套装·" + suitCfg.name;
+                _ui.m_txtName.text = "濂楄�路" + suitCfg.name;
                 _ui.m_icon.url = ResPathUtil.GetFieldGuideIconPath(suitCfg.res);
             }
             _ui.m_probar.max = totalCount;

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs

@@ -64,7 +64,7 @@ namespace GFGGame
             _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(_activityId);
             _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(_activityId);
             //RefreshList();
-            //由于这个需要外部参数所以在onshown里面预加载
+            //鐢变簬杩欎釜闇€瑕佸�閮ㄥ弬鏁版墍浠ュ湪onshown閲岄潰棰勫姞杞�
             PreloadManager.Instance.PreloadSuitRes(_rechargeCfgs[0].suitId, ResType.Both, new int[] { ConstDressUpItemType.BEI_JING }, false);
             string name = SuitCfgArray.Instance.GetCfg(_rechargeCfgs[0].suitId).name;
             _ui.m_packageName.text = name;
@@ -88,7 +88,7 @@ namespace GFGGame
             _ui.m_btnRight.visible = _curSelectIndex < _rechargeCfgs.Count - 1 ? true : false;
             _ui.m_packageName.text = SuitCfgArray.Instance.GetCfg(_rechargeCfgs[_curSelectIndex].suitId).name;
             UpdateRedDot();
-            //预加载套装，对于不同suitid
+            //棰勫姞杞藉�瑁咃紝瀵逛簬涓嶅悓suitid
             for (int i = 1; i < _rechargeCfgs.Count; i++)
             {
                 if (_rechargeCfgs[i].suitId != _rechargeCfgs[i - 1].suitId)
@@ -181,25 +181,25 @@ namespace GFGGame
             bool isGet = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipGetStatus), vipCfg.id);
             long limitChargeExp = _activityInfo.CountValue;
             //item.m_btnGetGiftBag.grayed = limitChargeExp < _rechargeCfgs[index].value;
-            item.m_txtGiftBag.text = string.Format("活动期间累计获得{0}会员积分({1}/{2})", _rechargeCfgs[index].value, limitChargeExp, _rechargeCfgs[index].value);
+            item.m_txtGiftBag.text = string.Format("娲诲姩鏈熼棿绱��鑾峰緱{0}浼氬憳绉�垎({1}/{2})", _rechargeCfgs[index].value, limitChargeExp, _rechargeCfgs[index].value);
             if (limitChargeExp >= _rechargeCfgs[index].value)
             {
                 if (_activityInfo.GetRewards.IndexOf(_rechargeCfgs[index].id) >= 0)
                 {
                     item.m_btnGetGiftBag.grayed = true;
-                    item.m_btnGetGiftBag.title = "已领取";
+                    item.m_btnGetGiftBag.title = "宸查�鍙�";
                 }
                 else
                 {
                     item.m_btnGetGiftBag.grayed = false;
-                    item.m_btnGetGiftBag.title = "领取";
+                    item.m_btnGetGiftBag.title = "棰嗗彇";
                 }
 
             }
             else
             {
                 item.m_btnGetGiftBag.grayed = true;
-                item.m_btnGetGiftBag.title = "领取";
+                item.m_btnGetGiftBag.title = "棰嗗彇";
             }
         }
 

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

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

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

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