root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【命格】提交

dev_chengFeng
ZhangBiao 2021-12-07 11:50:03 +08:00
parent 8efea1f06e
commit 3ad898f8af
16 changed files with 4041 additions and 3069 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

908
Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab
View File

File diff suppressed because it is too large Load Diff

5392
Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
View File

File diff suppressed because it is too large Load Diff

2
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
View File

@ -1056,6 +1056,7 @@ ItemType = {
Incarnation = 29,
ZuoQiChip = 28, -- 坐骑碎片
talismanSoulChip = 30,
Gem = 31,--命石
}
JumpType = {
Lottery = 1, --招募
@ -2395,6 +2396,7 @@ ItemBaseType = {
SoulPrint = 6, --魂印
Materials = 7, --材料
JuLing = 8, --聚灵
Gem = 9, --命石
}
--探宝类型
TreasureType={

2
Assets/ManagedResources/~Lua/Common/Managers.lua
View File

@ -220,6 +220,8 @@ local ManagerNames = {
"Incarnation/IncarnationManager",
--灵脉秘境
"LingMaiMiJing/LingMaiMiJingManager",
--命格
"Gem/GemManager",
--!!!!红点管理(尽量放在最后)!!!!--
"Player/RedpotManager",
}

1
Assets/ManagedResources/~Lua/Data/ConfigData.lua
View File

@ -243,6 +243,7 @@ ConfigName = {
LodeRankReward = "LodeRankReward",
GoodsConfig = "GoodsConfig",
ThemeActivityShop = "ThemeActivityShop",
GemConfig = "GemConfig",
}
require "Framework/GameDataBase"

52
Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
View File

@ -98,11 +98,6 @@ TRUMPGACHASELECTITEMREQUEST_SELECTIDS_FIELD = protobuf.FieldDescriptor();
GETTRUMPSELECTITEMREQUEST = protobuf.Descriptor();
GETTRUMPSELECTITEMRESPONSE = protobuf.Descriptor();
GETTRUMPSELECTITEMRESPONSE_SELECTIDS_FIELD = protobuf.FieldDescriptor();
BUYGOODSTOITEMREQUEST = protobuf.Descriptor();
BUYGOODSTOITEMREQUEST_GOODID_FIELD = protobuf.FieldDescriptor();
BUYGOODSTOITEMREQUEST_GOODSNUM_FIELD = protobuf.FieldDescriptor();
BUYGOODSTOITEMRESPONSE = protobuf.Descriptor();
BUYGOODSTOITEMRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.name = "itemId"
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.full_name = ".rpc.protocols.CommitShejiActivityItemRequest.itemId"
@ -944,54 +939,7 @@ GETTRUMPSELECTITEMRESPONSE.enum_types = {}
GETTRUMPSELECTITEMRESPONSE.fields = {GETTRUMPSELECTITEMRESPONSE_SELECTIDS_FIELD}
GETTRUMPSELECTITEMRESPONSE.is_extendable = false
GETTRUMPSELECTITEMRESPONSE.extensions = {}
BUYGOODSTOITEMREQUEST_GOODID_FIELD.name = "goodId"
BUYGOODSTOITEMREQUEST_GOODID_FIELD.full_name = ".rpc.protocols.BuyGoodsToItemRequest.goodId"
BUYGOODSTOITEMREQUEST_GOODID_FIELD.number = 1
BUYGOODSTOITEMREQUEST_GOODID_FIELD.index = 0
BUYGOODSTOITEMREQUEST_GOODID_FIELD.label = 1
BUYGOODSTOITEMREQUEST_GOODID_FIELD.has_default_value = false
BUYGOODSTOITEMREQUEST_GOODID_FIELD.default_value = 0
BUYGOODSTOITEMREQUEST_GOODID_FIELD.type = 5
BUYGOODSTOITEMREQUEST_GOODID_FIELD.cpp_type = 1
BUYGOODSTOITEMREQUEST_GOODSNUM_FIELD.name = "goodsNum"
BUYGOODSTOITEMREQUEST_GOODSNUM_FIELD.full_name = ".rpc.protocols.BuyGoodsToItemRequest.goodsNum"
BUYGOODSTOITEMREQUEST_GOODSNUM_FIELD.number = 2
BUYGOODSTOITEMREQUEST_GOODSNUM_FIELD.index = 1
BUYGOODSTOITEMREQUEST_GOODSNUM_FIELD.label = 1
BUYGOODSTOITEMREQUEST_GOODSNUM_FIELD.has_default_value = false
BUYGOODSTOITEMREQUEST_GOODSNUM_FIELD.default_value = 0
BUYGOODSTOITEMREQUEST_GOODSNUM_FIELD.type = 5
BUYGOODSTOITEMREQUEST_GOODSNUM_FIELD.cpp_type = 1
BUYGOODSTOITEMREQUEST.name = "BuyGoodsToItemRequest"
BUYGOODSTOITEMREQUEST.full_name = ".rpc.protocols.BuyGoodsToItemRequest"
BUYGOODSTOITEMREQUEST.nested_types = {}
BUYGOODSTOITEMREQUEST.enum_types = {}
BUYGOODSTOITEMREQUEST.fields = {BUYGOODSTOITEMREQUEST_GOODID_FIELD, BUYGOODSTOITEMREQUEST_GOODSNUM_FIELD}
BUYGOODSTOITEMREQUEST.is_extendable = false
BUYGOODSTOITEMREQUEST.extensions = {}
BUYGOODSTOITEMRESPONSE_DROP_FIELD.name = "drop"
BUYGOODSTOITEMRESPONSE_DROP_FIELD.full_name = ".rpc.protocols.BuyGoodsToItemResponse.drop"
BUYGOODSTOITEMRESPONSE_DROP_FIELD.number = 1
BUYGOODSTOITEMRESPONSE_DROP_FIELD.index = 0
BUYGOODSTOITEMRESPONSE_DROP_FIELD.label = 1
BUYGOODSTOITEMRESPONSE_DROP_FIELD.has_default_value = false
BUYGOODSTOITEMRESPONSE_DROP_FIELD.default_value = nil
BUYGOODSTOITEMRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
BUYGOODSTOITEMRESPONSE_DROP_FIELD.type = 11
BUYGOODSTOITEMRESPONSE_DROP_FIELD.cpp_type = 10
BUYGOODSTOITEMRESPONSE.name = "BuyGoodsToItemResponse"
BUYGOODSTOITEMRESPONSE.full_name = ".rpc.protocols.BuyGoodsToItemResponse"
BUYGOODSTOITEMRESPONSE.nested_types = {}
BUYGOODSTOITEMRESPONSE.enum_types = {}
BUYGOODSTOITEMRESPONSE.fields = {BUYGOODSTOITEMRESPONSE_DROP_FIELD}
BUYGOODSTOITEMRESPONSE.is_extendable = false
BUYGOODSTOITEMRESPONSE.extensions = {}
BuyGoodsToItemRequest = protobuf.Message(BUYGOODSTOITEMREQUEST)
BuyGoodsToItemResponse = protobuf.Message(BUYGOODSTOITEMRESPONSE)
CommitShejiActivityItemRequest = protobuf.Message(COMMITSHEJIACTIVITYITEMREQUEST)
CommitShejiActivityItemResponse = protobuf.Message(COMMITSHEJIACTIVITYITEMRESPONSE)
FuXingStoreBuyRequest = protobuf.Message(FUXINGSTOREBUYREQUEST)

86
Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
View File

@ -599,7 +599,6 @@ EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD = protobuf.FieldDescriptor();
EXPEDITIONSIMPLEBOSSINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD = protobuf.FieldDescriptor();
EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD = protobuf.FieldDescriptor();
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD = protobuf.FieldDescriptor();
EXPEDITIONTEAMINFO = protobuf.Descriptor();
EXPEDITIONTEAMINFO_HERO_FIELD = protobuf.FieldDescriptor();
EXPEDITIONTEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor();
@ -836,6 +835,13 @@ LINGMAISECRETRECORD_LINGMAIID_FIELD = protobuf.FieldDescriptor();
LINGMAISECRETRECORD_TIME_FIELD = protobuf.FieldDescriptor();
LINGMAISECRETRECORD_PRACTICELEVEL_FIELD = protobuf.FieldDescriptor();
LINGMAISECRETRECORD_DEFSERVERNAME_FIELD = protobuf.FieldDescriptor();
LIFESTONEINFO = protobuf.Descriptor();
LIFESTONEINFO_ITEMID_FIELD = protobuf.FieldDescriptor();
LIFESTONEINFO_COSTNUM_FIELD = protobuf.FieldDescriptor();
LIFEGRIDINFO = protobuf.Descriptor();
LIFEGRIDINFO_GRIDID_FIELD = protobuf.FieldDescriptor();
LIFEGRIDINFO_GRIDINDEX_FIELD = protobuf.FieldDescriptor();
LIFEGRIDINFO_ITEMID_FIELD = protobuf.FieldDescriptor();
ERRORRESPONSE_ERRCODE_FIELD.name = "errCode"
ERRORRESPONSE_ERRCODE_FIELD.full_name = ".rpc.protocols.ErrorResponse.errCode"
@ -6545,21 +6551,11 @@ EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.default_value = 0
EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.type = 5
EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.cpp_type = 1
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.name = "godSoulLv"
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.full_name = ".rpc.protocols.ExpeditionSimpleBossInfo.godSoulLv"
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.number = 6
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.index = 5
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.label = 1
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.has_default_value = false
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.default_value = 0
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.type = 5
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.cpp_type = 1
EXPEDITIONSIMPLEBOSSINFO.name = "ExpeditionSimpleBossInfo"
EXPEDITIONSIMPLEBOSSINFO.full_name = ".rpc.protocols.ExpeditionSimpleBossInfo"
EXPEDITIONSIMPLEBOSSINFO.nested_types = {}
EXPEDITIONSIMPLEBOSSINFO.enum_types = {}
EXPEDITIONSIMPLEBOSSINFO.fields = {EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD, EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD, EXPEDITIONSIMPLEBOSSINFO_LEVEL_FIELD, EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD, EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD, EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD}
EXPEDITIONSIMPLEBOSSINFO.fields = {EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD, EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD, EXPEDITIONSIMPLEBOSSINFO_LEVEL_FIELD, EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD, EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD}
EXPEDITIONSIMPLEBOSSINFO.is_extendable = false
EXPEDITIONSIMPLEBOSSINFO.extensions = {}
EXPEDITIONTEAMINFO_HERO_FIELD.name = "hero"
@ -8790,6 +8786,70 @@ LINGMAISECRETRECORD.enum_types = {}
LINGMAISECRETRECORD.fields = {LINGMAISECRETRECORD_TYPE_FIELD, LINGMAISECRETRECORD_DEFNAME_FIELD, LINGMAISECRETRECORD_USERNAME_FIELD, LINGMAISECRETRECORD_LINGMAIID_FIELD, LINGMAISECRETRECORD_TIME_FIELD, LINGMAISECRETRECORD_PRACTICELEVEL_FIELD, LINGMAISECRETRECORD_DEFSERVERNAME_FIELD}
LINGMAISECRETRECORD.is_extendable = false
LINGMAISECRETRECORD.extensions = {}
LIFESTONEINFO_ITEMID_FIELD.name = "itemId"
LIFESTONEINFO_ITEMID_FIELD.full_name = ".rpc.protocols.LifeStoneInfo.itemId"
LIFESTONEINFO_ITEMID_FIELD.number = 1
LIFESTONEINFO_ITEMID_FIELD.index = 0
LIFESTONEINFO_ITEMID_FIELD.label = 1
LIFESTONEINFO_ITEMID_FIELD.has_default_value = false
LIFESTONEINFO_ITEMID_FIELD.default_value = 0
LIFESTONEINFO_ITEMID_FIELD.type = 5
LIFESTONEINFO_ITEMID_FIELD.cpp_type = 1
LIFESTONEINFO_COSTNUM_FIELD.name = "costNum"
LIFESTONEINFO_COSTNUM_FIELD.full_name = ".rpc.protocols.LifeStoneInfo.costNum"
LIFESTONEINFO_COSTNUM_FIELD.number = 2
LIFESTONEINFO_COSTNUM_FIELD.index = 1
LIFESTONEINFO_COSTNUM_FIELD.label = 1
LIFESTONEINFO_COSTNUM_FIELD.has_default_value = false
LIFESTONEINFO_COSTNUM_FIELD.default_value = 0
LIFESTONEINFO_COSTNUM_FIELD.type = 5
LIFESTONEINFO_COSTNUM_FIELD.cpp_type = 1
LIFESTONEINFO.name = "LifeStoneInfo"
LIFESTONEINFO.full_name = ".rpc.protocols.LifeStoneInfo"
LIFESTONEINFO.nested_types = {}
LIFESTONEINFO.enum_types = {}
LIFESTONEINFO.fields = {LIFESTONEINFO_ITEMID_FIELD, LIFESTONEINFO_COSTNUM_FIELD}
LIFESTONEINFO.is_extendable = false
LIFESTONEINFO.extensions = {}
LIFEGRIDINFO_GRIDID_FIELD.name = "gridId"
LIFEGRIDINFO_GRIDID_FIELD.full_name = ".rpc.protocols.LifeGridInfo.gridId"
LIFEGRIDINFO_GRIDID_FIELD.number = 1
LIFEGRIDINFO_GRIDID_FIELD.index = 0
LIFEGRIDINFO_GRIDID_FIELD.label = 1
LIFEGRIDINFO_GRIDID_FIELD.has_default_value = false
LIFEGRIDINFO_GRIDID_FIELD.default_value = 0
LIFEGRIDINFO_GRIDID_FIELD.type = 5
LIFEGRIDINFO_GRIDID_FIELD.cpp_type = 1
LIFEGRIDINFO_GRIDINDEX_FIELD.name = "gridIndex"
LIFEGRIDINFO_GRIDINDEX_FIELD.full_name = ".rpc.protocols.LifeGridInfo.gridIndex"
LIFEGRIDINFO_GRIDINDEX_FIELD.number = 2
LIFEGRIDINFO_GRIDINDEX_FIELD.index = 1
LIFEGRIDINFO_GRIDINDEX_FIELD.label = 1
LIFEGRIDINFO_GRIDINDEX_FIELD.has_default_value = false
LIFEGRIDINFO_GRIDINDEX_FIELD.default_value = 0
LIFEGRIDINFO_GRIDINDEX_FIELD.type = 5
LIFEGRIDINFO_GRIDINDEX_FIELD.cpp_type = 1
LIFEGRIDINFO_ITEMID_FIELD.name = "itemId"
LIFEGRIDINFO_ITEMID_FIELD.full_name = ".rpc.protocols.LifeGridInfo.itemId"
LIFEGRIDINFO_ITEMID_FIELD.number = 3
LIFEGRIDINFO_ITEMID_FIELD.index = 2
LIFEGRIDINFO_ITEMID_FIELD.label = 1
LIFEGRIDINFO_ITEMID_FIELD.has_default_value = false
LIFEGRIDINFO_ITEMID_FIELD.default_value = 0
LIFEGRIDINFO_ITEMID_FIELD.type = 5
LIFEGRIDINFO_ITEMID_FIELD.cpp_type = 1
LIFEGRIDINFO.name = "LifeGridInfo"
LIFEGRIDINFO.full_name = ".rpc.protocols.LifeGridInfo"
LIFEGRIDINFO.nested_types = {}
LIFEGRIDINFO.enum_types = {}
LIFEGRIDINFO.fields = {LIFEGRIDINFO_GRIDID_FIELD, LIFEGRIDINFO_GRIDINDEX_FIELD, LIFEGRIDINFO_ITEMID_FIELD}
LIFEGRIDINFO.is_extendable = false
LIFEGRIDINFO.extensions = {}
ActivityInfo = protobuf.Message(ACTIVITYINFO)
ActivityInfo.MissionInfo = protobuf.Message(ACTIVITYINFO_MISSIONINFO)
@ -8860,6 +8920,8 @@ JourneyMonsterInfo = protobuf.Message(JOURNEYMONSTERINFO)
KeyVal = protobuf.Message(KEYVAL)
LevelDifficulty = protobuf.Message(LEVELDIFFICULTY)
LevelDifficultyInfos = protobuf.Message(LEVELDIFFICULTYINFOS)
LifeGridInfo = protobuf.Message(LIFEGRIDINFO)
LifeStoneInfo = protobuf.Message(LIFESTONEINFO)
LikableInfo = protobuf.Message(LIKABLEINFO)
LingMaiSecret = protobuf.Message(LINGMAISECRET)
LingMaiSecretRecord = protobuf.Message(LINGMAISECRETRECORD)

118
Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
View File

@ -271,6 +271,17 @@ GETTRANSFORMATIONRESPONSE_LIST_FIELD = protobuf.FieldDescriptor();
UPORDOWNTRANSFORMATIONREQUEST = protobuf.Descriptor();
UPORDOWNTRANSFORMATIONREQUEST_ID_FIELD = protobuf.FieldDescriptor();
UPORDOWNTRANSFORMATIONREQUEST_INDEX_FIELD = protobuf.FieldDescriptor();
LIFESTONEUPREQUEST = protobuf.Descriptor();
LIFESTONEUPREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
LIFESTONEUPREQUEST_GRIDID_FIELD = protobuf.FieldDescriptor();
LIFESTONEUPREQUEST_GRIDINDEX_FIELD = protobuf.FieldDescriptor();
LIFESTONEUPREQUEST_CURGEMID_FIELD = protobuf.FieldDescriptor();
LIFESTONEUPREQUEST_COSTSTONELIST_FIELD = protobuf.FieldDescriptor();
LIFEGRIDCHANGEREQUEST = protobuf.Descriptor();
LIFEGRIDCHANGEREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
LIFEGRIDCHANGEREQUEST_POSITION_FIELD = protobuf.FieldDescriptor();
LIFEGRIDCHANGEREQUEST_INDEX_FIELD = protobuf.FieldDescriptor();
LIFEGRIDCHANGEREQUEST_LIFESTONEID_FIELD = protobuf.FieldDescriptor();
GETHEROLISTINFOREQUEST_INDEX_FIELD.name = "index"
GETHEROLISTINFOREQUEST_INDEX_FIELD.full_name = ".rpc.protocols.GetHeroListInfoRequest.index"
@ -2696,6 +2707,111 @@ UPORDOWNTRANSFORMATIONREQUEST.enum_types = {}
UPORDOWNTRANSFORMATIONREQUEST.fields = {UPORDOWNTRANSFORMATIONREQUEST_ID_FIELD, UPORDOWNTRANSFORMATIONREQUEST_INDEX_FIELD}
UPORDOWNTRANSFORMATIONREQUEST.is_extendable = false
UPORDOWNTRANSFORMATIONREQUEST.extensions = {}
LIFESTONEUPREQUEST_TYPE_FIELD.name = "type"
LIFESTONEUPREQUEST_TYPE_FIELD.full_name = ".rpc.protocols.LifeStoneUpRequest.type"
LIFESTONEUPREQUEST_TYPE_FIELD.number = 1
LIFESTONEUPREQUEST_TYPE_FIELD.index = 0
LIFESTONEUPREQUEST_TYPE_FIELD.label = 1
LIFESTONEUPREQUEST_TYPE_FIELD.has_default_value = false
LIFESTONEUPREQUEST_TYPE_FIELD.default_value = 0
LIFESTONEUPREQUEST_TYPE_FIELD.type = 5
LIFESTONEUPREQUEST_TYPE_FIELD.cpp_type = 1
LIFESTONEUPREQUEST_GRIDID_FIELD.name = "gridId"
LIFESTONEUPREQUEST_GRIDID_FIELD.full_name = ".rpc.protocols.LifeStoneUpRequest.gridId"
LIFESTONEUPREQUEST_GRIDID_FIELD.number = 2
LIFESTONEUPREQUEST_GRIDID_FIELD.index = 1
LIFESTONEUPREQUEST_GRIDID_FIELD.label = 1
LIFESTONEUPREQUEST_GRIDID_FIELD.has_default_value = false
LIFESTONEUPREQUEST_GRIDID_FIELD.default_value = 0
LIFESTONEUPREQUEST_GRIDID_FIELD.type = 5
LIFESTONEUPREQUEST_GRIDID_FIELD.cpp_type = 1
LIFESTONEUPREQUEST_GRIDINDEX_FIELD.name = "gridIndex"
LIFESTONEUPREQUEST_GRIDINDEX_FIELD.full_name = ".rpc.protocols.LifeStoneUpRequest.gridIndex"
LIFESTONEUPREQUEST_GRIDINDEX_FIELD.number = 3
LIFESTONEUPREQUEST_GRIDINDEX_FIELD.index = 2
LIFESTONEUPREQUEST_GRIDINDEX_FIELD.label = 1
LIFESTONEUPREQUEST_GRIDINDEX_FIELD.has_default_value = false
LIFESTONEUPREQUEST_GRIDINDEX_FIELD.default_value = 0
LIFESTONEUPREQUEST_GRIDINDEX_FIELD.type = 5
LIFESTONEUPREQUEST_GRIDINDEX_FIELD.cpp_type = 1
LIFESTONEUPREQUEST_CURGEMID_FIELD.name = "curGemId"
LIFESTONEUPREQUEST_CURGEMID_FIELD.full_name = ".rpc.protocols.LifeStoneUpRequest.curGemId"
LIFESTONEUPREQUEST_CURGEMID_FIELD.number = 4
LIFESTONEUPREQUEST_CURGEMID_FIELD.index = 3
LIFESTONEUPREQUEST_CURGEMID_FIELD.label = 1
LIFESTONEUPREQUEST_CURGEMID_FIELD.has_default_value = false
LIFESTONEUPREQUEST_CURGEMID_FIELD.default_value = 0
LIFESTONEUPREQUEST_CURGEMID_FIELD.type = 5
LIFESTONEUPREQUEST_CURGEMID_FIELD.cpp_type = 1
LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.name = "costStoneList"
LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.full_name = ".rpc.protocols.LifeStoneUpRequest.costStoneList"
LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.number = 5
LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.index = 4
LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.label = 3
LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.has_default_value = false
LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.default_value = {}
LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.message_type = CommonProto_pb.LIFESTONEINFO
LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.type = 11
LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.cpp_type = 10
LIFESTONEUPREQUEST.name = "LifeStoneUpRequest"
LIFESTONEUPREQUEST.full_name = ".rpc.protocols.LifeStoneUpRequest"
LIFESTONEUPREQUEST.nested_types = {}
LIFESTONEUPREQUEST.enum_types = {}
LIFESTONEUPREQUEST.fields = {LIFESTONEUPREQUEST_TYPE_FIELD, LIFESTONEUPREQUEST_GRIDID_FIELD, LIFESTONEUPREQUEST_GRIDINDEX_FIELD, LIFESTONEUPREQUEST_CURGEMID_FIELD, LIFESTONEUPREQUEST_COSTSTONELIST_FIELD}
LIFESTONEUPREQUEST.is_extendable = false
LIFESTONEUPREQUEST.extensions = {}
LIFEGRIDCHANGEREQUEST_TYPE_FIELD.name = "type"
LIFEGRIDCHANGEREQUEST_TYPE_FIELD.full_name = ".rpc.protocols.LifeGridChangeRequest.type"
LIFEGRIDCHANGEREQUEST_TYPE_FIELD.number = 1
LIFEGRIDCHANGEREQUEST_TYPE_FIELD.index = 0
LIFEGRIDCHANGEREQUEST_TYPE_FIELD.label = 1
LIFEGRIDCHANGEREQUEST_TYPE_FIELD.has_default_value = false
LIFEGRIDCHANGEREQUEST_TYPE_FIELD.default_value = 0
LIFEGRIDCHANGEREQUEST_TYPE_FIELD.type = 5
LIFEGRIDCHANGEREQUEST_TYPE_FIELD.cpp_type = 1
LIFEGRIDCHANGEREQUEST_POSITION_FIELD.name = "position"
LIFEGRIDCHANGEREQUEST_POSITION_FIELD.full_name = ".rpc.protocols.LifeGridChangeRequest.position"
LIFEGRIDCHANGEREQUEST_POSITION_FIELD.number = 2
LIFEGRIDCHANGEREQUEST_POSITION_FIELD.index = 1
LIFEGRIDCHANGEREQUEST_POSITION_FIELD.label = 1
LIFEGRIDCHANGEREQUEST_POSITION_FIELD.has_default_value = false
LIFEGRIDCHANGEREQUEST_POSITION_FIELD.default_value = 0
LIFEGRIDCHANGEREQUEST_POSITION_FIELD.type = 5
LIFEGRIDCHANGEREQUEST_POSITION_FIELD.cpp_type = 1
LIFEGRIDCHANGEREQUEST_INDEX_FIELD.name = "index"
LIFEGRIDCHANGEREQUEST_INDEX_FIELD.full_name = ".rpc.protocols.LifeGridChangeRequest.index"
LIFEGRIDCHANGEREQUEST_INDEX_FIELD.number = 3
LIFEGRIDCHANGEREQUEST_INDEX_FIELD.index = 2
LIFEGRIDCHANGEREQUEST_INDEX_FIELD.label = 1
LIFEGRIDCHANGEREQUEST_INDEX_FIELD.has_default_value = false
LIFEGRIDCHANGEREQUEST_INDEX_FIELD.default_value = 0
LIFEGRIDCHANGEREQUEST_INDEX_FIELD.type = 5
LIFEGRIDCHANGEREQUEST_INDEX_FIELD.cpp_type = 1
LIFEGRIDCHANGEREQUEST_LIFESTONEID_FIELD.name = "lifeStoneId"
LIFEGRIDCHANGEREQUEST_LIFESTONEID_FIELD.full_name = ".rpc.protocols.LifeGridChangeRequest.lifeStoneId"
LIFEGRIDCHANGEREQUEST_LIFESTONEID_FIELD.number = 4
LIFEGRIDCHANGEREQUEST_LIFESTONEID_FIELD.index = 3
LIFEGRIDCHANGEREQUEST_LIFESTONEID_FIELD.label = 1
LIFEGRIDCHANGEREQUEST_LIFESTONEID_FIELD.has_default_value = false
LIFEGRIDCHANGEREQUEST_LIFESTONEID_FIELD.default_value = 0
LIFEGRIDCHANGEREQUEST_LIFESTONEID_FIELD.type = 5
LIFEGRIDCHANGEREQUEST_LIFESTONEID_FIELD.cpp_type = 1
LIFEGRIDCHANGEREQUEST.name = "LifeGridChangeRequest"
LIFEGRIDCHANGEREQUEST.full_name = ".rpc.protocols.LifeGridChangeRequest"
LIFEGRIDCHANGEREQUEST.nested_types = {}
LIFEGRIDCHANGEREQUEST.enum_types = {}
LIFEGRIDCHANGEREQUEST.fields = {LIFEGRIDCHANGEREQUEST_TYPE_FIELD, LIFEGRIDCHANGEREQUEST_POSITION_FIELD, LIFEGRIDCHANGEREQUEST_INDEX_FIELD, LIFEGRIDCHANGEREQUEST_LIFESTONEID_FIELD}
LIFEGRIDCHANGEREQUEST.is_extendable = false
LIFEGRIDCHANGEREQUEST.extensions = {}
AllBookEnableRequest = protobuf.Message(ALLBOOKENABLEREQUEST)
CancelHeroChangeRequest = protobuf.Message(CANCELHEROCHANGEREQUEST)
@ -2749,6 +2865,8 @@ HongmengAddition = protobuf.Message(HONGMENGADDITION)
HongmengHeroInfo = protobuf.Message(HONGMENGHEROINFO)
HongmengInfoIndication = protobuf.Message(HONGMENGINFOINDICATION)
HongmengSteleNewHandIndication = protobuf.Message(HONGMENGSTELENEWHANDINDICATION)
LifeGridChangeRequest = protobuf.Message(LIFEGRIDCHANGEREQUEST)
LifeStoneUpRequest = protobuf.Message(LIFESTONEUPREQUEST)
MergeSoulRequest = protobuf.Message(MERGESOULREQUEST)
MergeSoulResponse = protobuf.Message(MERGESOULRESPONSE)
OpenResonanceRequest = protobuf.Message(OPENRESONANCEREQUEST)

374
Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
View File

File diff suppressed because one or more lines are too long

14
Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
View File

@ -77,6 +77,7 @@ GETPLAYERINFORESPONSE_SERVEROPENTIME_FIELD = protobuf.FieldDescriptor();
GETPLAYERINFORESPONSE_XIUWEILEVEL_FIELD = protobuf.FieldDescriptor();
GETPLAYERINFORESPONSE_PRACTICESKILLINFOS_FIELD = protobuf.FieldDescriptor();
GETPLAYERINFORESPONSE_FABAOSOULINFOS_FIELD = protobuf.FieldDescriptor();
GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD = protobuf.FieldDescriptor();
GETITEMINFOREQUEST = protobuf.Descriptor();
GETITEMINFOREQUEST_INDEX_FIELD = protobuf.FieldDescriptor();
GETITEMINFORESPONSE = protobuf.Descriptor();
@ -1357,11 +1358,22 @@ GETPLAYERINFORESPONSE_FABAOSOULINFOS_FIELD.message_type = CommonProto_pb.FABAOSO
GETPLAYERINFORESPONSE_FABAOSOULINFOS_FIELD.type = 11
GETPLAYERINFORESPONSE_FABAOSOULINFOS_FIELD.cpp_type = 10
GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD.name = "lifeGridInfos"
GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD.full_name = ".rpc.protocols.GetPlayerInfoResponse.lifeGridInfos"
GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD.number = 51
GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD.index = 49
GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD.label = 3
GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD.has_default_value = false
GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD.default_value = {}
GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD.message_type = CommonProto_pb.LIFEGRIDINFO
GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD.type = 11
GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD.cpp_type = 10
GETPLAYERINFORESPONSE.name = "GetPlayerInfoResponse"
GETPLAYERINFORESPONSE.full_name = ".rpc.protocols.GetPlayerInfoResponse"
GETPLAYERINFORESPONSE.nested_types = {}
GETPLAYERINFORESPONSE.enum_types = {}
GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD, GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD, GETPLAYERINFORESPONSE_USERSKINLIST_FIELD, GETPLAYERINFORESPONSE_USERTITLELIST_FIELD, GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD, GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD, GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD, GETPLAYERINFORESPONSE_SEALLIST_FIELD, GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD, GETPLAYERINFORESPONSE_DRAWTIMES_FIELD, GETPLAYERINFORESPONSE_HELPFIGHTLIST_FIELD, GETPLAYERINFORESPONSE_SIXIANGINFOS_FIELD, GETPLAYERINFORESPONSE_SERVEROPENTIME_FIELD, GETPLAYERINFORESPONSE_XIUWEILEVEL_FIELD, GETPLAYERINFORESPONSE_PRACTICESKILLINFOS_FIELD, GETPLAYERINFORESPONSE_FABAOSOULINFOS_FIELD}
GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD, GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD, GETPLAYERINFORESPONSE_USERSKINLIST_FIELD, GETPLAYERINFORESPONSE_USERTITLELIST_FIELD, GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD, GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD, GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD, GETPLAYERINFORESPONSE_SEALLIST_FIELD, GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD, GETPLAYERINFORESPONSE_DRAWTIMES_FIELD, GETPLAYERINFORESPONSE_HELPFIGHTLIST_FIELD, GETPLAYERINFORESPONSE_SIXIANGINFOS_FIELD, GETPLAYERINFORESPONSE_SERVEROPENTIME_FIELD, GETPLAYERINFORESPONSE_XIUWEILEVEL_FIELD, GETPLAYERINFORESPONSE_PRACTICESKILLINFOS_FIELD, GETPLAYERINFORESPONSE_FABAOSOULINFOS_FIELD, GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD}
GETPLAYERINFORESPONSE.is_extendable = false
GETPLAYERINFORESPONSE.extensions = {}
GETITEMINFOREQUEST_INDEX_FIELD.name = "index"

