diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab
index 2bcfb39bae..58d1e23f12 100644
--- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab
@@ -3377,6 +3377,85 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &8852520567566857061
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7575865812575048841}
+ - component: {fileID: 5276202281349785116}
+ - component: {fileID: 5235405405442694011}
+ m_Layer: 5
+ m_Name: myInfo
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7575865812575048841
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8852520567566857061}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 6925281564069932743}
+ - {fileID: 2585648178723148069}
+ - {fileID: 1785438770459517311}
+ - {fileID: 4010916176053048208}
+ - {fileID: 3473016552857172522}
+ m_Father: {fileID: 7762200945649804485}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -0.74, y: -433}
+ m_SizeDelta: {x: 908.52, y: 141}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5276202281349785116
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8852520567566857061}
+ m_CullTransparentMesh: 0
+--- !u!114 &5235405405442694011
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8852520567566857061}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: 47ccf8e564bf02a4abcd63d79d634f64, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &8979062592373469362
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
index 09701123b6..12121b7e50 100644
--- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
+++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
@@ -465,6 +465,7 @@ PanelType = {
TimelimitCall={87,16}, --限时召唤
QianKunBox={1002,1003,16},--乾坤包囊
HeroReplace={14,16,92},--神将置换
+ Celebration = {14,16,50003}--社稷大典
}
@@ -516,6 +517,7 @@ UpViewRechargeType = {
Iron = 1001,--铁矿石
FixforDan = 1002,--修为丹
EndlessCoin = 1201,--无尽币
+ Celebration = 50003,--社稷赏
}
SHOP_PAGE = {
@@ -556,6 +558,7 @@ SHOP_TYPE = {
FINDFAIRY_GIFT=22, --寻仙限时礼包
BUYCOIN_SHOP=57, --点金商店
QIANKUNBOX_SHOP=58, --宝囊限时商店
+ CELEBRATION_SHOP = 62, --社稷大典商店
}
PropertyTypeIconDef = {
@@ -1802,8 +1805,7 @@ RANK_TYPE = {
FAST_EXPLORE=25,--极速达人排行
GUILDTRANSCRIPT=26,--公会排行
- CELEBRATION_PERSON = 27,--社稷大典个人
- CELEBRATION_GUILD = 28,--社稷大典工会
+ CELEBRATION_GUILD = 27,--社稷大典工会排行
}
--东海寻仙弹窗类型
diff --git a/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua b/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
new file mode 100644
index 0000000000..8ec8655361
--- /dev/null
+++ b/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
@@ -0,0 +1,102 @@
+-- Generated By protoc-gen-lua Do not Edit
+local protobuf = require "protobuf/protobuf"
+local CommonProto_pb = require("CommonProto_pb")
+module('ActivityProto_pb')
+
+
+COMMITSHEJIACTIVITYITEMREQUEST = protobuf.Descriptor();
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD = protobuf.FieldDescriptor();
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMNUM_FIELD = protobuf.FieldDescriptor();
+COMMITSHEJIACTIVITYITEMRESPONSE = protobuf.Descriptor();
+COMMITSHEJIACTIVITYITEMRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
+GETSHEJIAWARDREQUEST = protobuf.Descriptor();
+GETSHEJIAWARDREQUEST_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
+GETSHEJIAWARDRESPONSE = protobuf.Descriptor();
+GETSHEJIAWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
+
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.name = "itemId"
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.full_name = ".com.ljsd.jieling.protocols.CommitShejiActivityItemRequest.itemId"
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.number = 1
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.index = 0
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.label = 1
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.has_default_value = false
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.default_value = 0
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.type = 5
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.cpp_type = 1
+
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMNUM_FIELD.name = "itemNum"
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMNUM_FIELD.full_name = ".com.ljsd.jieling.protocols.CommitShejiActivityItemRequest.itemNum"
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMNUM_FIELD.number = 2
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMNUM_FIELD.index = 1
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMNUM_FIELD.label = 1
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMNUM_FIELD.has_default_value = false
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMNUM_FIELD.default_value = 0
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMNUM_FIELD.type = 5
+COMMITSHEJIACTIVITYITEMREQUEST_ITEMNUM_FIELD.cpp_type = 1
+
+COMMITSHEJIACTIVITYITEMREQUEST.name = "CommitShejiActivityItemRequest"
+COMMITSHEJIACTIVITYITEMREQUEST.full_name = ".com.ljsd.jieling.protocols.CommitShejiActivityItemRequest"
+COMMITSHEJIACTIVITYITEMREQUEST.nested_types = {}
+COMMITSHEJIACTIVITYITEMREQUEST.enum_types = {}
+COMMITSHEJIACTIVITYITEMREQUEST.fields = {COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD, COMMITSHEJIACTIVITYITEMREQUEST_ITEMNUM_FIELD}
+COMMITSHEJIACTIVITYITEMREQUEST.is_extendable = false
+COMMITSHEJIACTIVITYITEMREQUEST.extensions = {}
+COMMITSHEJIACTIVITYITEMRESPONSE_DROP_FIELD.name = "drop"
+COMMITSHEJIACTIVITYITEMRESPONSE_DROP_FIELD.full_name = ".com.ljsd.jieling.protocols.CommitShejiActivityItemResponse.drop"
+COMMITSHEJIACTIVITYITEMRESPONSE_DROP_FIELD.number = 1
+COMMITSHEJIACTIVITYITEMRESPONSE_DROP_FIELD.index = 0
+COMMITSHEJIACTIVITYITEMRESPONSE_DROP_FIELD.label = 1
+COMMITSHEJIACTIVITYITEMRESPONSE_DROP_FIELD.has_default_value = false
+COMMITSHEJIACTIVITYITEMRESPONSE_DROP_FIELD.default_value = nil
+COMMITSHEJIACTIVITYITEMRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
+COMMITSHEJIACTIVITYITEMRESPONSE_DROP_FIELD.type = 11
+COMMITSHEJIACTIVITYITEMRESPONSE_DROP_FIELD.cpp_type = 10
+
+COMMITSHEJIACTIVITYITEMRESPONSE.name = "CommitShejiActivityItemResponse"
+COMMITSHEJIACTIVITYITEMRESPONSE.full_name = ".com.ljsd.jieling.protocols.CommitShejiActivityItemResponse"
+COMMITSHEJIACTIVITYITEMRESPONSE.nested_types = {}
+COMMITSHEJIACTIVITYITEMRESPONSE.enum_types = {}
+COMMITSHEJIACTIVITYITEMRESPONSE.fields = {COMMITSHEJIACTIVITYITEMRESPONSE_DROP_FIELD}
+COMMITSHEJIACTIVITYITEMRESPONSE.is_extendable = false
+COMMITSHEJIACTIVITYITEMRESPONSE.extensions = {}
+GETSHEJIAWARDREQUEST_ACTIVITYID_FIELD.name = "activityId"
+GETSHEJIAWARDREQUEST_ACTIVITYID_FIELD.full_name = ".com.ljsd.jieling.protocols.GetShejiAwardRequest.activityId"
+GETSHEJIAWARDREQUEST_ACTIVITYID_FIELD.number = 1
+GETSHEJIAWARDREQUEST_ACTIVITYID_FIELD.index = 0
+GETSHEJIAWARDREQUEST_ACTIVITYID_FIELD.label = 1
+GETSHEJIAWARDREQUEST_ACTIVITYID_FIELD.has_default_value = false
+GETSHEJIAWARDREQUEST_ACTIVITYID_FIELD.default_value = 0
+GETSHEJIAWARDREQUEST_ACTIVITYID_FIELD.type = 5
+GETSHEJIAWARDREQUEST_ACTIVITYID_FIELD.cpp_type = 1
+
+GETSHEJIAWARDREQUEST.name = "GetShejiAwardRequest"
+GETSHEJIAWARDREQUEST.full_name = ".com.ljsd.jieling.protocols.GetShejiAwardRequest"
+GETSHEJIAWARDREQUEST.nested_types = {}
+GETSHEJIAWARDREQUEST.enum_types = {}
+GETSHEJIAWARDREQUEST.fields = {GETSHEJIAWARDREQUEST_ACTIVITYID_FIELD}
+GETSHEJIAWARDREQUEST.is_extendable = false
+GETSHEJIAWARDREQUEST.extensions = {}
+GETSHEJIAWARDRESPONSE_DROP_FIELD.name = "drop"
+GETSHEJIAWARDRESPONSE_DROP_FIELD.full_name = ".com.ljsd.jieling.protocols.GetShejiAwardResponse.drop"
+GETSHEJIAWARDRESPONSE_DROP_FIELD.number = 1
+GETSHEJIAWARDRESPONSE_DROP_FIELD.index = 0
+GETSHEJIAWARDRESPONSE_DROP_FIELD.label = 1
+GETSHEJIAWARDRESPONSE_DROP_FIELD.has_default_value = false
+GETSHEJIAWARDRESPONSE_DROP_FIELD.default_value = nil
+GETSHEJIAWARDRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
+GETSHEJIAWARDRESPONSE_DROP_FIELD.type = 11
+GETSHEJIAWARDRESPONSE_DROP_FIELD.cpp_type = 10
+
+GETSHEJIAWARDRESPONSE.name = "GetShejiAwardResponse"
+GETSHEJIAWARDRESPONSE.full_name = ".com.ljsd.jieling.protocols.GetShejiAwardResponse"
+GETSHEJIAWARDRESPONSE.nested_types = {}
+GETSHEJIAWARDRESPONSE.enum_types = {}
+GETSHEJIAWARDRESPONSE.fields = {GETSHEJIAWARDRESPONSE_DROP_FIELD}
+GETSHEJIAWARDRESPONSE.is_extendable = false
+GETSHEJIAWARDRESPONSE.extensions = {}
+
+CommitShejiActivityItemRequest = protobuf.Message(COMMITSHEJIACTIVITYITEMREQUEST)
+CommitShejiActivityItemResponse = protobuf.Message(COMMITSHEJIACTIVITYITEMRESPONSE)
+GetShejiAwardRequest = protobuf.Message(GETSHEJIAWARDREQUEST)
+GetShejiAwardResponse = protobuf.Message(GETSHEJIAWARDRESPONSE)
+
diff --git a/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua.meta b/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua.meta
new file mode 100644
index 0000000000..ab32f91f26
--- /dev/null
+++ b/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c9d5ba5cfbb6a9243b860043af87a37e
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua b/Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
index d138d2d1d9..376011b21e 100644
--- a/Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
+++ b/Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
@@ -639,6 +639,10 @@ MESSAGETYPE_CANCELHEROCHANGEREQUEST_ENUM = protobuf.EnumValueDescriptor();
MESSAGETYPE_CANCELHEROCHANGERESPONSE_ENUM = protobuf.EnumValueDescriptor();
MESSAGETYPE_DOHEROCHANGEREQUEST_ENUM = protobuf.EnumValueDescriptor();
MESSAGETYPE_DOHEROCHANGERESPONSE_ENUM = protobuf.EnumValueDescriptor();
+MESSAGETYPE_COMMITSHEJIACTIVITYITEMREQUEST_ENUM = protobuf.EnumValueDescriptor();
+MESSAGETYPE_COMMITSHEJIACTIVITYITEMRESPONSE_ENUM = protobuf.EnumValueDescriptor();
+MESSAGETYPE_GETSHEJIAWARDREQUEST_ENUM = protobuf.EnumValueDescriptor();
+MESSAGETYPE_GETSHEJIAWARDRESPONSE_ENUM = protobuf.EnumValueDescriptor();
MESSAGETYPE_HEART_BEAT_REQUEST_ENUM.name = "HEART_BEAT_REQUEST"
MESSAGETYPE_HEART_BEAT_REQUEST_ENUM.index = 0
@@ -2638,6 +2642,8 @@ COOK_FOOD_REQUEST = 10200
COOK_FOOD_RESPONSE = 10201
CancelHeroChangeRequest = 303603
CancelHeroChangeResponse = 303604
+CommitShejiActivityItemRequest = 303653
+CommitShejiActivityItemResponse = 303654
ComplexJewelEquipRequest = 30301
ComplexJewelEquipResponse = 30302
DAILY_CHALLENGE_REQUEST = 10307
@@ -2888,6 +2894,8 @@ GUILD_SKILL_LEVEL_UP_REQUEST = 16668
GUILD_SKILL_LEVEL_UP_RESPONSE = 16669
GUILD_SKILL_RESET_REQUEST = 16666
GUILD_SKILL_RESET_RESPONSE = 16667
+GetShejiAwardRequest = 303655
+GetShejiAwardResponse = 303656
GuildGetHelpLogRequest = 303314
GuildGetHelpLogResponse = 303315
GuildHelpGetAllRequest = 303312
diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
index 3fd31f60f8..ca7c93e269 100644
--- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
@@ -10,6 +10,7 @@ require "Message/MissionInfoProto_pb"
require "Message/ArenaInfoProto_pb"
require "Message/Family_pb"
require "Message/Expedition_pb"
+require "Message/ActivityProto_pb"
NetManager = {}
local this = NetManager
diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
index 040761aa5b..b7eafc4933 100644
--- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
@@ -764,11 +764,11 @@ function this.InitDynamicActData()
if (not id) or id < 1 then
return nil
end
- LogGreen("ActivityId:"..id)
+ -- LogGreen("ActivityId:"..id)
this.allData = {}
local allListData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ThemeActivityTaskConfig, "ActivityId", id)
local allMissionData = TaskManager.GetTypeTaskList(TaskTypeDef.DynamicActTask)
- LogGreen("allMissionData:"..#allMissionData)
+ -- LogGreen("allMissionData:"..#allMissionData)
for i=1,#allListData do
for j=1,#allMissionData do
if allListData[i].Id == allMissionData[j].missionId then
@@ -840,7 +840,7 @@ function this.CheckLeiJiChongZhiRedData()
return false
end
for j = 1,#mission do
- LogGreen(mission[j].id..":"..mission[j].state)
+ -- LogGreen(mission[j].id..":"..mission[j].state)
if mission[j].state == 2 then
return true
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
index f2c8a42f9d..78fffb83c7 100644
--- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
@@ -140,6 +140,9 @@ function this.SetRankingInfo()
elseif sData.rankType == RANK_TYPE.ARENA_RANK then
dData = { rankInfo = {param1 = myRankData.param1},
score = myRankData.param1}
+ elseif sData.rankType == RANK_TYPE.CELEBRATION_GUILD then
+ dData = { rankInfo = {param1 = myRankData.param1},
+ score = myRankData.param1}
end
this.SetInfoShow(this.infoGo,dData,sData.rankType)
--数据拆分
@@ -373,20 +376,31 @@ function this.SetInfoShow(go,data,rankType,Value0)
goldExper:GetComponent("Text").text = "试炼层数"
elseif sData.activiteId == ActivityTypeDef.slhjExper then
goldExper:GetComponent("Text").text = "幻境层数"
+ elseif sData.activiteId == ActivityTypeDef.Celebration then
+ goldExper:GetComponent("Text").text = "贡献度"
end
elseif rankType == RANK_TYPE.ARENA_RANK then
- arenaScore:SetActive(true)
- local str = ""
+ arenaScore:SetActive(true)
+ local str = ""
+ if Value0 then
+ Value0:GetComponent("Text").text = ""..data.userName ..""
+ end
+ if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
+ str = Language[12241] .. data.rankInfo.param1--data.param1
+ else
+ str = ""
+ end
+ Util.GetGameObject(go,"arenaScore"):GetComponent("Text").text = str
+
+ elseif rankType == RANK_TYPE.CELEBRATION_GUILD then
+ if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
+ trial:SetActive(true)
if Value0 then
- Value0:GetComponent("Text").text = ""..data.userName ..""
- end
- if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
- str = Language[12241] .. data.rankInfo.param1--data.param1
- else
- str = ""
+ Value0:GetComponent("Text").text = ""..data.userName..""
end
- Util.GetGameObject(go,"arenaScore"):GetComponent("Text").text = str
- -- end
+ Util.GetGameObject(go,"trial/Text"):GetComponent("Text").text = ""
+ Util.GetGameObject(go,"trial"):GetComponent("Text").text = "贡献度:"..data.rankInfo.param1
+ end
end
end
return RankingSingleListPanel
\ No newline at end of file