From 58d08c65cc77754d16f04b6216c5fdf9cf8da174 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 13 Dec 2021 14:31:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=E6=88=98=E6=96=97buff=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Atlas/BattleAtlas/Buff/r_buff_mihun.png | Bin 0 -> 3081 bytes .../BattleAtlas/Buff/r_buff_mihun.png.meta | 110 ++++++++++++++++++ .../Atlas/BattleAtlas/Buff/r_buff_pojia.png | Bin 0 -> 2834 bytes .../BattleAtlas/Buff/r_buff_pojia.png.meta | 110 ++++++++++++++++++ .../FloatingViewAtlas/ArtFont/mihun_zh.png | Bin 0 -> 6734 bytes .../ArtFont/mihun_zh.png.meta | 110 ++++++++++++++++++ .../FloatingViewAtlas/ArtFont/pojia_zh.png | Bin 0 -> 5561 bytes .../ArtFont/pojia_zh.png.meta | 110 ++++++++++++++++++ 8 files changed, 440 insertions(+) create mode 100644 Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buff_mihun.png create mode 100644 Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buff_mihun.png.meta create mode 100644 Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buff_pojia.png create mode 100644 Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buff_pojia.png.meta create mode 100644 Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/mihun_zh.png create mode 100644 Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/mihun_zh.png.meta create mode 100644 Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/pojia_zh.png create mode 100644 Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/pojia_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buff_mihun.png b/Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buff_mihun.png new file mode 100644 index 0000000000000000000000000000000000000000..06c4c174c784ba755f9783fc08a3aad93a2db76f GIT binary patch literal 3081 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 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buff_mihun.png.meta b/Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buff_mihun.png.meta new file mode 100644 index 0000000000..cab1120a91 --- /dev/null +++ b/Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buff_mihun.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 4a6c02b8a9746484ea31f19484de2a4f +TextureImporter: + fileIDToRecycleName: {} + 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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 397790bb7b427d14eba12938336cd980 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: BattleAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buff_pojia.png b/Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buff_pojia.png new file mode 100644 index 0000000000000000000000000000000000000000..e85d39433fe921b728f1a31129892224accdbd4c GIT binary patch literal 2834 zcmaJ@dpMMN8y-0&r%E{unx#aVqdAxnGG>%Aj)OrCgV!|69GV$s7!qyHtkbGUCzXwj zVp1E5jf9lR<`a@BwnS)i$fCZ{*6#Pme*0e6`~H5QkriNgaR7#J2BjznW1I6MrAwMOIdJ0U0p(gu#Ofg`Po{1e71g7SKgdHs9=P z1QNgx=P|hgCWj4KjYtpU#0cz6 zL^RpP29LGI5J^}hlI&!IbHvL{9NC#{Lw0h)edW5a`2spS9Qev*{>?@GE0^HJ1Ly({ zkILahf1RGkL5_gKKgi)ioSastg@ai5G1(CuA>VSfy2U}_{T*T0fwI_jDc}HixCizn_|@I zt8}F#RGOZ1^E)54Ti>t+cG zzHD!{8}Itmb+KmXs=l_bcRih#ZL1Mi`nyoUMz}Fq-8jl}8*=&mI`e6fCrH;d?1-Ow z^Q_v_9jSqHbBb4B!HIu}XYX!pP`b;p&R99TZ+DVOjQY#PHthA@%)#ncn6r1%?6m>7G@v_M>Q?_f< z7Kft@dkZ3K4iB-{+UvG8<`2FYJ1sZ`Ylybw;~8 z$ZqZ0Jhw+Z@t&~0lp%lbYqE0<2=TWnx8b>U*mi$F1{!e72m25>$npY?xosLkzOL zAH;Y%;#_m7( zm96n3zbnfagWlH|?gl0wUq_9>vbOrq+}NO&v9(SsD`zP;bP%@$uN$5L0f^i6lS>Ld zP&SP+psZtQZx$P!IySr#VsLu6_1mbNUZnn;9t4+&d;oJP)}cT@IHgjUwi}%4i?0|t zYfaX$T5q`v>7SDK{ed&syI-1Mv!l7EGgJ_yqu>z+{l=}gtu1&<@Uwa_I7=I(H&E36 zK|0^z-3Fq|&l~`w>C&8^`)6Bs4DDj5#1bAI)XKe|Vjk2P z-!Z@Dp*H0mdOQFT};>NpJeKT5~PGTar?w(4y z5%*8uly88sqT&^OGz0OY`xhH$_;5gV;T5dmaRdm$(_2{^%Ye8g5xx+@%83 z_8kkUYM$FI1TK@fmwU6`8&4rJ4GhknC;^qyY$={wGj=vf@qc^InHv zB}R<0g;)VIKI=i7M`4vA{JambAoJRubp0YpjHTMnb>_w<4{yESM_)fQX&H-g&%Z7! zF0j^=u(#)xA+?S~i#wwxJl)%()d(%FFZh4R=)qnFq3u$d0P|+mY&OWTQFxpM5LTg@la%6$To4=H3{3=xapJ#ASxL_Tr>I;))e zYSt2awzgV%dbw(?s{0eBP|afemyS5yg6YaYPV><&U8{w{7-~7C;^p;UIB{Cf3L~YZ zWDSqsE?uj`d!$Z(ytxS%!rYS>XycO+xYD@r`}RT4_n*8%o$IlfA3A^=O(+L#D?K=A zxM|4DvQSDZxH&ER==%#ECBJ#of zUD@uKMPy@RoN9r7J2qwVJvc365I6>uzz(FVLDoTC^@)r$}3e$m&-|ON^FZOZy5g`og*|umj%4BbAok9F z->WP6$G2wG%on}5IdjUQW5M_bdP{l~qXJk~?&JRKadb8&j1bWCq%T=`W2&vTP2JTu}C*czg1~#Mc&ef7txYKUZC6d8A;6vP9R;+;gau0 zl)PoTbsgOCq_|TBHHV9r5>p*UpRYgDm2*Z}9|RsT{>J0Jal`6gstehTR80&``7eNX B#~uIx literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buff_pojia.png.meta b/Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buff_pojia.png.meta new file mode 100644 index 0000000000..4324b0c741 --- /dev/null +++ b/Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buff_pojia.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 596a14268bcf86c4bb988f612d78b596 +TextureImporter: + fileIDToRecycleName: {} + 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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 73e8ab2d6fa5aa34ab3705d520b034b8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: BattleAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/mihun_zh.png b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/mihun_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..6d482507b636bb71a8e18e058a240bb3bcc549c7 GIT binary patch literal 6734 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 Hu0mjf9RBCg literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/pojia_zh.png.meta b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/pojia_zh.png.meta new file mode 100644 index 0000000000..e5c957ef17 --- /dev/null +++ b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/pojia_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 002d8e7543c029646a053f0466d104ed +TextureImporter: + fileIDToRecycleName: {} + 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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 197bc6d56bfc2064c8553b6d20cad1b3 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FloatingViewAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: From 23467d0ff6856d26534ea85b568f61d83e0175c7 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 13 Dec 2021 14:52:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D?= =?UTF-8?q?=E5=8F=98=E8=BA=AB=E5=8D=A1=E5=A4=8D=E6=B4=BB=E6=9C=BA=E5=88=B6?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua | 1 + .../Battle/Logic/Monster/MonsterSkill/MTrigger.lua | 10 ++++++++++ .../~Lua/Modules/Battle/Logic/Role/RoleManager.lua | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index 4e6faf4279..49ded718ac 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -194,6 +194,7 @@ BattleEventName = { PassiveChangeIgnoreDef = indexAdd(),--被动改变无视防御比例 PassiveChangeDefDMGReFac = indexAdd(),--被动改变防御方减伤比例 PassiveChangeRoleHit = indexAdd(),--被动改变角色命中 + RoleIsVanish = indexAdd(), -- 角色已经从显示层消失 } diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua index 957211e94f..604f285101 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua @@ -184,6 +184,16 @@ local _TriggerConfig = { end, }, + [BattleEventName.RoleIsVanish]={ + [15]=function(skill, ...) + local args={...} + local role=RoleManager.GetDeadRole(skill.owner.camp) + if role and role:IsRealDead() then + return true + end + return false + end, + }, } function MTrigger.Init() diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleManager.lua index 8ae289047b..0923fb8e2d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleManager.lua @@ -116,6 +116,9 @@ function this.CheckDead() end for _, pos in ipairs(removePos) do table.insert(RealDeadList,_DeadRoleList[pos]) + BattleLogic.WaitForTrigger(1,function() + BattleLogic.Event:DispatchEvent(BattleEventName.RoleIsVanish,RealDeadList) + end) _DeadRoleList[pos] = nil end @@ -132,11 +135,13 @@ function this.CheckRelive() local removePos = {} for pos, role in pairs(_ReliveRoleList) do if role:Relive() then + table.removebyvalue(RealDeadList,role) isReliveFrame = true table.insert(removePos, pos) end end for _, pos in ipairs(removePos) do + _ReliveRoleList[pos] = nil end return isReliveFrame