58
Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
View File

@ -71,6 +71,8 @@ function this.UpdateBagData(_itemData, isNoSendNewItemEvent)
if itemdata.type == ItemBaseType.SoulPrint then
SoulPrintManager.UpdateAllHavedSoulPrint({itemdata.id})
elseif itemdata.type == ItemBaseType.Gem then
GemManager.UpdateGemsFromBag(itemdata.id)
end
end
@ -1085,45 +1087,31 @@ function this.GetBagAllDataByItemType(ItemType)
end
function this.BagIndicationRefresh(msg)
if msg.type == 0 then
--普通背包
for i, v in pairs(msg.item) do
if v and v.itemId then
--背包存储
if BagManager.bagDatas[v.itemId] == nil then
BagManager.UpdateBagData(v)
else
BagManager.bagDatas[v.itemId].num = v.itemNum
BagManager.bagDatas[v.itemId].endingTime = v.endingTime
BagManager.bagDatas[v.itemId].nextFlushTime = v.nextFlushTime
for i, v in pairs(msg.item) do
if v and v.itemId then
--背包存储
if BagManager.bagDatas[v.itemId] == nil then
BagManager.UpdateBagData(v)
else
BagManager.bagDatas[v.itemId].num = v.itemNum
BagManager.bagDatas[v.itemId].endingTime = v.endingTime
BagManager.bagDatas[v.itemId].nextFlushTime = v.nextFlushTime
end
--公会贡献刷新公会技能红点
if v.itemId == 65 then
if BagManager.bagDatas[v.itemId].num < v.itemNum then
GuildSkillManager.SetAllGuildSkillRedPlayers()
end
--公会贡献刷新公会技能红点
if v.itemId == 65 then
if BagManager.bagDatas[v.itemId].num < v.itemNum then
GuildSkillManager.SetAllGuildSkillRedPlayers()
end
CheckRedPointStatus(RedPointType.Guild_Skill)
end
if itemConfig[v.itemId].ItemType == ItemType.LingShouChip then--灵兽碎片获得刷新红点
Game.GlobalEvent:DispatchEvent(GameEvent.Pokemon.PokemonChipRefresh)
end
CheckRedPointStatus(RedPointType.Guild_Skill)
end
if itemConfig[v.itemId].ItemType == ItemType.LingShouChip then--灵兽碎片获得刷新红点
Game.GlobalEvent:DispatchEvent(GameEvent.Pokemon.PokemonChipRefresh)
elseif itemConfig[v.itemId].ItemType == ItemType.Gem then
GemManager.UpdateGemsFromBag(v.itemId,v.itemNum)
end
end
elseif msg.type == 1 then
--临时背包
for i, v in pairs(msg.item) do
if v and v.itemId then
if BagManager.mapShotTimeItemData[v.itemId] == nil then
BagManager.InitMapShotTimeBagData(v)
else
BagManager.mapShotTimeItemData[v.itemId].itemNum = v.itemNum
BagManager.mapShotTimeItemData[v.itemId].endingTime = v.endingTime
BagManager.mapShotTimeItemData[v.itemId].nextFlushTime = v.nextFlushTime
end
end
end
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged)
end
RedpotManager.CheckRedPointStatus(RedPointType.LuckyTurn)
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold)
--检测背包红点

