diff --git a/Assets/ManagedResources/DynamicAtlas/b_baridenglu_slogan02_zh.png b/Assets/ManagedResources/DynamicAtlas/b_baridenglu_slogan02_zh.png
index 94b224fc61..b68972c63b 100644
Binary files a/Assets/ManagedResources/DynamicAtlas/b_baridenglu_slogan02_zh.png and b/Assets/ManagedResources/DynamicAtlas/b_baridenglu_slogan02_zh.png differ
diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
index 34c4ccd00b..f7b8fc9ee0 100644
--- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
+++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
@@ -2862,7 +2862,7 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag
SoulPrintSpriteByQuantity={
[0] = { circle = "r_hunyin_hunyinkuangzise001", circleBg1 = "r_hunyin_hunyinkuangwu",circleBg2 = "r_hunyin_hunyinkuangzise002"},--未装备时的显示图片
- [3] = { circle = "R_zhandou_huntiao_001_en", circleBg1 = "r_hunyin_hunyinkuangzise",circleBg2 = "r_hunyin_hunyinkuangzise002"},
+ [3] = { circle = "R_zhandou_huntiao_001", circleBg1 = "r_hunyin_hunyinkuangzise",circleBg2 = "r_hunyin_hunyinkuangzise002"},
[4] = { circle = "r_hunyin_hunyinkuangzise001", circleBg1 = "r_hunyin_hunyinkuangzise",circleBg2 = "r_hunyin_hunyinkuangzise002"},
[5] = { circle = "r_hunyin_hunyinkuanghuang001", circleBg1 = "r_hunyin_hunyinkuanghuang",circleBg2 = "r_hunyin_hunyinkuanghuang002"},
[6] = { circle = "r_hunyin_hunyinkuanghong001", circleBg1 = "r_hunyin_hunyinkuanghong",circleBg2 = "r_hunyin_hunyinkuanghong002"},
diff --git a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
index cb7106ad42..1c4e457e51 100644
--- a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
+++ b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
@@ -572,9 +572,11 @@ WELFAREREDPACKETSENDREQUEST_ID_FIELD = protobuf.FieldDescriptor();
WELFAREREDPACKETSENDRESPONSE = protobuf.Descriptor();
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD = protobuf.FieldDescriptor();
HARDSTAGEREQUEST = protobuf.Descriptor();
+HARDSTAGEREQUEST_PAGE_FIELD = protobuf.FieldDescriptor();
HARDSTAGERESPONSE = protobuf.Descriptor();
HARDSTAGERESPONSE_INFO_FIELD = protobuf.FieldDescriptor();
HARDSTAGERESPONSE_ISTAKE_FIELD = protobuf.FieldDescriptor();
+HARDSTAGERESPONSE_ISEND_FIELD = protobuf.FieldDescriptor();
HARDSTAGEFIGHTREQUEST = protobuf.Descriptor();
HARDSTAGEFIGHTREQUEST_NODEID_FIELD = protobuf.FieldDescriptor();
HARDSTAGEFIGHTREQUEST_TEAMID_FIELD = protobuf.FieldDescriptor();
@@ -5940,11 +5942,21 @@ WELFAREREDPACKETSENDRESPONSE.enum_types = {}
WELFAREREDPACKETSENDRESPONSE.fields = {WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD}
WELFAREREDPACKETSENDRESPONSE.is_extendable = false
WELFAREREDPACKETSENDRESPONSE.extensions = {}
+HARDSTAGEREQUEST_PAGE_FIELD.name = "page"
+HARDSTAGEREQUEST_PAGE_FIELD.full_name = ".rpc.protocols.HardStageRequest.page"
+HARDSTAGEREQUEST_PAGE_FIELD.number = 1
+HARDSTAGEREQUEST_PAGE_FIELD.index = 0
+HARDSTAGEREQUEST_PAGE_FIELD.label = 1
+HARDSTAGEREQUEST_PAGE_FIELD.has_default_value = false
+HARDSTAGEREQUEST_PAGE_FIELD.default_value = 0
+HARDSTAGEREQUEST_PAGE_FIELD.type = 5
+HARDSTAGEREQUEST_PAGE_FIELD.cpp_type = 1
+
HARDSTAGEREQUEST.name = "HardStageRequest"
HARDSTAGEREQUEST.full_name = ".rpc.protocols.HardStageRequest"
HARDSTAGEREQUEST.nested_types = {}
HARDSTAGEREQUEST.enum_types = {}
-HARDSTAGEREQUEST.fields = {}
+HARDSTAGEREQUEST.fields = {HARDSTAGEREQUEST_PAGE_FIELD}
HARDSTAGEREQUEST.is_extendable = false
HARDSTAGEREQUEST.extensions = {}
HARDSTAGERESPONSE_INFO_FIELD.name = "info"
@@ -5968,11 +5980,21 @@ HARDSTAGERESPONSE_ISTAKE_FIELD.default_value = false
HARDSTAGERESPONSE_ISTAKE_FIELD.type = 8
HARDSTAGERESPONSE_ISTAKE_FIELD.cpp_type = 7
+HARDSTAGERESPONSE_ISEND_FIELD.name = "isEnd"
+HARDSTAGERESPONSE_ISEND_FIELD.full_name = ".rpc.protocols.HardStageResponse.isEnd"
+HARDSTAGERESPONSE_ISEND_FIELD.number = 3
+HARDSTAGERESPONSE_ISEND_FIELD.index = 2
+HARDSTAGERESPONSE_ISEND_FIELD.label = 1
+HARDSTAGERESPONSE_ISEND_FIELD.has_default_value = false
+HARDSTAGERESPONSE_ISEND_FIELD.default_value = 0
+HARDSTAGERESPONSE_ISEND_FIELD.type = 5
+HARDSTAGERESPONSE_ISEND_FIELD.cpp_type = 1
+
HARDSTAGERESPONSE.name = "HardStageResponse"
HARDSTAGERESPONSE.full_name = ".rpc.protocols.HardStageResponse"
HARDSTAGERESPONSE.nested_types = {}
HARDSTAGERESPONSE.enum_types = {}
-HARDSTAGERESPONSE.fields = {HARDSTAGERESPONSE_INFO_FIELD, HARDSTAGERESPONSE_ISTAKE_FIELD}
+HARDSTAGERESPONSE.fields = {HARDSTAGERESPONSE_INFO_FIELD, HARDSTAGERESPONSE_ISTAKE_FIELD, HARDSTAGERESPONSE_ISEND_FIELD}
HARDSTAGERESPONSE.is_extendable = false
HARDSTAGERESPONSE.extensions = {}
HARDSTAGEFIGHTREQUEST_NODEID_FIELD.name = "nodeId"
diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
index 07c8c544b0..1c7bf09278 100644
--- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
@@ -91,7 +91,6 @@ function BagPanel:BindEvent()
return
end
sortIndex = i
- LogError("i==="..i)
this.OnClickTabBtn(sortIndex, tabs1[sortIndex])
end
end)
@@ -236,7 +235,6 @@ function this.OnClickTabBtn(_index, _clickBtn, isTop,isNotAni,_tabIndex)
itemData = {}
local itemNumText = this.itemNumText:GetComponent("Text")
this:SetSelectBtn(_clickBtn)
- print("_index ".._index)
if _index == ItemBaseType.Equip then
local allEquipData = BagManager.GetBagItemDataByItemType(ItemBaseType.Equip)
-- local allEquipNum = 0
@@ -524,7 +522,7 @@ function this.SingleItemDataShow(_go, _itemData)
local redPoint = Util.GetGameObject(_go.gameObject, "GameObject/redPoint")
Util.AddOnceClick(Util.GetGameObject(_go.gameObject, "GameObject/item/frame"), function()
if _itemData.itemConfig then
- LogError("_itemData.itemConfig.ItemBaseType==".._itemData.itemConfig.ItemBaseType)
+ -- LogError("_itemData.itemConfig.ItemBaseType==".._itemData.itemConfig.ItemBaseType)
if _itemData.itemConfig.ItemBaseType == ItemBaseType.Equip then
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this, _itemData,1,true,true,nil,function()
this.OnClickTabBtn(sortIndex, sortIndexBtnGo,false,true)
diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
index ee84fd4116..884de83622 100644
--- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
@@ -985,6 +985,7 @@ local OpenSeverWelfareRewardShow = {
[81128] = {image1 = "r_guanka_guankajianglibaoxiang",image2 = "r_guanka_guankajiangli03_zh"},
[11023] = {image1 = "r_guanka_guankajianglishunwukong",image2 = "r_guanka_guankajiangli04_zh"},
[11014] = {image1 = "c_nz_00029_t1",image2 = "r_guanka_guankajiangli03_zh"},
+ [11033] = {image1 = "c_h_0007_t1",image2 = "r_guanka_guankajiangli03_zh"},
[87] = {image1 = "r_Material_Mineral_0003",image2 = ""},
}
function this.UpdateOpenSeverWelfare()
diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua
index a43f1b98cb..c3c30614eb 100644
--- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua
@@ -51,7 +51,7 @@ function this.Initialize()
this.curSelect = 0
end
--后端更新章节信息
-function this.UpdataChapterData(msg,_isShowChapterOpenPopup)
+function this.UpdataChapterData(msg,isEnd,_isShowChapterOpenPopup)
local oldChapterId = this.GetCurChapterId()
if msg then
for i = 1, #msg.chapter do
@@ -86,8 +86,11 @@ function this.UpdataChapterData(msg,_isShowChapterOpenPopup)
table.sort(singleHardStageChapter.reward, function(a,b) return a.id < b.id end)
allChapterData[msg.chapter[i].chapterId] = singleHardStageChapter
end
- CheckRedPointStatus(RedPointType.FightLevelBoxReward)
- PracticeManager.StarNum = FightLevelManager.GetAllChapterStars()
+ if isEnd==1 then
+ CheckRedPointStatus(RedPointType.FightLevelBoxReward)
+ PracticeManager.StarNum = FightLevelManager.GetAllChapterStars()
+ end
+
end
end
--获取整个章节信息
diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
index d178b4fcf2..b0cf370106 100644
--- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
@@ -325,7 +325,6 @@ function this.GetFormationPower(formationId)
-- 刷新后端战斗力
if power2 > PlayerManager.maxForce then
- Log("发送队伍战力改变 ~~~~~~~~~~~~~~ ")
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)--targetTeamId
PlayerManager.maxForce = power2
end
diff --git a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
index 6bd8e68b46..8f5b7f0d33 100644
--- a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
@@ -521,7 +521,8 @@ function this.CarbonOpenTip()
-- table.insert(openRuleList, AllActSetConfig[18].OpenRules)
-- table.insert(openRuleList, AllActSetConfig[30].OpenRules)
-- table.insert(openRuleList, AllActSetConfig[46].OpenRules)
- table.insert(openRuleList, AllActSetConfig[67].OpenRules)
+ --根据副本里面功能 等级最低的设置提示
+ table.insert(openRuleList, AllActSetConfig[44].OpenRules)
for i = 1, #openRuleList do
local openRule = openRuleList[i][1]
diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
index 1d0ae4b9d0..c9bf6e9331 100644
--- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
@@ -1017,7 +1017,7 @@ function this.HardStageResponse(buffer)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.HardStageResponse()
msg:ParseFromString(data)
- FightLevelManager.UpdataChapterData(msg.info,true)
+ FightLevelManager.UpdataChapterData(msg.info,msg.isEnd,true)
end
--神印信息推送
diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
index cc9c2679a8..a346172f76 100644
--- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
@@ -5534,17 +5534,27 @@ function NetManager.HardStageFightRequest(_nodeId,_teamId,func)
end
end)
end
+local page=1
--山河社稷图初始化数据
function NetManager.HardStageRequest(func)
local data = PlayerInfoProto_pb.HardStageRequest()
+ data.page=page
+ -- LogBlue("~~~~~~~~~~~~~~~~"..page)
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.HARD_STAGE_INFO_REQUEST, MessageTypeProto_pb.HARD_STAGE_INFO_RESPONSE, msg, function(buffer)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.HardStageResponse()
msg:ParseFromString(data)
- FightLevelManager.UpdataChapterData(msg.info)
- if func then
- func(msg)
+ FightLevelManager.UpdataChapterData(msg.info,msg.isEnd,false)
+ -- LogBlue("~~~~~~~~~~~~~~~~"..msg.isEnd)
+ if msg.isEnd==1 then
+ page=1
+ if func then
+ func(msg)
+ end
+ else
+ page=page+1
+ this.HardStageRequest(func)
end
end)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua
index 6dea90741f..f3ea19533d 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua
@@ -54,7 +54,7 @@ function this:OnShow(_parent,...)
_Con_Recharge = tonumber(con[1])
_Con_Star = tonumber(con[2])
this.titleText.text=Language[11587]
- this.text1.text=string.format("消耗%s点仙缘积分\n开启一次仙缘汇聚箱必得5星神将!",_CostItem)
+ this.text1.text=string.format("消耗%s点仙缘积分\n开启一次仙缘汇聚箱必得5星传说及以上神将!",_CostItem)
this.text2.text=""--Language[11589] --后续改成读表
this.text3.text= string.format("充值%s或山河社稷图累计星数到达%s开启", string.format(MoneyUtil.GetMoneyUnitName(), _Con_Recharge), _Con_Star)
--Language[11590]..string.format(MoneyUtil.GetMoneyUnitName(),_Con_Recharge)..Language[11591]
diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua
index 07835101cc..d9dedc4e62 100644
--- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua
@@ -318,7 +318,6 @@ function Practice:OnShow()
CheckRedPointStatus(RedPointType.Practice_Cultivation)
FormationManager.RefreshMainFormationPower()
self.curLevelConfig = PracticeManager.GetCurConfigData()
- Log("当前修行等级Id:"..tostring(PracticeManager.PracticeLevel))
oldPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
oldBigLevel = PracticeManager.PracticeBigLevel
self.pointData = PracticeManager.GetPointsData()