diff --git a/Assets/ManagedResources/ArtFont_en/l_lingshou_jukun_en.png b/Assets/ManagedResources/ArtFont_en/l_lingshou_jukun_en.png new file mode 100644 index 0000000000..9e3e13f755 Binary files /dev/null and b/Assets/ManagedResources/ArtFont_en/l_lingshou_jukun_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/l_lingshou_jukun_en.png.meta b/Assets/ManagedResources/ArtFont_en/l_lingshou_jukun_en.png.meta new file mode 100644 index 0000000000..0a9293b63a --- /dev/null +++ b/Assets/ManagedResources/ArtFont_en/l_lingshou_jukun_en.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 74f384c2de728aa4d952448aaf8953ad +TextureImporter: + fileIDToRecycleName: + 21300000: l_lingshou_jukun_en + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: l_lingshou_jukun_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 355 + height: 117 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 845ce57aa88816141b8b5329a7959a09 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/ArtFont_vi/l_lingshou_jukun_vi.png b/Assets/ManagedResources/ArtFont_vi/l_lingshou_jukun_vi.png new file mode 100644 index 0000000000..1887abb42b Binary files /dev/null and b/Assets/ManagedResources/ArtFont_vi/l_lingshou_jukun_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/l_lingshou_jukun_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/l_lingshou_jukun_vi.png.meta new file mode 100644 index 0000000000..b2172ab085 --- /dev/null +++ b/Assets/ManagedResources/ArtFont_vi/l_lingshou_jukun_vi.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: e1f2a188f20d210459a41bf57a8eb85d +TextureImporter: + fileIDToRecycleName: + 21300000: l_lingshou_jukun_vi + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: l_lingshou_jukun_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 355 + height: 117 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: da7210bb58aeea044972cbc32de4b05a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Exile.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Exile.lua index 683029149d..fe99750bca 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Exile.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Exile.lua @@ -11,12 +11,10 @@ end --初始化后调用一次 function Exile:OnStart() self.target.isExile = true - self.ownPassiveList = self.target.passiveList - self.target.passiveList=nil if self.caster.exileTargets then table.insert(self.caster.exileTargets,self.target) end - -- self.target.Event:SetIsTrigger(false) + self.target.Event:DispatchEvent(BattleEventName.RoleBeExile, self) end --间隔N帧触发,返回true时表示继续触发,返回false立刻触发OnEnd @@ -26,14 +24,12 @@ end --效果结束时调用一次 function Exile:OnEnd() - LogError("放逐结束") self.target.isExile = false - --self.target.Event:SetIsTrigger(true) + self.target.Event:DispatchEvent(BattleEventName.RoleExileEnd, self) end --只有当cover字段为true时触发,返回true则被新效果覆盖 function Exile:OnCover(newBuff) - return true end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index d748317693..88cbd27985 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -164,6 +164,8 @@ BattleEventName = { RecordBuff = indexAdd(), -- buff RecordSecKill = indexAdd(), -- 斩杀 DisposeRoleCtrl_noheal = indexAdd(),--处理角色禁疗 + RoleBeExile = indexAdd(),--角色被放逐 + RoleExileEnd = indexAdd(),--角色放逐结束 } BattleMaxFrame = 1000000 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua index 470f30a48a..32849f5d4a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -133,7 +133,8 @@ function EnemyView:onCreate(go, role, position, root) role.Event:AddEvent(BattleEventName.BeSeckill, self.onBeSecKill, self) role.Event:AddEvent(BattleEventName.ShildTrigger, self.OnShieldTrigger, self) role.Event:AddEvent(BattleEventName.ShowHintText,self.OnShowHintText,self) - + role.Event:AddEvent(BattleEventName.RoleBeExile,self.OnRoleExile,self) + role.Event:AddEvent(BattleEventName.RoleExileEnd,self.OnRoleExileEnd,self) if IsOpenBattleDebug then local URoleProperty = go:GetComponent(typeof(RoleProperty)) @@ -146,6 +147,7 @@ function EnemyView:onCreate(go, role, position, root) self.URoleProperty:AddProperty(name, value) end) end + end -- @@ -227,7 +229,16 @@ function EnemyView:Update() end end - +--角色被放逐 +function EnemyView:OnRoleExile(role) + local color = Color.New(1,1,1,0.4) + Util.SetColor(self.RoleLiveGOGraphic, color) +end +--角色放逐结束 +function EnemyView:OnRoleExileEnd(role) + local color = Color.New(1, 1, 1, 1) + Util.SetColor(self.RoleLiveGOGraphic, color) +end -- 缩放 function EnemyView:DoScale(scale, dur, func) @@ -276,7 +287,11 @@ function EnemyView:SetHighLight(isLight, eScale, dur, func) end self.hlTween3 = DoTween.To(DG.Tweening.Core.DOGetter_float( function () return sc end), DG.Tweening.Core.DOSetter_float(function (progress) - local color = Color.New(progress, progress, progress, 1) + local aaa=1 + if self.role.isExile then + aaa=0.4 + end + local color = Color.New(progress, progress, progress,aaa) Util.SetColor(self.GameObject, color) Util.SetColor(self.RoleLiveGOGraphic, color) end), ec, dur):SetEase(Ease.Linear) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index c53639b279..4150eabf57 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -155,7 +155,8 @@ function PlayerView:onCreate(go, role, position, root) role.Event:AddEvent(BattleEventName.BeSeckill, self.onBeSecKill, self) role.Event:AddEvent(BattleEventName.ShildTrigger, self.OnShieldTrigger, self) role.Event:AddEvent(BattleEventName.ShowHintText,self.OnShowHintText,self) - + role.Event:AddEvent(BattleEventName.RoleBeExile,self.OnRoleExile,self) + role.Event:AddEvent(BattleEventName.RoleExileEnd,self.OnRoleExileEnd,self) if IsOpenBattleDebug then local URoleProperty = go:GetComponent(typeof(RoleProperty)) if not URoleProperty then @@ -270,7 +271,16 @@ function PlayerView:DoScale(scale, dur, func) end) end - +--角色被放逐 +function PlayerView:OnRoleExile(role) + local color = Color.New(1, 1, 1, 0.4) + Util.SetColor(self.liveRender, color) +end +--角色放逐结束 +function PlayerView:OnRoleExileEnd(role) + local color = Color.New(1, 1, 1, 1) + Util.SetColor(self.liveRender, color) +end -- 设置高亮 function PlayerView:SetHighLight(isLight, eScale, dur, func) -- 设置变灰 diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua index d45f900a99..5d3d8abbf8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua @@ -125,7 +125,7 @@ function PokemonSingleResultPanel:UpdataPanelData(_heroData) this.heroName.text = GetLanguageStrById(heroStaticData.Name) this.Title.text = GetLanguageStrById(heroStaticData.Description) this.icon.sprite=Util.LoadSprite(artResourcesConfig[heroStaticData.Icon].Name) - this.content.text = GetLanguageStrById(passiveSkillConfig[heroStaticData.SkillArray[1][2]].Desc) + this.content.text = SubString2(GetLanguageStrById(passiveSkillConfig[heroStaticData.SkillArray[1][2]].Desc),230) this.rolePanel:SetActive(true) this.goBtn:SetActive(true) diff --git a/Assets/Scripts/Editor/CustomImportSettings.cs b/Assets/Scripts/Editor/CustomImportSettings.cs index 7d7230586c..d380c0c0a1 100644 --- a/Assets/Scripts/Editor/CustomImportSettings.cs +++ b/Assets/Scripts/Editor/CustomImportSettings.cs @@ -22,6 +22,8 @@ namespace GameEditor /// private static Dictionary> handlers = new Dictionary> { + {"/ArtFont_en/", SetUITexture}, + {"/ArtFont_vi/", SetUITexture}, //UI {"/Atlas/", SetUITexture}, {"/BG/", SetBGTexture}, @@ -64,7 +66,7 @@ namespace GameEditor { importer.spritePackingTag = GetAtlasName(importer.assetPath); importer.SetTextureSettingsExt(true, TextureImporterType.Sprite, 1, AppConst.PIXELTOWORLD, false, TextureWrapMode.Clamp, FilterMode.Trilinear, TextureImporterNPOTScale.None); - //importer.SetPlatformSettingsExt("Android", TextureImporterFormat.ETC2_RGBA8Crunched, MAX_TEXTURE_SIZE, 50, false); + importer.SetPlatformSettingsExt("Android", TextureImporterFormat.ETC2_RGBA8Crunched, MAX_TEXTURE_SIZE, 50, false); //importer.SetPlatformSettingsExt("iPhone", TextureImporterFormat.ETC2_RGBA8Crunched, MAX_TEXTURE_SIZE, 50, false); //importer.SetPlatformSettingsExt("Standalone", TextureImporterFormat.RGBA32, MAX_TEXTURE_SIZE, 50, false); } diff --git a/Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs b/Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs index af6199b22e..d3f2a5a550 100644 --- a/Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs +++ b/Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs @@ -267,6 +267,7 @@ namespace GameEditor.Core.DataConfig for (int i = 0; i < files.Length; i++) { var item = files[i]; + var itemName = Path.GetFileName(item); ThreadPool.QueueUserWorkItem(q => { if (IsFileInUse(item)) @@ -274,10 +275,10 @@ namespace GameEditor.Core.DataConfig UnityEngine.Debug.LogError("该表正在编辑,无法导出!:" + item); lock (lockObj) { - if (record.ContainsKey(item)) + if (record.ContainsKey(itemName)) { - newRecord[item] = record[item]; - record.Remove(item); + newRecord[itemName] = record[itemName]; + record.Remove(itemName); } count++; } @@ -285,7 +286,7 @@ namespace GameEditor.Core.DataConfig } string crc = FileToCRC32.GetFileCRC32(item); - bool isChanged = !record.ContainsKey(item) || record[item] != crc; + bool isChanged = !record.ContainsKey(itemName) || record[itemName] != crc; if (!isIncrement || (isIncrement && isChanged)) { lock (lockObj) @@ -296,10 +297,10 @@ namespace GameEditor.Core.DataConfig } lock (lockObj) { - newRecord[item] = crc; - if (record.ContainsKey(item)) + newRecord[itemName] = crc; + if (record.ContainsKey(itemName)) { - record.Remove(item); + record.Remove(itemName); } count++; } diff --git a/Assets/Scripts/Editor/LanguageTool/ArtFontWindow.cs b/Assets/Scripts/Editor/LanguageTool/ArtFontWindow.cs index a16b1ac259..7b63d61785 100644 --- a/Assets/Scripts/Editor/LanguageTool/ArtFontWindow.cs +++ b/Assets/Scripts/Editor/LanguageTool/ArtFontWindow.cs @@ -157,6 +157,8 @@ namespace GameEditor.FrameTool if (GUILayout.Button("导入", GUILayout.Height(50))) { + m_ImportArt.Clear(); + m_UnImportArt.Clear(); m_ArtFontLists[LanguageType.ZH] = GetAllArtFont(LanguageType.ZH); if (m_ChooseAll) { diff --git a/data_execl/Language_data/LanguageText.csv b/data_execl/Language_data/LanguageText.csv index 26f356f659..fbd298db5b 100644 --- a/data_execl/Language_data/LanguageText.csv +++ b/data_execl/Language_data/LanguageText.csv @@ -1371,7 +1371,7 @@ 11371, 11372,Ƿ 100000000 11373,\ 100ս -11374,"\""ÿÿÿÿÿÿ족" +11374,\"\"\"ÿÿÿÿÿÿ족\" 11375,13ֻƤƤϺ 11376,ѰԨ֮\Ȫˮ 11377,໴ħ @@ -1557,7 +1557,7 @@ 11557,ɽӰ 11558, 11559,ɰɰɰɰɰɰɰɰɰɰɰɰɰɰɰɰɰ -11560," " +11560,\" \" 11561,츳 11562,ɰɰɰɰɰɰɰɰɰɰɰɰɰɰɰɰɰ 11563,5ˣ0/5 @@ -1963,3 +1963,9 @@ 11963,ϷԴ... 11964,ս\n 11965,\n +11966,Ѫðµ˵λ˵ڰŶм¼ѣЧ +11967, ׷ ׷ +11968,طְҵطְҵطְҵطְҵطְҵطְҵ +11969,ɰ +11970,\"ÿÿÿÿÿÿ족 +11971,