46
Assets/ManagedResources/~Lua/Modules/Gem/GemManager.lua
View File

@ -1,7 +1,46 @@
GemManager = {}
local this = GemManager
function this.Initialize()
this.GemList = {
this.myGemList = {}--我穿戴命石的id
this.allGemList = {}--背包中的命石id。不包括穿戴的
end
--获取服务器发来的数据信息
function this.UpdateGemsFromBag(_GemId,_num)
if not this.allGemList[_GemId] then
local data = {}
data.id = _GemId
data.num = 1
if _num then
data.num = _num
end
this.allGemList[_GemId] = data
else
this.allGemList[_GemId].num = this.allGemList[_GemId].num + 1
if _num then
this.allGemList[_GemId].num = _num
end
end
end
function this.GetWearedGem(_GemList)
for k,v in pairs(_GemList) do
LogPink(string.format("命格:%s index:%s ID:%s",v.gridId,v.gridIndex,v.itemId))
if v and v.gridId then
if not this.myGemList[v.gridId] then
this.myGemList[v.gridId] = {}
end
if not this.myGemList[v.gridId][v.gridIndex] then
this.myGemList[v.gridId][v.gridIndex] = nil
end
if v.itemId and v.itemId > 0 then
this.myGemList[v.gridId][v.gridIndex] = v.itemId
end
end
end
if #this.myGemList == 0 then
LogError("没有命石数据，将使用测试数据")
this.myGemList = {--我穿戴命石的id
[1] = {45001,45002,45003},
[2] = {45004,45005,45006},
[3] = {45007,45008,45009},
@ -11,10 +50,7 @@ function this.Initialize()
[7] = {45041,45042,45043},
[8] = {45051,45052,45053},
}
end
function this.GetServerData(msg)
-- body
end
end
return this

33
Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua
View File

@ -1,4 +1,6 @@
local Gem = quick_class("Gem", BasePanel)
local itemData = ConfigManager.GetConfig(ConfigName.ItemConfig)
local gemConfig = ConfigManager.GetConfig(ConfigName.GemConfig)
function Gem:InitComponent()
self.spLoader = SpriteLoader.New()
@ -12,6 +14,8 @@ function Gem:InitComponent()
self.img = Util.GetGameObject(self.mid, "Man"):GetComponent("Image")
self.ManCanvas = Util.GetGameObject(self.mid, "Man"):GetComponent("Canvas")
self.fx_ui_xiuxingshengxin_cangzhu = Util.GetGameObject(self.gameObject, "Bg/fx_ui_xiuxingshengxin_cangzhu")
--Gems
self.gems = Util.GetGameObject(self.gameObject, "Gems")
--页签
self.btnPractice = Util.GetGameObject(self.gameObject, "Tab/tab1")
@ -58,6 +62,7 @@ end
function Gem:Refresh()
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
self:RefreshMid()
self:SetGems()
end
--刷新中部人物
@ -67,6 +72,34 @@ function Gem:RefreshMid()
self.ManCanvas.sortingOrder = self.sortingOrder + 2
end
--设置中部宝石数据
function Gem:SetGems()
local gemData = GemManager.myGemList
for i = 1, 8 do
local itemGo = Util.GetGameObject(self.gems,"item ("..i..")")
if gemData[i] then
for j = 1, 3 do
local stoneGo = Util.GetGameObject(itemGo,"stone ("..j..")")
local level = Util.GetGameObject(stoneGo,"Text"):GetComponent("Text")
local name = "r_RareItem_Specail_0222"
level.text = ""
if gemData[i][j] then
name = GetSpriteNameByItemId(gemData[i][j])
level.text = gemConfig[gemData[i][j]].Level
end
stoneGo:GetComponent("Image").sprite = self.spLoader:LoadSprite(name)
end
end
Util.AddOnceClick(itemGo,function ()
self:SetStones(gemData[i])
end)
end
end
function Gem:SetStones(_data)
LogWarn("[1]："..tostring(_data[1]).." [2]："..tostring(_data[2]).." [3]："..tostring(_data[3]))
end
function Gem:OnClose()
end

8
Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
View File

@ -638,9 +638,9 @@ function this.ExecuteLoading()
--[[[1] = ]]function() NetManager.PlayerInfoRequest(LoadingPanel.OnStep) end, -- 基础信息
--[[[2] = ]]function() NetManager.RequestMission(LoadingPanel.OnStep) end, -- 任务信息
--[[[3] = ]]function() NetManager.ItemInfoRequest(0, LoadingPanel.OnStep) end, -- 物品信息
--[[[4] = ]]function() NetManager.AllEquipRequest(0, LoadingPanel.OnStep) end, -- 装备
-- [[[4] = ]]function() NetManager.AllEquipRequest(0, LoadingPanel.OnStep) end, -- 装备（走背包了）
--[[[5] = ]]function() NetManager.AllEquipTreasureRequest(0, LoadingPanel.OnStep) end, -- 宝物
--[[[6] = ]]function() NetManager.GetSoulPrintDataRequest(0, LoadingPanel.OnStep) end, -- 魂印
-- [[[6] = ]]function() NetManager.GetSoulPrintDataRequest(0, LoadingPanel.OnStep) end, -- 魂印（走背包了）
--[[[7] = ]]function() NetManager.DiffMonsterRequest(0,LoadingPanel.OnStep) end, -- 异妖
--[[[8] = ]]function() NetManager.HeroInfoRequest(0, LoadingPanel.OnStep) end, -- 神将信息
--[[[9] = ]]function() NetManager.TeamInfoRequest(LoadingPanel.OnStep) end, -- 编队
@ -674,7 +674,7 @@ function this.ExecuteLoading()
--[[[35] =]]function() NetManager.GetFourElementGetInfo(LoadingPanel.OnStep) end, --四灵试炼
--[[[36] =]]function() MonsterCampManager.SetMyHelpHeroData(nil,nil,LoadingPanel.OnStep) end,--助战神将
--[[[37] =]]function() NetManager.HongMengInfoResponse(LoadingPanel.OnStep) end, --鸿蒙阵
--[[[38] =]]function() NetManager.AllBookEnableResponse(LoadingPanel.OnStep) end, --
--[[[38] =]]function() NetManager.AllBookEnableResponse(LoadingPanel.OnStep) end, --天枢密卷
--[[[39] =]]function() NetManager.AllEndLessHeroDataResponse(0, LoadingPanel.OnStep) end,--无尽英雄数据
--[[[40] =]]function() NetManager.GetEndlessTreasureInfoResponse(LoadingPanel.OnStep) end,--无尽密保
--[[[41] =]]function() MyGuildManager.ReuqsetRedPackage(LoadingPanel.OnStep) end, --请求红包
@ -690,7 +690,7 @@ function this.ExecuteLoading()
--[[[50] =]]function() NetManager.GetLikeableDataRequest(LoadingPanel.OnStep) end, --好感度
--[[[51] =]]function() NetManager.GetTransformationRequest(LoadingPanel.OnStep) end, --身外化身
--[[[51] =]]function() NetManager.GetLingMaiInfoRequest(0,LoadingPanel.OnStep) end, --灵脉秘境
--[[[51] =]]function() NetManager.SendGetTailsmanSoulData(LoadingPanel.OnStep) end, --灵脉秘境
--[[[51] =]]function() NetManager.SendGetTailsmanSoulData(LoadingPanel.OnStep) end, --法宝之灵
function() -- 登录请求最终接口，所有请求放在此接口之前
-- 登录成功确认
NetManager.LoginConfimRequest()

14
Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
View File

@ -116,6 +116,7 @@ function GMPanel:InitComponent()
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "鑫鹏的gm", inputTip = {""}, callBack = this.SendToXinPeng},
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "一键法宝碎片", inputTip = {""}, callBack = this.GetFaBaoSuiPian},
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "一键变身卡", inputTip = {""}, callBack = this.GetBianshenka},
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "一键命石", inputTip = {""}, callBack = this.GetGem},
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "16#%s#0", btnTip = "跳转", inputTip = {"输入兽潮层数"}, callBack = nil},
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "15#%s#0", btnTip = "获取", inputTip = {"孙龙秘宝积分"}, callBack = this.SetSunLongScroe},
@ -413,6 +414,19 @@ function this.GetBianshenka()
end)
end
function this.GetGem()
local ic = ConfigManager.GetConfig(ConfigName.ItemConfig)
local i = 0
coroutine.start(function()
for _, configInfo in ConfigPairs(ConfigManager.GetConfig(ConfigName.ItemConfig)) do
if ItemType.Gem == configInfo.ItemType then
NetManager.GMEvent("1#"..configInfo.Id.."#5")
coroutine.wait(0.01)
end
end
end)
end
-- 测试跳转
function this.TestJump(text)
JumpManager.GoJump(tonumber(text))

2
Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
View File

@ -237,7 +237,7 @@ function this.PlayerInfoRequest(func)
-- 服务器开启时间
PlayerManager.SetServerOpenTime(msg.serverOpenTime)
TailsManSoulManager.SetTailsmanLv(msg.FaBaoSoulInfos)
GemManager.GetWearedGem(msg.lifeGridInfos)
if func then
func(msg)
end