From dd93f737ff3160108faba75365ae9c5a13457075 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 31 Aug 2021 15:05:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E4=B8=8A=E5=A5=BD?= =?UTF-8?q?=E5=8F=8B=E5=AE=9D=E5=99=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Message/CommonProto_pb.lua | 13 ++++++++++++- .../~Lua/Modules/Expedition/ExpeditionManager.lua | 2 +- .../~Lua/Modules/GoodFriend/GoodFriendManager.lua | 2 +- .../~Lua/Modules/Map/EndLessMapManager.lua | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua index a89349a7dd..97913b7b36 100644 --- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua @@ -59,6 +59,7 @@ EQUIP_SKILLID_FIELD = protobuf.FieldDescriptor(); EQUIP_ISLOCKED_FIELD = protobuf.FieldDescriptor(); EQUIP_EXP_FIELD = protobuf.FieldDescriptor(); EQUIP_TREELV_FIELD = protobuf.FieldDescriptor(); +EQUIP_FOURSPIRIT_FIELD = protobuf.FieldDescriptor(); SOULPOS = protobuf.Descriptor(); SOULPOS_EQUIPID_FIELD = protobuf.FieldDescriptor(); SOULPOS_POSITION_FIELD = protobuf.FieldDescriptor(); @@ -1264,11 +1265,21 @@ EQUIP_TREELV_FIELD.default_value = 0 EQUIP_TREELV_FIELD.type = 5 EQUIP_TREELV_FIELD.cpp_type = 1 +EQUIP_FOURSPIRIT_FIELD.name = "fourSpirit" +EQUIP_FOURSPIRIT_FIELD.full_name = ".rpc.protocols.Equip.fourSpirit" +EQUIP_FOURSPIRIT_FIELD.number = 11 +EQUIP_FOURSPIRIT_FIELD.index = 10 +EQUIP_FOURSPIRIT_FIELD.label = 1 +EQUIP_FOURSPIRIT_FIELD.has_default_value = false +EQUIP_FOURSPIRIT_FIELD.default_value = 0 +EQUIP_FOURSPIRIT_FIELD.type = 5 +EQUIP_FOURSPIRIT_FIELD.cpp_type = 1 + EQUIP.name = "Equip" EQUIP.full_name = ".rpc.protocols.Equip" EQUIP.nested_types = {} EQUIP.enum_types = {} -EQUIP.fields = {EQUIP_ID_FIELD, EQUIP_EQUIPID_FIELD, EQUIP_MAINATTRIBUTE_FIELD, EQUIP_SECONDATTRIBUTE_FIELD, EQUIP_REBUILDLEVEL_FIELD, EQUIP_CREATETIME_FIELD, EQUIP_SKILLID_FIELD, EQUIP_ISLOCKED_FIELD, EQUIP_EXP_FIELD, EQUIP_TREELV_FIELD} +EQUIP.fields = {EQUIP_ID_FIELD, EQUIP_EQUIPID_FIELD, EQUIP_MAINATTRIBUTE_FIELD, EQUIP_SECONDATTRIBUTE_FIELD, EQUIP_REBUILDLEVEL_FIELD, EQUIP_CREATETIME_FIELD, EQUIP_SKILLID_FIELD, EQUIP_ISLOCKED_FIELD, EQUIP_EXP_FIELD, EQUIP_TREELV_FIELD, EQUIP_FOURSPIRIT_FIELD} EQUIP.is_extendable = false EQUIP.extensions = {} SOULPOS_EQUIPID_FIELD.name = "equipId" diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua index 0cd6a9281f..0be7d99ae5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua @@ -767,7 +767,7 @@ function this.InitSingleTreasureData(_singleData) single.maxRefineLv=currJewel.Max[2] single.maxTreeLv = currJewel.GodHoodMaxlv single.treeLv = single.maxTreeLv or 0 - single.fourTotal = 0 + single.fourTotal = _singleData.fourSpirit or 0 single.upHeroDid="" local quantity=currJewel.Level single.quantity=quantity diff --git a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua index 17f747df43..018676fa92 100644 --- a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua @@ -616,7 +616,7 @@ function this.InitSingleTreasureData(_singleData) single.lv=_singleData.exp single.refineLv=_singleData.rebuildLevel single.treeLv = _singleData.treeLv or 0 - single.fourTotal = 0 + single.fourTotal = _singleData.fourSpirit or 0 single.maxLv=currJewel.Max[1] single.maxRefineLv=currJewel.Max[2] single.maxTreeLv = currJewel.GodHoodMaxlv diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index 3c36457ec7..5acfaf7113 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -386,8 +386,8 @@ function this.InitSingleTreasureData(_singleData,_fourTotal,_treeLevel) single.maxRefineLv=currJewel.Max[2] single.upHeroDid="" single.maxTreeLv = currJewel.GodHoodMaxlv - single.treeLv = _treeLevel - single.fourTotal = _fourTotal + single.treeLv = _treeLevel or 0 + single.fourTotal = _fourTotal or 0 local quantity=currJewel.Level single.quantity=quantity single.frame=GetQuantityImageByquality(quantity)