Merge branch 'hy_en' of ssh://192.168.0.8:29418/XianJing into hy_ru

# Conflicts:
#	Assets/Content/Config/LanguagePackage_cn.csv
#	Assets/Content/Fonts/VAGRoundedStdRegularSDF.asset

Assets/Content/Prefabs/UI/GridViewItem/ActivityItem.prefab

@@ -655,7 +655,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 50, y: 40}
+  m_SizeDelta: {x: 90, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6896890431885968889
 CanvasRenderer:
@@ -698,7 +698,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 12
+  m_Text: 122
 --- !u!114 &474463882289390946
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1130,7 +1130,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
   m_AnchoredPosition: {x: -30, y: 24}
-  m_SizeDelta: {x: 370, y: 56}
+  m_SizeDelta: {x: 443.33, y: 56}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &1956358869163570119
 CanvasRenderer:

Assets/Editor/AssetBundle/CheckHotResWindownInfo.asset

@@ -29,7 +29,7 @@ MonoBehaviour:
   ChangeNum: 0
   IsIgnore: 1
   Language: 1
-  buildTag: 4
+  buildTag: 1
   ResInfos:
   - {fileID: 11400000, guid: f3403f5e64d0cde489600f93471eb338, type: 2}
   - {fileID: 11400000, guid: 6fb25ab5e6ff8f84185c8edd210f870f, type: 2}
@@ -41,3 +41,6 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 0dc52175ab57d0d4ba8e678be0e39bb8, type: 2}
   - {fileID: 11400000, guid: 28effff3be366c742b1b85a45d5df44d, type: 2}
   - {fileID: 11400000, guid: 3c61ac4e81e99784caa420099355f7c7, type: 2}
+  - {fileID: 11400000, guid: 06676e4a5c8921b47ad87e4f77bdafb8, type: 2}
+  - {fileID: 11400000, guid: ab124914925c2b744b4da64bf49c4797, type: 2}
+  - {fileID: 11400000, guid: 0508f14204b88754296cf43370aed6c8, type: 2}

Assets/Editor/AssetBundle/CheckResWindowInfo.cs

@@ -21,6 +21,9 @@ public enum BuildTag
     Gn_0_1_Ios = 8,
     Gn_Zhuan_Android = 9,
     Gn_Zhuan_Ios = 10,
+    Hy_Test_ru = 11,
+    Hy_Android_ru = 12,
+    HY_Ios_ru = 13,
 }
 
 

Assets/Editor/AssetBundle/Hy_Android_ru.asset

@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 418e20e24f927b0488ef53e722321384, type: 3}
+  m_Name: Hy_Android_ru
+  m_EditorClassIdentifier: 
+  Name: Hy_Android_ru
+  CN_Name: "\u6D77\u5916\u5B89\u5353(\u4FC4\u8BED\u5305)"
+  OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/3_ru"
+  NewPath: E:/Project/Unity/bt_client_2022_S/Assets/StreamingAssets/AssetsAndroid
+  OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/3_ru"
+  VersionFileName: Version
+  mainfestFileName: mainfest
+  ResVersion: 0.1.0.0
+  IgnoreFiles: []
+  ChangeNum: 0
+  IsIgnore: 1
+  Language: 1

Assets/Editor/AssetBundle/Hy_Android_ru.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 06676e4a5c8921b47ad87e4f77bdafb8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/AssetBundle/Hy_Ios_ru.asset

@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 418e20e24f927b0488ef53e722321384, type: 3}
+  m_Name: Hy_Ios_ru
+  m_EditorClassIdentifier: 
+  Name: HY_Ios_ru
+  CN_Name: "\u6D77\u5916IOS(\u4FC4\u8BED\u5305)"
+  OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/4_ru"
+  NewPath: E:/Project/Unity/bt_client_2022_S/Assets/StreamingAssets/unityRes
+  OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/4_ru"
+  VersionFileName: afivs
+  mainfestFileName: afimft
+  ResVersion: 0.1.0.0
+  IgnoreFiles: []
+  ChangeNum: 0
+  IsIgnore: 1
+  Language: 1

Assets/Editor/AssetBundle/Hy_Ios_ru.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0508f14204b88754296cf43370aed6c8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/AssetBundle/Hy_Test_ru.asset

@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 418e20e24f927b0488ef53e722321384, type: 3}
+  m_Name: Hy_Test_ru
+  m_EditorClassIdentifier: 
+  Name: Hy_Test_ru
+  CN_Name: "\u6D4B\u8BD5\u670D\u6D77\u5916\u5B89\u5353(\u4FC4\u8BED\u5305)"
+  OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/2_ru"
+  NewPath: E:/Project/Unity/bt_client_2022_S/Assets/StreamingAssets/AssetsAndroid
+  OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/2_ru"
+  VersionFileName: Version
+  mainfestFileName: mainfest
+  ResVersion: 0.1.0.0
+  IgnoreFiles: []
+  ChangeNum: 0
+  IsIgnore: 1
+  Language: 1

Assets/Editor/AssetBundle/Hy_Test_ru.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ab124914925c2b744b4da64bf49c4797
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Lua/Core/PlatformPack.lua

@@ -1,9 +1,9 @@
 local PlatformPack = {
-	URL_KEY = 'http://110.40.223.119:81//',
-	SERVERLIST_URL = 'http://110.40.223.119:81//serverlist',
-	NOTIFY_URL = 'http://110.40.223.119:88/res/NoticeNew/',
-	SPECIAL_INFO_URL = 'http://110.40.223.119:81//channel',
-	CUSTOMER_SERVICE_INFO_URL = 'http://110.40.223.119:81//vipService',
+	URL_KEY = 'http://165.154.202.27:81//',
+	SERVERLIST_URL = 'http://165.154.202.27:81//serverlist',
+	NOTIFY_URL = 'http://165.154.202.27:88/res/NoticeNew/',
+	SPECIAL_INFO_URL = 'http://165.154.202.27:81//channel',
+	CUSTOMER_SERVICE_INFO_URL = 'http://165.154.202.27:81//vipService',
 }
 
 return PlatformPack

Assets/Lua/UI/UIWorldBoss/UIWorldBossBattleView.lua

@@ -109,7 +109,7 @@ function UIWorldBossBattleView:InitBossBlood()
 	self.lastLifeBarNum = self.controller:GetBossLifeBarNum()
 	self:RefreshBossLifeBarNum()
 
-	self.bossName.text.text = self.controller:GetBossName()
+	self.bossName.text.text = I18N.T(self.controller:GetBossName())
 	local bossIcon = self.controller:GetBossIcon()
 	if bossIcon ~= nil and bossIcon ~= "" then
         CommonUtil.LoadIcon(self.host, bossIcon, function (sprite)