diff --git a/Assets/ManagedResources/Audio/UI/common/UI_CommonClick.mp3 b/Assets/ManagedResources/Audio/UI/common/UI_CommonClick.mp3 index 706eaf607e..f730fee9f3 100644 Binary files a/Assets/ManagedResources/Audio/UI/common/UI_CommonClick.mp3 and b/Assets/ManagedResources/Audio/UI/common/UI_CommonClick.mp3 differ diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index 3e090a92c7..acdb42de76 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -105838,7 +105838,6 @@ GameObject: - component: {fileID: 1992467313994325108} - component: {fileID: 1377869764117395179} - component: {fileID: 8791789729877601104} - - component: {fileID: 2758256526845086611} m_Layer: 5 m_Name: lock m_TagString: Untagged @@ -105944,25 +105943,6 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!95 &2758256526845086611 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5551026719691139111} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &5595811839997475725 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua index e53c9d90e8..a7d3b60cb6 100644 --- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua @@ -3273,8 +3273,8 @@ RANKINFO_PARAM1_FIELD.index = 1 RANKINFO_PARAM1_FIELD.label = 1 RANKINFO_PARAM1_FIELD.has_default_value = false RANKINFO_PARAM1_FIELD.default_value = 0 -RANKINFO_PARAM1_FIELD.type = 5 -RANKINFO_PARAM1_FIELD.cpp_type = 1 +RANKINFO_PARAM1_FIELD.type = 3 +RANKINFO_PARAM1_FIELD.cpp_type = 2 RANKINFO_PARAM2_FIELD.name = "param2" RANKINFO_PARAM2_FIELD.full_name = ".com.ljsd.jieling.protocols.RankInfo.param2" diff --git a/data_execl/base_data/CombatControl.xlsx b/data_execl/base_data/CombatControl.xlsx index 69ea9b4e6b..179178370a 100644 Binary files a/data_execl/base_data/CombatControl.xlsx and b/data_execl/base_data/CombatControl.xlsx differ diff --git a/data_execl/base_data/HeroConfig.xlsx b/data_execl/base_data/HeroConfig.xlsx index 9e2aa21f06..a82742b016 100644 Binary files a/data_execl/base_data/HeroConfig.xlsx and b/data_execl/base_data/HeroConfig.xlsx differ diff --git a/data_execl/base_data/HeroRankupConfig.xlsx b/data_execl/base_data/HeroRankupConfig.xlsx index c27c7da946..c82a01f749 100644 Binary files a/data_execl/base_data/HeroRankupConfig.xlsx and b/data_execl/base_data/HeroRankupConfig.xlsx differ diff --git a/data_execl/base_data/HeroSacrifice.xlsx b/data_execl/base_data/HeroSacrifice.xlsx index e799ae3a82..762c534728 100644 Binary files a/data_execl/base_data/HeroSacrifice.xlsx and b/data_execl/base_data/HeroSacrifice.xlsx differ