diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dz_00058_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dz_00058_attack_01.mp3 index 8f86e52eb3..e31a741b1d 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dz_00058_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dz_00058_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_attack_01.mp3 new file mode 100644 index 0000000000..55f2e0f9ac Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_attack_01.mp3.meta new file mode 100644 index 0000000000..2a92864f15 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_attack_01.mp3.meta @@ -0,0 +1,43 @@ +fileFormatVersion: 2 +guid: e7b39b63c002a2d4888f9466e1291842 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 1: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 4: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 7: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ts_00017_attack_01_1.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ts_00017_attack_01_1.mp3 new file mode 100644 index 0000000000..23cf3d38ae Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ts_00017_attack_01_1.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ts_00017_attack_01_1.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ts_00017_attack_01_1.mp3.meta new file mode 100644 index 0000000000..2205082ecc --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ts_00017_attack_01_1.mp3.meta @@ -0,0 +1,43 @@ +fileFormatVersion: 2 +guid: b4b1183e2898e1b44a63f89cb8713a80 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 1: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 4: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 7: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3 new file mode 100644 index 0000000000..b5cd235989 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3.meta new file mode 100644 index 0000000000..e972c13781 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3.meta @@ -0,0 +1,43 @@ +fileFormatVersion: 2 +guid: 263c5ed8ff294014f8bcb6c5772e3fb3 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 1: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 4: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 7: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audioc_swk_00015_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audioc_swk_00015_attack_01.mp3 new file mode 100644 index 0000000000..a108132127 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audioc_swk_00015_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audioc_swk_00015_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audioc_swk_00015_attack_01.mp3.meta new file mode 100644 index 0000000000..d68dc4a2ed --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audioc_swk_00015_attack_01.mp3.meta @@ -0,0 +1,43 @@ +fileFormatVersion: 2 +guid: 68cd2d70da3cf814da629446567c08f8 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 1: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 4: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 7: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 52d8a6b672..dbe20f9f42 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -701,5 +701,17 @@ function this.GetTimeLimitRedPointStatus() return freeTime and freeTime >= 1 end end + +function this.GetQiankunBoxRedPointStatus() + local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting) + local freeTimesId=lotterySetting[RecruitType.QianKunBoxSingle].FreeTimes + local freeTime= 0 + if freeTimesId>0 then + freeTime= PrivilegeManager.GetPrivilegeRemainValue(freeTimesId) + RecruitManager.freeUseTimeList[freeTimesId]=freeTime + return freeTime and freeTime >= 1 + end +end + this.TimeLimitedTimes = 0 return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 145cbc3ff2..79408df30a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -389,7 +389,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Expedition_Treasure,TreasureOfHeavenManger.RedPoint) --ι™ζ—Άζ‹›ε‹Ÿ RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus) - RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetTimeLimitRedPointStatus) + RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus) end diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index 37bc89e645..7a19c1d001 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -55,7 +55,8 @@ function this.RefreshFreeTime() this.freeUseTimeList[38] = PrivilegeManager.GetPrivilegeRemainValue(38) this.freeUseTimeList[14] = PrivilegeManager.GetPrivilegeRemainValue(14) this.freeUseTimeList[32] = PrivilegeManager.GetPrivilegeRemainValue(32) - + this.freeUseTimeList[99] = PrivilegeManager.GetPrivilegeRemainValue(99) + if (ActTimeCtrlManager.SingleFuncState(1)) then CheckRedPointStatus(RedPointType.Recruit_Red) CheckRedPointStatus(RedPointType.Recruit_Normal) diff --git a/data_execl/base_data/EquipConfig.xlsx b/data_execl/base_data/EquipConfig.xlsx index a24895ac1f..015d00082c 100644 Binary files a/data_execl/base_data/EquipConfig.xlsx and b/data_execl/base_data/EquipConfig.xlsx differ diff --git a/data_execl/base_data/LotterySetting.xlsx b/data_execl/base_data/LotterySetting.xlsx index 53d443ffc4..0ab1992ea5 100644 Binary files a/data_execl/base_data/LotterySetting.xlsx and b/data_execl/base_data/LotterySetting.xlsx differ diff --git a/data_execl/base_data/PrivilegeTypeConfig.xlsx b/data_execl/base_data/PrivilegeTypeConfig.xlsx index 5f6b16e82f..6f1abfce16 100644 Binary files a/data_execl/base_data/PrivilegeTypeConfig.xlsx and b/data_execl/base_data/PrivilegeTypeConfig.xlsx differ diff --git a/data_execl/base_data/RoleConfig.xlsx b/data_execl/base_data/RoleConfig.xlsx index 32a5dd4fe7..05e1439f78 100644 Binary files a/data_execl/base_data/RoleConfig.xlsx and b/data_execl/base_data/RoleConfig.xlsx differ