From 7d20a309a4e1b2e0480846d470b0e852eef022a8 Mon Sep 17 00:00:00 2001 From: lihaiyang <419983115@qq.com> Date: Fri, 3 Mar 2023 15:18:03 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8E=8B=E5=88=B6?= =?UTF-8?q?=E6=96=B9=E9=9D=A2=E7=9A=84=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Atlas/BattleAtlas/Buff/r_buf_yazhi.png | Bin 0 -> 2479 bytes .../BattleAtlas/Buff/r_buf_yazhi.png.meta | 110 ++++++++++++++++++ .../ArtFont/z_zhandou_yazhi_zh.png | Bin 0 -> 5248 bytes .../ArtFont/z_zhandou_yazhi_zh.png.meta | 110 ++++++++++++++++++ 4 files changed, 220 insertions(+) create mode 100644 Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buf_yazhi.png create mode 100644 Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buf_yazhi.png.meta create mode 100644 Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_yazhi_zh.png create mode 100644 Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_yazhi_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buf_yazhi.png b/Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buf_yazhi.png new file mode 100644 index 0000000000000000000000000000000000000000..82635c223f3d5b04b1dc892501b2691fd8daa1f7 GIT binary patch literal 2479 zcmV;g2~hTlP)}xAGMVLHIz^$m z;WPuXT;~chmToWrkDd=OZym_@{Rp`)RvDtWF-U|%ABqz%D?0t8$z2tpT?e_Bp z_=wP8GvGKEaHpG_xp+h#!}CXR-`shfvL4yDmuUr8(yw>s`D(Gn&{J?~IE+rO5DJAz z>)W5=_e(KbtzF7|v+D~?Mx(UJa5x+t7f=;NLD#*FIt*Q|ASYI-s;|e9mQL&G2C|%~ z*zNXi!3o;2WiwWjk?J$eI5T?1Osmn-)QH1mlpsw8BSvF#C`wo0T09;+dIQ)0avJaN zuOKHcU*681(*7@YifJgi`8G-p9gnusif>u?UJ1DquVLtzLP&KI42F`(q3ty$G0Jqit)ES4THCLfO1 zpg2~yhiy&Xq`Ph>yFt&<1N(af@Ql|>-wOxyh__pSzCe(ik)yfw|6Np;g;L^c+KB?4AWw_Gi=0_^7+*#ALrf0i?Ex` z(z_ho{S`A8z1GIqiMQ$6%_O1OOa9FIca}@Pn2f~5kicv<=}rs=13R~F=Edp1rTW|B z(yfFI2K*imAFlWd$GuGxMjDX{oJd;Lu?#-cZKY+9vLNxyrcMnjf!(q3{ zYu^=(o^&lW$Bs}}RTbs>X4jWIIC&BojuiB&ib2z)R_a??7?MAd@wZQ5`KLRguI2t` zp5wZ^?#1o%Vbtq8T`l2=%?1PYElpBGg_CbgDs=BtPqTAVS=`vhRVz^fKHOoI7gw*N zxuHRh3m0>F!D!Mldne5E(2EOD6g?Z3y-9|{ku>Zj01Sjeq+6~0^Kb8T3Q%uo6MMUO zJ}<9Y8~2~dY++>4#H4Z^q{)wfGxhN&IPm3vs6OyDR&%1iRAPl1M9jSKB7DIBpR6xo zd)dE|PVP)kCu_h(Y}-%@nhL7QPo~}lR=Z4CQNs{!Z=tppYHz`~=TwJ-i8tR$eRHe4 zRGn&2Q#CxnAa8EmLZK^--p*83y}p>-f&wfSo8&ohq=Ju1OQ<Qg zpusfM)k%$L0&p-Gv!B>SwMfL!qCdsgO?Uo+HE+I-`@5P1EsA_lvYlyd<;S;AVa7`f z*s$`iyzi)6l?_ z2d4AD>^bq^qR(1PSnB{>wr(vi&3G7BdRm+<>T@zu=ZXiB9T#3VnVj5Q24-h-Y|iy8`IG`8h*kpq#>21Q}prZV1H@;WAip2pf* z>7@7U_?+oe?m!KOxGFEN%?{h`GaTaZp+g)yd>E^x!)eFgV!`b9OO;>HuP;x}UqH_A zOL6t-Lt)W`xFdP;nR(24>`|;HlYBvnCE;{M3x>ihTl9(qEz&N%qDZ^dLILpk5^VCR zIdhmWb_^M*9WEydP~>;c6g&96aW-@7ZMU|`i}Ci!G#EE#G=s9UsXTI+%rs|5Fx4~~ zTUr=bG?7WyUPCw(qGa6%Y~EBRr<7T~IC43k7Pl6@wzb2miaz4J6#NM;!67l`5 z6)RZ1dNt{(sT~>=s&8s+Rm_tWp^>d~X(dBQ!LL-ezY7qP$MFsXK1^pZp!wb*H0Qxh|P za}QUK9n<4oi;vImr`6L+FK1f2DRwQB15|G`4dVw z#DtOgJ)Yd6X;{R2vftPF#yT+H=E^D&o5oZpx(V0+^=6Z zw%8Sz?g5JAVEV#8ay5$P}KVlM+ZY7I#3_VKy2$RbS81lc%`iq6@Joy0g-!aO47!b+y4PULE=5Eb=*r~Ayb(;w9iFJUNSd~M>o(~H#5$rc8a@n{(-EJw zM7rnKZeZh{{W$Da99CPmRj;ngZ?X>Pr?I((>vAvUSA_*+Iont_?%qe)o_(@bv$v{R zre=bgJ#GfMdec8WO~RW0vzz4jlFi$wsHtU7Rdu&oi=kEla0@WLD=v{GpK-foC^ARV z{T823=7hqqt!KS5ibx=eL1J@ey$Uw=su6cEG0VUFsxr9U!-MR6{({mw@dx@;_i)y-J tH0=WV0Iu_|^#9M~20jySqyikke*tD*qmWf8YEl3I002ovPDHLkV1hC9+I9c{ literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buf_yazhi.png.meta b/Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buf_yazhi.png.meta new file mode 100644 index 0000000000..662e0bf771 --- /dev/null +++ b/Assets/ManagedResources/Atlas/BattleAtlas/Buff/r_buf_yazhi.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 85b600947fcdbaf448c2c7f759bc7b6a +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: f1bce6d392bd6d14284b9f8441f97319 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: BattleAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_yazhi_zh.png b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_yazhi_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..0eaabd91b81e3bff35aadfcfcffa55d0e005f664 GIT binary patch literal 5248 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

qHmY01MH4!usM8gmq5Ye zN8R^W3jkdZPTq8j=6P>ZwuB!gSJi*TP{l`=B!baxb@BteRUUacQbJV7()|$)f3%O@ zx4Z9mo5Sbb_bYF5_mKY&f&;f{^Sd$B4NKhuJ9G{I4&azuFf?d)ucC}|UvMsZoz$=C z|0-NBK%JFkUXhj|^XM~Sz6Ky~l}8-_(H1QEh(Vd-82lgPMK%hqvShXZ0000 Date: Tue, 28 Mar 2023 10:25:45 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E5=8E=BB=E6=8E=89gm?= =?UTF-8?q?=E7=A4=BC=E5=8C=85=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua index c8b97f9cdd..5452d58bb7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua @@ -214,13 +214,13 @@ function this.OnTabChange(index, lastIndex) if this._CurChannel == CHAT_CHANNEL.FAMILY or this._CurChannel == CHAT_CHANNEL.GLOBAL or this._CurChannel == CHAT_CHANNEL.JUMP_SERVER then local mission=ActivityGiftManager.GetActivityInfo(ActivityTypeDef.shuaChongTeQuan,2202) local state=mission.state - if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.CHAT) and state>0 then + if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.CHAT) then this.input:SetActive(true) this.noInputTip:SetActive(false) else this.input:SetActive(false) this.noInputTip:SetActive(true) - this.noInputTip:GetComponent("Text").text = "等级达到20级且开通超级GM特权才可发言" + this.noInputTip:GetComponent("Text").text = "等级达到20级才可发言" end elseif this._CurChannel == CHAT_CHANNEL.FRIEND or this._CurChannel == CHAT_CHANNEL.SYSTEM then this.input:SetActive(false) From a2b791c0de8c0313993900a8749b51ad6ed26ecb Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 29 Mar 2023 13:10:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=88=98=E6=96=97=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Message/CommonProto_pb.lua | 203 +++++++++++++++--- 1 file changed, 178 insertions(+), 25 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua index 4a3423b2d7..afb9df6380 100644 --- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua @@ -109,6 +109,7 @@ FIGHTUNITINFO_PROPERTYID_FIELD = protobuf.FieldDescriptor(); FIGHTTEAMINFO = protobuf.Descriptor(); FIGHTTEAMINFO_FIGHTUNITLIST_FIELD = protobuf.FieldDescriptor(); FIGHTTEAMINFO_POKEMONUNITLIST_FIELD = protobuf.FieldDescriptor(); +FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD = protobuf.FieldDescriptor(); FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD = protobuf.FieldDescriptor(); FIGHTTEAMINFO_SPECIALPASSIVE_FIELD = protobuf.FieldDescriptor(); FIGHTTEAMINFO_FIRSTCAMP_FIELD = protobuf.FieldDescriptor(); @@ -140,12 +141,19 @@ MAIL_SENDNAME_FIELD = protobuf.FieldDescriptor(); MAIL_MAILTYPE_FIELD = protobuf.FieldDescriptor(); MAIL_ISTOP_FIELD = protobuf.FieldDescriptor(); MAIL_MARKTYPE_FIELD = protobuf.FieldDescriptor(); +MAGICSOLDIER = protobuf.Descriptor(); +MAGICSOLDIER_ID_FIELD = protobuf.FieldDescriptor(); +MAGICSOLDIER_TMPID_FIELD = protobuf.FieldDescriptor(); +MAGICSOLDIER_LEVEL_FIELD = protobuf.FieldDescriptor(); +MAGICSOLDIER_STAR_FIELD = protobuf.FieldDescriptor(); +MAGICSOLDIER_POINT_FIELD = protobuf.FieldDescriptor(); DROP = protobuf.Descriptor(); DROP_ITEMLIST_FIELD = protobuf.FieldDescriptor(); DROP_EQUIPID_FIELD = protobuf.FieldDescriptor(); DROP_HERO_FIELD = protobuf.FieldDescriptor(); DROP_SOULEQUIP_FIELD = protobuf.FieldDescriptor(); DROP_POKEMON_FIELD = protobuf.FieldDescriptor(); +DROP_MAGICSOLDIER_FIELD = protobuf.FieldDescriptor(); GMCOMMAND = protobuf.Descriptor(); GMCOMMAND_COMMAND_FIELD = protobuf.FieldDescriptor(); TEAMHEROINFO = protobuf.Descriptor(); @@ -513,6 +521,7 @@ TEAMSIMPLEINFO_PROPERTYID_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO = protobuf.Descriptor(); TEAMONETEAMINFO_TEAM_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor(); +TEAMONETEAMINFO_MAGICSOLDIER_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_TOTALFORCE_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_REMAINHP_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_SEALSHOW_FIELD = protobuf.FieldDescriptor(); @@ -898,6 +907,11 @@ COMPARENUMLEVELUSERINFO_TIME_FIELD = protobuf.FieldDescriptor(); COMPARENUMLEVELINFO = protobuf.Descriptor(); COMPARENUMLEVELINFO_LEVELID_FIELD = protobuf.FieldDescriptor(); COMPARENUMLEVELINFO_USERINFO_FIELD = protobuf.FieldDescriptor(); +DUODUIINFO = protobuf.Descriptor(); +DUODUIINFO_TYPE_FIELD = protobuf.FieldDescriptor(); +DUODUIINFO_TIER_FIELD = protobuf.FieldDescriptor(); +DUODUIINFO_RANK_FIELD = protobuf.FieldDescriptor(); +DUODUIINFO_TIME_FIELD = protobuf.FieldDescriptor(); ERRORRESPONSE_ERRCODE_FIELD.name = "errCode" ERRORRESPONSE_ERRCODE_FIELD.full_name = ".rpc.protocols.ErrorResponse.errCode" @@ -1913,10 +1927,21 @@ FIGHTTEAMINFO_POKEMONUNITLIST_FIELD.message_type = FIGHTUNITINFO FIGHTTEAMINFO_POKEMONUNITLIST_FIELD.type = 11 FIGHTTEAMINFO_POKEMONUNITLIST_FIELD.cpp_type = 10 +FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.name = "MagicSoldierList" +FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.full_name = ".rpc.protocols.FightTeamInfo.MagicSoldierList" +FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.number = 3 +FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.index = 2 +FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.label = 3 +FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.has_default_value = false +FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.default_value = {} +FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.message_type = FIGHTUNITINFO +FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.type = 11 +FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.cpp_type = 10 + FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.name = "teamPassiveList" FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.full_name = ".rpc.protocols.FightTeamInfo.teamPassiveList" -FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.number = 3 -FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.index = 2 +FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.number = 4 +FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.index = 3 FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.label = 1 FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.has_default_value = false FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.default_value = "" @@ -1925,8 +1950,8 @@ FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.cpp_type = 9 FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.name = "specialPassive" FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.full_name = ".rpc.protocols.FightTeamInfo.specialPassive" -FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.number = 4 -FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.index = 3 +FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.number = 5 +FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.index = 4 FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.label = 1 FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.has_default_value = false FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.default_value = "" @@ -1935,8 +1960,8 @@ FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.cpp_type = 9 FIGHTTEAMINFO_FIRSTCAMP_FIELD.name = "firstCamp" FIGHTTEAMINFO_FIRSTCAMP_FIELD.full_name = ".rpc.protocols.FightTeamInfo.firstCamp" -FIGHTTEAMINFO_FIRSTCAMP_FIELD.number = 5 -FIGHTTEAMINFO_FIRSTCAMP_FIELD.index = 4 +FIGHTTEAMINFO_FIRSTCAMP_FIELD.number = 6 +FIGHTTEAMINFO_FIRSTCAMP_FIELD.index = 5 FIGHTTEAMINFO_FIRSTCAMP_FIELD.label = 1 FIGHTTEAMINFO_FIRSTCAMP_FIELD.has_default_value = false FIGHTTEAMINFO_FIRSTCAMP_FIELD.default_value = 0 @@ -1945,8 +1970,8 @@ FIGHTTEAMINFO_FIRSTCAMP_FIELD.cpp_type = 1 FIGHTTEAMINFO_FORCESCORE_FIELD.name = "forceScore" FIGHTTEAMINFO_FORCESCORE_FIELD.full_name = ".rpc.protocols.FightTeamInfo.forceScore" -FIGHTTEAMINFO_FORCESCORE_FIELD.number = 6 -FIGHTTEAMINFO_FORCESCORE_FIELD.index = 5 +FIGHTTEAMINFO_FORCESCORE_FIELD.number = 7 +FIGHTTEAMINFO_FORCESCORE_FIELD.index = 6 FIGHTTEAMINFO_FORCESCORE_FIELD.label = 1 FIGHTTEAMINFO_FORCESCORE_FIELD.has_default_value = false FIGHTTEAMINFO_FORCESCORE_FIELD.default_value = 0 @@ -1957,7 +1982,7 @@ FIGHTTEAMINFO.name = "FightTeamInfo" FIGHTTEAMINFO.full_name = ".rpc.protocols.FightTeamInfo" FIGHTTEAMINFO.nested_types = {} FIGHTTEAMINFO.enum_types = {} -FIGHTTEAMINFO.fields = {FIGHTTEAMINFO_FIGHTUNITLIST_FIELD, FIGHTTEAMINFO_POKEMONUNITLIST_FIELD, FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD, FIGHTTEAMINFO_SPECIALPASSIVE_FIELD, FIGHTTEAMINFO_FIRSTCAMP_FIELD, FIGHTTEAMINFO_FORCESCORE_FIELD} +FIGHTTEAMINFO.fields = {FIGHTTEAMINFO_FIGHTUNITLIST_FIELD, FIGHTTEAMINFO_POKEMONUNITLIST_FIELD, FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD, FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD, FIGHTTEAMINFO_SPECIALPASSIVE_FIELD, FIGHTTEAMINFO_FIRSTCAMP_FIELD, FIGHTTEAMINFO_FORCESCORE_FIELD} FIGHTTEAMINFO.is_extendable = false FIGHTTEAMINFO.extensions = {} EVENTBEHAVIORVALUES_BEHAVIORVALUES_FIELD.name = "behaviorValues" @@ -2216,6 +2241,63 @@ MAIL.enum_types = {} MAIL.fields = {MAIL_MAILID_FIELD, MAIL_STATE_FIELD, MAIL_HEAD_FIELD, MAIL_CONTENT_FIELD, MAIL_MAILITEM_FIELD, MAIL_SENDTIME_FIELD, MAIL_EFFECTIVETIME_FIELD, MAIL_SENDNAME_FIELD, MAIL_MAILTYPE_FIELD, MAIL_ISTOP_FIELD, MAIL_MARKTYPE_FIELD} MAIL.is_extendable = false MAIL.extensions = {} +MAGICSOLDIER_ID_FIELD.name = "id" +MAGICSOLDIER_ID_FIELD.full_name = ".rpc.protocols.MagicSoldier.id" +MAGICSOLDIER_ID_FIELD.number = 1 +MAGICSOLDIER_ID_FIELD.index = 0 +MAGICSOLDIER_ID_FIELD.label = 1 +MAGICSOLDIER_ID_FIELD.has_default_value = false +MAGICSOLDIER_ID_FIELD.default_value = "" +MAGICSOLDIER_ID_FIELD.type = 9 +MAGICSOLDIER_ID_FIELD.cpp_type = 9 + +MAGICSOLDIER_TMPID_FIELD.name = "tmpId" +MAGICSOLDIER_TMPID_FIELD.full_name = ".rpc.protocols.MagicSoldier.tmpId" +MAGICSOLDIER_TMPID_FIELD.number = 2 +MAGICSOLDIER_TMPID_FIELD.index = 1 +MAGICSOLDIER_TMPID_FIELD.label = 1 +MAGICSOLDIER_TMPID_FIELD.has_default_value = false +MAGICSOLDIER_TMPID_FIELD.default_value = 0 +MAGICSOLDIER_TMPID_FIELD.type = 5 +MAGICSOLDIER_TMPID_FIELD.cpp_type = 1 + +MAGICSOLDIER_LEVEL_FIELD.name = "level" +MAGICSOLDIER_LEVEL_FIELD.full_name = ".rpc.protocols.MagicSoldier.level" +MAGICSOLDIER_LEVEL_FIELD.number = 3 +MAGICSOLDIER_LEVEL_FIELD.index = 2 +MAGICSOLDIER_LEVEL_FIELD.label = 1 +MAGICSOLDIER_LEVEL_FIELD.has_default_value = false +MAGICSOLDIER_LEVEL_FIELD.default_value = 0 +MAGICSOLDIER_LEVEL_FIELD.type = 5 +MAGICSOLDIER_LEVEL_FIELD.cpp_type = 1 + +MAGICSOLDIER_STAR_FIELD.name = "star" +MAGICSOLDIER_STAR_FIELD.full_name = ".rpc.protocols.MagicSoldier.star" +MAGICSOLDIER_STAR_FIELD.number = 4 +MAGICSOLDIER_STAR_FIELD.index = 3 +MAGICSOLDIER_STAR_FIELD.label = 1 +MAGICSOLDIER_STAR_FIELD.has_default_value = false +MAGICSOLDIER_STAR_FIELD.default_value = 0 +MAGICSOLDIER_STAR_FIELD.type = 5 +MAGICSOLDIER_STAR_FIELD.cpp_type = 1 + +MAGICSOLDIER_POINT_FIELD.name = "point" +MAGICSOLDIER_POINT_FIELD.full_name = ".rpc.protocols.MagicSoldier.point" +MAGICSOLDIER_POINT_FIELD.number = 5 +MAGICSOLDIER_POINT_FIELD.index = 4 +MAGICSOLDIER_POINT_FIELD.label = 1 +MAGICSOLDIER_POINT_FIELD.has_default_value = false +MAGICSOLDIER_POINT_FIELD.default_value = 0 +MAGICSOLDIER_POINT_FIELD.type = 5 +MAGICSOLDIER_POINT_FIELD.cpp_type = 1 + +MAGICSOLDIER.name = "MagicSoldier" +MAGICSOLDIER.full_name = ".rpc.protocols.MagicSoldier" +MAGICSOLDIER.nested_types = {} +MAGICSOLDIER.enum_types = {} +MAGICSOLDIER.fields = {MAGICSOLDIER_ID_FIELD, MAGICSOLDIER_TMPID_FIELD, MAGICSOLDIER_LEVEL_FIELD, MAGICSOLDIER_STAR_FIELD, MAGICSOLDIER_POINT_FIELD} +MAGICSOLDIER.is_extendable = false +MAGICSOLDIER.extensions = {} DROP_ITEMLIST_FIELD.name = "itemlist" DROP_ITEMLIST_FIELD.full_name = ".rpc.protocols.Drop.itemlist" DROP_ITEMLIST_FIELD.number = 1 @@ -2271,11 +2353,22 @@ DROP_POKEMON_FIELD.message_type = POKEMONINFO DROP_POKEMON_FIELD.type = 11 DROP_POKEMON_FIELD.cpp_type = 10 +DROP_MAGICSOLDIER_FIELD.name = "magicSoldier" +DROP_MAGICSOLDIER_FIELD.full_name = ".rpc.protocols.Drop.magicSoldier" +DROP_MAGICSOLDIER_FIELD.number = 6 +DROP_MAGICSOLDIER_FIELD.index = 5 +DROP_MAGICSOLDIER_FIELD.label = 3 +DROP_MAGICSOLDIER_FIELD.has_default_value = false +DROP_MAGICSOLDIER_FIELD.default_value = {} +DROP_MAGICSOLDIER_FIELD.message_type = MAGICSOLDIER +DROP_MAGICSOLDIER_FIELD.type = 11 +DROP_MAGICSOLDIER_FIELD.cpp_type = 10 + DROP.name = "Drop" DROP.full_name = ".rpc.protocols.Drop" DROP.nested_types = {} DROP.enum_types = {} -DROP.fields = {DROP_ITEMLIST_FIELD, DROP_EQUIPID_FIELD, DROP_HERO_FIELD, DROP_SOULEQUIP_FIELD, DROP_POKEMON_FIELD} +DROP.fields = {DROP_ITEMLIST_FIELD, DROP_EQUIPID_FIELD, DROP_HERO_FIELD, DROP_SOULEQUIP_FIELD, DROP_POKEMON_FIELD, DROP_MAGICSOLDIER_FIELD} DROP.is_extendable = false DROP.extensions = {} GMCOMMAND_COMMAND_FIELD.name = "command" @@ -5763,10 +5856,21 @@ TEAMONETEAMINFO_POKEMONINFOS_FIELD.message_type = TEAMSIMPLEINFO TEAMONETEAMINFO_POKEMONINFOS_FIELD.type = 11 TEAMONETEAMINFO_POKEMONINFOS_FIELD.cpp_type = 10 +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.name = "MagicSoldier" +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.MagicSoldier" +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.number = 3 +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.index = 2 +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.label = 3 +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.has_default_value = false +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.default_value = {} +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.message_type = TEAMSIMPLEINFO +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.type = 11 +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.cpp_type = 10 + TEAMONETEAMINFO_TOTALFORCE_FIELD.name = "totalForce" TEAMONETEAMINFO_TOTALFORCE_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.totalForce" -TEAMONETEAMINFO_TOTALFORCE_FIELD.number = 3 -TEAMONETEAMINFO_TOTALFORCE_FIELD.index = 2 +TEAMONETEAMINFO_TOTALFORCE_FIELD.number = 4 +TEAMONETEAMINFO_TOTALFORCE_FIELD.index = 3 TEAMONETEAMINFO_TOTALFORCE_FIELD.label = 1 TEAMONETEAMINFO_TOTALFORCE_FIELD.has_default_value = false TEAMONETEAMINFO_TOTALFORCE_FIELD.default_value = 0 @@ -5775,8 +5879,8 @@ TEAMONETEAMINFO_TOTALFORCE_FIELD.cpp_type = 1 TEAMONETEAMINFO_REMAINHP_FIELD.name = "remainHp" TEAMONETEAMINFO_REMAINHP_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.remainHp" -TEAMONETEAMINFO_REMAINHP_FIELD.number = 4 -TEAMONETEAMINFO_REMAINHP_FIELD.index = 3 +TEAMONETEAMINFO_REMAINHP_FIELD.number = 5 +TEAMONETEAMINFO_REMAINHP_FIELD.index = 4 TEAMONETEAMINFO_REMAINHP_FIELD.label = 3 TEAMONETEAMINFO_REMAINHP_FIELD.has_default_value = false TEAMONETEAMINFO_REMAINHP_FIELD.default_value = {} @@ -5785,8 +5889,8 @@ TEAMONETEAMINFO_REMAINHP_FIELD.cpp_type = 2 TEAMONETEAMINFO_SEALSHOW_FIELD.name = "sealShow" TEAMONETEAMINFO_SEALSHOW_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.sealShow" -TEAMONETEAMINFO_SEALSHOW_FIELD.number = 5 -TEAMONETEAMINFO_SEALSHOW_FIELD.index = 4 +TEAMONETEAMINFO_SEALSHOW_FIELD.number = 6 +TEAMONETEAMINFO_SEALSHOW_FIELD.index = 5 TEAMONETEAMINFO_SEALSHOW_FIELD.label = 3 TEAMONETEAMINFO_SEALSHOW_FIELD.has_default_value = false TEAMONETEAMINFO_SEALSHOW_FIELD.default_value = {} @@ -5796,8 +5900,8 @@ TEAMONETEAMINFO_SEALSHOW_FIELD.cpp_type = 10 TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.name = "transformationCardInfo" TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.transformationCardInfo" -TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.number = 6 -TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.index = 5 +TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.number = 7 +TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.index = 6 TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.label = 3 TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.has_default_value = false TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.default_value = {} @@ -5807,8 +5911,8 @@ TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.cpp_type = 10 TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.name = "sixiangxinfaInfo" TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.sixiangxinfaInfo" -TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.number = 7 -TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.index = 6 +TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.number = 8 +TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.index = 7 TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.label = 3 TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.has_default_value = false TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.default_value = {} @@ -5818,8 +5922,8 @@ TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.cpp_type = 10 TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.name = "lifeGridInfo" TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.lifeGridInfo" -TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.number = 8 -TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.index = 7 +TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.number = 9 +TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.index = 8 TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.label = 3 TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.has_default_value = false TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.default_value = {} @@ -5829,8 +5933,8 @@ TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.cpp_type = 10 TEAMONETEAMINFO_USERMOUNTINFO_FIELD.name = "userMountInfo" TEAMONETEAMINFO_USERMOUNTINFO_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.userMountInfo" -TEAMONETEAMINFO_USERMOUNTINFO_FIELD.number = 9 -TEAMONETEAMINFO_USERMOUNTINFO_FIELD.index = 8 +TEAMONETEAMINFO_USERMOUNTINFO_FIELD.number = 10 +TEAMONETEAMINFO_USERMOUNTINFO_FIELD.index = 9 TEAMONETEAMINFO_USERMOUNTINFO_FIELD.label = 3 TEAMONETEAMINFO_USERMOUNTINFO_FIELD.has_default_value = false TEAMONETEAMINFO_USERMOUNTINFO_FIELD.default_value = {} @@ -5842,7 +5946,7 @@ TEAMONETEAMINFO.name = "TeamOneTeamInfo" TEAMONETEAMINFO.full_name = ".rpc.protocols.TeamOneTeamInfo" TEAMONETEAMINFO.nested_types = {} TEAMONETEAMINFO.enum_types = {} -TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD, TEAMONETEAMINFO_SEALSHOW_FIELD, TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD, TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD, TEAMONETEAMINFO_LIFEGRIDINFO_FIELD, TEAMONETEAMINFO_USERMOUNTINFO_FIELD} +TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_MAGICSOLDIER_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD, TEAMONETEAMINFO_SEALSHOW_FIELD, TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD, TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD, TEAMONETEAMINFO_LIFEGRIDINFO_FIELD, TEAMONETEAMINFO_USERMOUNTINFO_FIELD} TEAMONETEAMINFO.is_extendable = false TEAMONETEAMINFO.extensions = {} TEAMONEINFO_UID_FIELD.name = "uid" @@ -9440,6 +9544,53 @@ COMPARENUMLEVELINFO.enum_types = {} COMPARENUMLEVELINFO.fields = {COMPARENUMLEVELINFO_LEVELID_FIELD, COMPARENUMLEVELINFO_USERINFO_FIELD} COMPARENUMLEVELINFO.is_extendable = false COMPARENUMLEVELINFO.extensions = {} +DUODUIINFO_TYPE_FIELD.name = "type" +DUODUIINFO_TYPE_FIELD.full_name = ".rpc.protocols.DuoduiInfo.type" +DUODUIINFO_TYPE_FIELD.number = 1 +DUODUIINFO_TYPE_FIELD.index = 0 +DUODUIINFO_TYPE_FIELD.label = 1 +DUODUIINFO_TYPE_FIELD.has_default_value = false +DUODUIINFO_TYPE_FIELD.default_value = 0 +DUODUIINFO_TYPE_FIELD.type = 5 +DUODUIINFO_TYPE_FIELD.cpp_type = 1 + +DUODUIINFO_TIER_FIELD.name = "tier" +DUODUIINFO_TIER_FIELD.full_name = ".rpc.protocols.DuoduiInfo.tier" +DUODUIINFO_TIER_FIELD.number = 2 +DUODUIINFO_TIER_FIELD.index = 1 +DUODUIINFO_TIER_FIELD.label = 1 +DUODUIINFO_TIER_FIELD.has_default_value = false +DUODUIINFO_TIER_FIELD.default_value = 0 +DUODUIINFO_TIER_FIELD.type = 5 +DUODUIINFO_TIER_FIELD.cpp_type = 1 + +DUODUIINFO_RANK_FIELD.name = "rank" +DUODUIINFO_RANK_FIELD.full_name = ".rpc.protocols.DuoduiInfo.rank" +DUODUIINFO_RANK_FIELD.number = 3 +DUODUIINFO_RANK_FIELD.index = 2 +DUODUIINFO_RANK_FIELD.label = 1 +DUODUIINFO_RANK_FIELD.has_default_value = false +DUODUIINFO_RANK_FIELD.default_value = 0 +DUODUIINFO_RANK_FIELD.type = 5 +DUODUIINFO_RANK_FIELD.cpp_type = 1 + +DUODUIINFO_TIME_FIELD.name = "time" +DUODUIINFO_TIME_FIELD.full_name = ".rpc.protocols.DuoduiInfo.time" +DUODUIINFO_TIME_FIELD.number = 4 +DUODUIINFO_TIME_FIELD.index = 3 +DUODUIINFO_TIME_FIELD.label = 1 +DUODUIINFO_TIME_FIELD.has_default_value = false +DUODUIINFO_TIME_FIELD.default_value = 0 +DUODUIINFO_TIME_FIELD.type = 5 +DUODUIINFO_TIME_FIELD.cpp_type = 1 + +DUODUIINFO.name = "DuoduiInfo" +DUODUIINFO.full_name = ".rpc.protocols.DuoduiInfo" +DUODUIINFO.nested_types = {} +DUODUIINFO.enum_types = {} +DUODUIINFO.fields = {DUODUIINFO_TYPE_FIELD, DUODUIINFO_TIER_FIELD, DUODUIINFO_RANK_FIELD, DUODUIINFO_TIME_FIELD} +DUODUIINFO.is_extendable = false +DUODUIINFO.extensions = {} ActivityInfo = protobuf.Message(ACTIVITYINFO) ActivityInfo.MissionInfo = protobuf.Message(ACTIVITYINFO_MISSIONINFO) @@ -9465,6 +9616,7 @@ CompareNumLevelUserInfo = protobuf.Message(COMPARENUMLEVELUSERINFO) Creature = protobuf.Message(CREATURE) DialInfo = protobuf.Message(DIALINFO) Drop = protobuf.Message(DROP) +DuoduiInfo = protobuf.Message(DUODUIINFO) EndlessPoint = protobuf.Message(ENDLESSPOINT) EndlessRefreshInfo = protobuf.Message(ENDLESSREFRESHINFO) Equip = protobuf.Message(EQUIP) @@ -9526,6 +9678,7 @@ LikableInfo = protobuf.Message(LIKABLEINFO) LingMaiSecret = protobuf.Message(LINGMAISECRET) LingMaiSecretRecord = protobuf.Message(LINGMAISECRETRECORD) LuckWheelRewardPosInfo = protobuf.Message(LUCKWHEELREWARDPOSINFO) +MagicSoldier = protobuf.Message(MAGICSOLDIER) Mail = protobuf.Message(MAIL) MainLevelRankInfo = protobuf.Message(MAINLEVELRANKINFO) MapInfo = protobuf.Message(MAPINFO) From 8eb24fd59181d37b5ed49f670cdc645c2a2593a5 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 29 Mar 2023 15:30:25 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Message/CommonProto_pb.lua | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua index afb9df6380..d296ecab44 100644 --- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua @@ -521,7 +521,6 @@ TEAMSIMPLEINFO_PROPERTYID_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO = protobuf.Descriptor(); TEAMONETEAMINFO_TEAM_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor(); -TEAMONETEAMINFO_MAGICSOLDIER_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_TOTALFORCE_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_REMAINHP_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_SEALSHOW_FIELD = protobuf.FieldDescriptor(); @@ -529,6 +528,7 @@ TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_LIFEGRIDINFO_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_USERMOUNTINFO_FIELD = protobuf.FieldDescriptor(); +TEAMONETEAMINFO_MAGICSOLDIER_FIELD = protobuf.FieldDescriptor(); TEAMONEINFO = protobuf.Descriptor(); TEAMONEINFO_UID_FIELD = protobuf.FieldDescriptor(); TEAMONEINFO_LEVEL_FIELD = protobuf.FieldDescriptor(); @@ -5856,21 +5856,10 @@ TEAMONETEAMINFO_POKEMONINFOS_FIELD.message_type = TEAMSIMPLEINFO TEAMONETEAMINFO_POKEMONINFOS_FIELD.type = 11 TEAMONETEAMINFO_POKEMONINFOS_FIELD.cpp_type = 10 -TEAMONETEAMINFO_MAGICSOLDIER_FIELD.name = "MagicSoldier" -TEAMONETEAMINFO_MAGICSOLDIER_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.MagicSoldier" -TEAMONETEAMINFO_MAGICSOLDIER_FIELD.number = 3 -TEAMONETEAMINFO_MAGICSOLDIER_FIELD.index = 2 -TEAMONETEAMINFO_MAGICSOLDIER_FIELD.label = 3 -TEAMONETEAMINFO_MAGICSOLDIER_FIELD.has_default_value = false -TEAMONETEAMINFO_MAGICSOLDIER_FIELD.default_value = {} -TEAMONETEAMINFO_MAGICSOLDIER_FIELD.message_type = TEAMSIMPLEINFO -TEAMONETEAMINFO_MAGICSOLDIER_FIELD.type = 11 -TEAMONETEAMINFO_MAGICSOLDIER_FIELD.cpp_type = 10 - TEAMONETEAMINFO_TOTALFORCE_FIELD.name = "totalForce" TEAMONETEAMINFO_TOTALFORCE_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.totalForce" -TEAMONETEAMINFO_TOTALFORCE_FIELD.number = 4 -TEAMONETEAMINFO_TOTALFORCE_FIELD.index = 3 +TEAMONETEAMINFO_TOTALFORCE_FIELD.number = 3 +TEAMONETEAMINFO_TOTALFORCE_FIELD.index = 2 TEAMONETEAMINFO_TOTALFORCE_FIELD.label = 1 TEAMONETEAMINFO_TOTALFORCE_FIELD.has_default_value = false TEAMONETEAMINFO_TOTALFORCE_FIELD.default_value = 0 @@ -5879,8 +5868,8 @@ TEAMONETEAMINFO_TOTALFORCE_FIELD.cpp_type = 1 TEAMONETEAMINFO_REMAINHP_FIELD.name = "remainHp" TEAMONETEAMINFO_REMAINHP_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.remainHp" -TEAMONETEAMINFO_REMAINHP_FIELD.number = 5 -TEAMONETEAMINFO_REMAINHP_FIELD.index = 4 +TEAMONETEAMINFO_REMAINHP_FIELD.number = 4 +TEAMONETEAMINFO_REMAINHP_FIELD.index = 3 TEAMONETEAMINFO_REMAINHP_FIELD.label = 3 TEAMONETEAMINFO_REMAINHP_FIELD.has_default_value = false TEAMONETEAMINFO_REMAINHP_FIELD.default_value = {} @@ -5889,8 +5878,8 @@ TEAMONETEAMINFO_REMAINHP_FIELD.cpp_type = 2 TEAMONETEAMINFO_SEALSHOW_FIELD.name = "sealShow" TEAMONETEAMINFO_SEALSHOW_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.sealShow" -TEAMONETEAMINFO_SEALSHOW_FIELD.number = 6 -TEAMONETEAMINFO_SEALSHOW_FIELD.index = 5 +TEAMONETEAMINFO_SEALSHOW_FIELD.number = 5 +TEAMONETEAMINFO_SEALSHOW_FIELD.index = 4 TEAMONETEAMINFO_SEALSHOW_FIELD.label = 3 TEAMONETEAMINFO_SEALSHOW_FIELD.has_default_value = false TEAMONETEAMINFO_SEALSHOW_FIELD.default_value = {} @@ -5900,8 +5889,8 @@ TEAMONETEAMINFO_SEALSHOW_FIELD.cpp_type = 10 TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.name = "transformationCardInfo" TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.transformationCardInfo" -TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.number = 7 -TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.index = 6 +TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.number = 6 +TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.index = 5 TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.label = 3 TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.has_default_value = false TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.default_value = {} @@ -5911,8 +5900,8 @@ TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.cpp_type = 10 TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.name = "sixiangxinfaInfo" TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.sixiangxinfaInfo" -TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.number = 8 -TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.index = 7 +TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.number = 7 +TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.index = 6 TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.label = 3 TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.has_default_value = false TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.default_value = {} @@ -5922,8 +5911,8 @@ TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.cpp_type = 10 TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.name = "lifeGridInfo" TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.lifeGridInfo" -TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.number = 9 -TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.index = 8 +TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.number = 8 +TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.index = 7 TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.label = 3 TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.has_default_value = false TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.default_value = {} @@ -5933,8 +5922,8 @@ TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.cpp_type = 10 TEAMONETEAMINFO_USERMOUNTINFO_FIELD.name = "userMountInfo" TEAMONETEAMINFO_USERMOUNTINFO_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.userMountInfo" -TEAMONETEAMINFO_USERMOUNTINFO_FIELD.number = 10 -TEAMONETEAMINFO_USERMOUNTINFO_FIELD.index = 9 +TEAMONETEAMINFO_USERMOUNTINFO_FIELD.number = 9 +TEAMONETEAMINFO_USERMOUNTINFO_FIELD.index = 8 TEAMONETEAMINFO_USERMOUNTINFO_FIELD.label = 3 TEAMONETEAMINFO_USERMOUNTINFO_FIELD.has_default_value = false TEAMONETEAMINFO_USERMOUNTINFO_FIELD.default_value = {} @@ -5942,11 +5931,22 @@ TEAMONETEAMINFO_USERMOUNTINFO_FIELD.message_type = USERMOUNTINFO TEAMONETEAMINFO_USERMOUNTINFO_FIELD.type = 11 TEAMONETEAMINFO_USERMOUNTINFO_FIELD.cpp_type = 10 +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.name = "MagicSoldier" +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.MagicSoldier" +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.number = 10 +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.index = 9 +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.label = 3 +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.has_default_value = false +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.default_value = {} +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.message_type = TEAMSIMPLEINFO +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.type = 11 +TEAMONETEAMINFO_MAGICSOLDIER_FIELD.cpp_type = 10 + TEAMONETEAMINFO.name = "TeamOneTeamInfo" TEAMONETEAMINFO.full_name = ".rpc.protocols.TeamOneTeamInfo" TEAMONETEAMINFO.nested_types = {} TEAMONETEAMINFO.enum_types = {} -TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_MAGICSOLDIER_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD, TEAMONETEAMINFO_SEALSHOW_FIELD, TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD, TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD, TEAMONETEAMINFO_LIFEGRIDINFO_FIELD, TEAMONETEAMINFO_USERMOUNTINFO_FIELD} +TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD, TEAMONETEAMINFO_SEALSHOW_FIELD, TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD, TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD, TEAMONETEAMINFO_LIFEGRIDINFO_FIELD, TEAMONETEAMINFO_USERMOUNTINFO_FIELD, TEAMONETEAMINFO_MAGICSOLDIER_FIELD} TEAMONETEAMINFO.is_extendable = false TEAMONETEAMINFO.extensions = {} TEAMONEINFO_UID_FIELD.name = "uid" From 478347bc6d29469a13cf8bcbeda9af8828fcbe95 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 4 Apr 2023 16:27:15 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=88=98=E6=96=97=3D=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E8=A2=AB=E5=8A=A8441=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 3 +++ .../ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 7dde8d856d..2dcc210eed 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -11564,6 +11564,9 @@ local passivityList = { if skill and not skill.isTriggerJudge and judge==1 then return end + if skill==nil then + return + end if skill.type~=BattleSkillType.Special then return end diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua index 4052cdeadb..57dba28aba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua @@ -434,7 +434,8 @@ function this._TimeUpdate() if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.CARDELAY) then local config=ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.CARDELAY) if config then - this.timeText.text = config.OpenRules[1][2].."级开启" + LogError("config.OpenRules[1][2]=="..config.OpenRules[2]) + this.timeText.text = config.OpenRules[2].."级开启" else this.timeText.text = "50级开启" end