Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev

2023-06-19 17:36:30 +08:00 · 2023-06-19 17:36:30 +08:00 · 107758cbf0
commit 107758cbf0
parent 63499e8373 dfc485cab3
22 changed files with 10 additions and 3 deletions
--- a/Assets/lua/app/common/bi_report.lua.bytes
+++ b/Assets/lua/app/common/bi_report.lua.bytes
--- a/Assets/lua/app/common/event_manager.lua.bytes
+++ b/Assets/lua/app/common/event_manager.lua.bytes
--- a/Assets/lua/app/config/localization/localization_global_const.lua.bytes
+++ b/Assets/lua/app/config/localization/localization_global_const.lua.bytes
--- a/Assets/lua/app/config/strings/cn/global.lua.bytes
+++ b/Assets/lua/app/config/strings/cn/global.lua.bytes
--- a/Assets/lua/app/config/strings/es/skill.lua.bytes
+++ b/Assets/lua/app/config/strings/es/skill.lua.bytes
--- a/Assets/lua/app/config/strings/es/skill.lua.bytes.meta
+++ b/Assets/lua/app/config/strings/es/skill.lua.bytes.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f9e5915f93926384bb040b43aa72ffbe
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/lua/app/config/strings/id/skill.lua.bytes
+++ b/Assets/lua/app/config/strings/id/skill.lua.bytes
--- a/Assets/lua/app/config/strings/ja/skill.lua.bytes
+++ b/Assets/lua/app/config/strings/ja/skill.lua.bytes
--- a/Assets/lua/app/config/strings/ko/skill.lua.bytes
+++ b/Assets/lua/app/config/strings/ko/skill.lua.bytes
--- a/Assets/lua/app/config/strings/pt/skill.lua.bytes
+++ b/Assets/lua/app/config/strings/pt/skill.lua.bytes
--- a/Assets/lua/app/config/strings/th/skill.lua.bytes
+++ b/Assets/lua/app/config/strings/th/skill.lua.bytes
--- a/Assets/lua/app/config/strings/vi/skill.lua.bytes
+++ b/Assets/lua/app/config/strings/vi/skill.lua.bytes
--- a/Assets/lua/app/config/strings/zh/skill.lua.bytes
+++ b/Assets/lua/app/config/strings/zh/skill.lua.bytes
--- a/Assets/lua/app/net/net_manager.lua.bytes
+++ b/Assets/lua/app/net/net_manager.lua.bytes
--- a/Assets/lua/app/ui/common/cell/player_head_cell.lua.bytes
+++ b/Assets/lua/app/ui/common/cell/player_head_cell.lua.bytes
--- a/Assets/lua/app/ui/dungeon/dungeon_difficulty_ui.lua.bytes
+++ b/Assets/lua/app/ui/dungeon/dungeon_difficulty_ui.lua.bytes
--- a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
+++ b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
--- a/Assets/lua/app/ui/player_info/player_info_ui.lua.bytes
+++ b/Assets/lua/app/ui/player_info/player_info_ui.lua.bytes
--- a/Assets/lua/app/ui/player_info/rename_ui.lua.bytes
+++ b/Assets/lua/app/ui/player_info/rename_ui.lua.bytes
--- a/Assets/lua/app/userdata/dungeon/dungeon_data.lua.bytes
+++ b/Assets/lua/app/userdata/dungeon/dungeon_data.lua.bytes
--- a/Assets/lua/app/userdata/player/player_data.lua.bytes
+++ b/Assets/lua/app/userdata/player/player_data.lua.bytes
--- a/Assets/prefabs/ui/player_info/rename_ui.prefab
+++ b/Assets/prefabs/ui/player_info/rename_ui.prefab
@ -1443,15 +1443,15 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
-  m_Color: {r: 0.21568628, g: 0.20784314, b: 0.28235295, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 21300000, guid: 182116de280b5e64884b108d91b70b93, type: 3}
+  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
  m_FillMethod: 4