ybx_Gdn 10 месяцев назад
Родитель
Сommit
de1b6c7e68

+ 3 - 2
Assets/Content/Config/LanguagePackage_cn.csv

@@ -6891,7 +6891,7 @@ LackEquipment,"<color=#fe5478>Insufficient equipment</color>, you can go to <col
 FashionTitlePaper,drawing
 SourceFunColor,<color=#078DF5>{0}</color>
 ItemNotEnoughDefault,Insufficient props
-ItemNotEnough,<color=#fe5478>{0}Insufficient</color>
+ItemNotEnough,<color=#fe5478>{0} Insufficient</color>
 ItemNotEnoughSource,"<color=#fe5478>{0} insufficient</color>, you can go to {1} to obtain"
 SourceFun1,have no idea
 SourceFun2,fighting
@@ -19189,4 +19189,5 @@ ActCfg_Name112,The King's bounty Issue 38
 ActCfg_Name59,The tyrant descended
 ActCfg_Name15,Outing activities
 ActCfg_Name57,Daily Accumulation Activity for May Day
-SzhKh,設置口號111
+SzhKh,Set slogan
+GaiZaoZhong,改造中...1

+ 10 - 10
Assets/Content/Prefabs/UI/UIClimbingTower/UIClimbingTower.prefab

@@ -4435,7 +4435,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 500, y: 0}
+  m_SizeDelta: {x: 500, y: 34.02}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &6512336731888733551
 MonoBehaviour:
@@ -9869,7 +9869,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 180, y: 180}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &3262710043394698592
 CanvasRenderer:
@@ -12432,7 +12432,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 180, y: 180}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2780849448026990954
 CanvasRenderer:
@@ -13137,10 +13137,10 @@ RectTransform:
   m_Father: {fileID: 8120565591831103225}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 450, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 50, y: -17.01}
+  m_SizeDelta: {x: 450, y: 34.02}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4228986536757847631
 CanvasRenderer:
@@ -15983,7 +15983,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 180, y: 180}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8435629548677925706
 CanvasRenderer:
@@ -17868,7 +17868,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1040216839688129352
 RectTransform:
   m_ObjectHideFlags: 0
@@ -18116,7 +18116,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 180, y: 180}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &778156858834137283
 CanvasRenderer:

Разница между файлами не показана из-за своего большого размера
+ 249 - 99
Assets/Content/Prefabs/UI/UIVoyage/UIVoyageReforming.prefab


BIN
Assets/Content/Raw_Art/UI/UIStarSign/img_banner_bg.png


BIN
Assets/Content/Raw_Art/UI/UIStarSign/img_banner_title.png


+ 1 - 1
Assets/Editor/AssetBundle/HY_Ios_en.asset

@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: HY_Ios_en
   m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
   Name: HY_Ios_en
-  CN_Name: "\u6D77\u5916IOS(\u82F1\u6587\u5305)"
+  CN_Name: "\u6D77\u5916IOS(\u6B27\u7F8E\u82F1\u6587\u5305)"
   OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/4_en"
   NewPath: E:/Project/Unity/bt_client_2022_S/Assets/StreamingAssets/unityRes
   OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/4_en"

+ 1 - 1
Assets/Editor/AssetBundle/Hy_Android_en.asset

@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: Hy_Android_en
   m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
   Name: Hy_Android_en
-  CN_Name: "\u6D77\u5916\u5B89\u5353(\u82F1\u6587\u5305)"
+  CN_Name: "\u6D77\u5916\u5B89\u5353(\u6B27\u7F8E\u82F1\u6587\u5305)"
   OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/3_en"
   NewPath: E:/Project/Unity/bt_client_2022_S/Assets/StreamingAssets/AssetsAndroid
   OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/3_en"

+ 5 - 5
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

+ 1 - 1
Assets/Lua/Util/CommonUtil.lua

@@ -2887,7 +2887,7 @@ function GetItemNotEnoughInfo(cfgId)
     if cfgId then
         local cfgData = ManagerContainer.CfgMgr:GetItemById(cfgId)
         if cfgData then
-            local itemName = tostring(cfgData.Name)
+            local itemName = I18N.T(tostring(cfgData.Name))
             if cfgData.SourceFun and #cfgData.SourceFun > 0 then
                 local sourceFunStr = nil
                 for i = 1, #cfgData.SourceFun do

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -846,7 +846,7 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU;FPS_DISABLE;GAME_DEBUG
+    Android: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE
     Standalone: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
     iPhone: USE_LUA;VUPLEX_CCU

Некоторые файлы не были показаны из-за большого количества измененных файлов