From 7cc12e74a83f565f0daabab8a89bd21d930311f6 Mon Sep 17 00:00:00 2001
From: jiaoyangna <3046463818@qq.com>
Date: Sat, 22 May 2021 14:08:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E5=B0=BD=E4=BF=AE=E6=94=B9=E6=8F=90?=
=?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../UI/GeneralPanel/GeneralBigPopup.prefab | 147 +++++++++++++++++-
.../ActivityGift/ActivityGiftManager.lua | 2 +-
.../Modules/Fight/FightPointPassMainPanel.lua | 24 ++-
.../View/GeneralBigPopup_WuJinShuXing.lua | 5 +-
.../~Lua/Modules/Map/EndLessMapManager.lua | 17 +-
.../~Lua/Modules/Map/View/EndLessMapView.lua | 46 +++++-
.../~Lua/Modules/Net/NetManager.lua | 1 -
...eralPopup_HeavenUnlockExtraRewardPanel.lua | 2 +-
.../Popup/View/GeneralPopup_Onhook.lua | 64 ++++----
.../~Lua/Modules/Shop/ShopManager.lua | 2 -
10 files changed, 255 insertions(+), 55 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
index 2d4626d274..3b62b6f546 100644
--- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
@@ -923,6 +923,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 7235397798772031766}
- {fileID: 269419546472831222}
- {fileID: 4795305501993605525}
- {fileID: 8176424339527855792}
@@ -2687,7 +2688,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6110186457254972011}
- m_RootOrder: 3
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2800,7 +2801,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6110186457254972011}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@@ -3580,7 +3581,7 @@ RectTransform:
m_Children:
- {fileID: 468637878902286259}
m_Father: {fileID: 6110186457254972011}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@@ -5644,7 +5645,7 @@ RectTransform:
m_Children:
- {fileID: 997451950300272872}
m_Father: {fileID: 6110186457254972011}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@@ -5692,8 +5693,8 @@ MonoBehaviour:
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 0
- m_ChildForceExpandWidth: 1
- m_ChildForceExpandHeight: 1
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!1 &6253031362403224604
@@ -6345,6 +6346,123 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "5\u884CUP"
+--- !u!1 &6851248552328269537
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7235397798772031766}
+ - component: {fileID: 8047619501166915806}
+ - component: {fileID: 8653586432367141607}
+ - component: {fileID: 328505237886583928}
+ m_Layer: 5
+ m_Name: close
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7235397798772031766
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6851248552328269537}
+ 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: []
+ m_Father: {fileID: 6110186457254972011}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8047619501166915806
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6851248552328269537}
+ m_CullTransparentMesh: 0
+--- !u!114 &8653586432367141607
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6851248552328269537}
+ 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: 0}
+ 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: 0}
+ 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!114 &328505237886583928
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6851248552328269537}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 8653586432367141607}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
--- !u!1 &6918866875061293507
GameObject:
m_ObjectHideFlags: 0
@@ -7470,6 +7588,7 @@ GameObject:
- component: {fileID: 997451950300272872}
- component: {fileID: 3291710143839586666}
- component: {fileID: 3690407407107196717}
+ - component: {fileID: 65228950950220926}
m_Layer: 0
m_Name: name
m_TagString: Untagged
@@ -7537,8 +7656,22 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u66B4\u51FB\u51E0\u7387:\u66B4\u51FB\u51E0\u7387:\u66B4\u51FB\u51E0\u7387:\u66B4\u51FB\u51E0\u7387:\u66B4\u51FB\u51E0\u7387:\u66B4\u51FB\u51E0\u7387:\u66B4\u51FB\u51E0\u7387:\u66B4\u51FB\u51E0\u7387:\u66B4\u51FB\u51E0\u7387:\u66B4\u51FB\u51E0\u7387:\u66B4\u51FB\u51E0\u7387:\u66B4\u51FB\u51E0\u7387:\u66B4\u51FB\u51E0\u7387:\u66B4\u51FB\u51E0\u7387:\u66B4\u51FB\u51E0\u7387:\u66B4\u51FB\u51E0\u7387:"
+ m_Text:
LanguageIndex: 0
+--- !u!114 &65228950950220926
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8699232073864740855}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 2
--- !u!1 &8791238277812620481
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
index bfad31755b..96311ab508 100644
--- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
@@ -138,7 +138,7 @@ function this.InitActivityServerData(msg, isUpdate)
this.CheckMoneyProgress(v)
this.mission[v.activityId] = v
- LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value)
+ --LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value)
for n, m in ipairs(v.mission) do
--LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress)
if (v.activityId == ActivityTypeDef.OnlineGift) then
diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
index 243dcb6b25..cf46e2c7bc 100644
--- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
@@ -356,7 +356,29 @@ function FightPointPassMainPanel:OnShow()
CheckRedPointStatus(RedPointType.XiaoYaoYouRedPoint)
-- 功能引导存在时不再显示成长界面
if FightPointPassManager.GetIsOpenRewardUpTip() and not GuideManager.IsFunctionGuideExist() then
- UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.Onhook)
+ local oldLevelId = FightPointPassManager.lastPassFightId
+ local curLevelId = FightPointPassManager.curOpenFight
+ local oldLevelConFig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,oldLevelId)
+ local curLevelConFig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,curLevelId)
+ local data = {}
+ data.title = "g_guanka_jianglitishen_zh"
+ data.itemList = {}
+ data.type = 1
+ for i = 1, #curLevelConFig.RewardShowMin do
+ local oldsinglePro = oldLevelConFig.RewardShowMin[i]
+ local cursinglePro = curLevelConFig.RewardShowMin[i]
+ local singleItem = {}
+ singleItem.icon = cursinglePro[1]
+ singleItem.proName = GetLanguageStrById(itemConfig[cursinglePro[1]].Name)
+ singleItem.proValue = oldsinglePro[2]
+ if cursinglePro[2] - oldsinglePro[2] > 0 then
+ singleItem.proValue1 = ""..cursinglePro[2]..""..Language[11567]
+ else
+ singleItem.proValue1 = ""..cursinglePro[2]..Language[11568]
+ end
+ table.insert(data.itemList,singleItem)
+ end
+ UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.Onhook,data)
end
this.RefreshLittleMap()
this.RefreshPassGiftShow()
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WuJinShuXing.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WuJinShuXing.lua
index c9b66b2e81..a6491ed4f7 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WuJinShuXing.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WuJinShuXing.lua
@@ -11,10 +11,13 @@ function this:InitComponent(gameObject)
self.proGroup =Util.GetGameObject(gameObject, "proGroup")
self.proTitle =Util.GetGameObject(gameObject, "title")
self.proValue =Util.GetGameObject(gameObject, "pro")
+ self.close =Util.GetGameObject(gameObject, "close")
end
function this:BindEvent()
-
+ Util.AddClick(self.close,function()
+ parent:ClosePanel()
+ end)
end
function this:AddListener()
diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua
index 8b0ddbfb49..6d6dd3c085 100644
--- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua
@@ -120,7 +120,7 @@ end
-- 登录初始化地图数据
function this.InitMapInfoData(mapId)
- LogGreen("mapId:"..mapId)
+ -- LogGreen("mapId:"..mapId)
this.openMapId = mapId > 1 and mapId or 4002-- 开放的地图ID
end
-- ================================== 妖灵师状态刷新 ========================================
@@ -364,7 +364,10 @@ function this.InitAllEndlessHero(heroList,isClear)
this.InitSingleEndlessHero(heroList[i])
end
local id ,lv = this.GetShiQiValue()
+ -- LogGreen("lv:"..lv)
this.moraleLv = lv
+ -- LogGreen("this.moraleLv:"..this.moraleLv)
+ this.moraleId = id
end
function this.InitSingleEndlessHero(_msgHeroData)
@@ -760,7 +763,7 @@ function this.SetRewardData()
local allMissionData = TaskManager.GetTypeTaskList(TaskTypeDef.wujinfuben)
for k,v in ipairs(this.mission) do
for j = 1,#allMissionData do
- LogGreen("allMissionData[j].missionId:"..allMissionData[j].missionId.." allMissionData[j].state :"..allMissionData[j].state )
+ -- LogGreen("allMissionData[j].missionId:"..allMissionData[j].missionId.." allMissionData[j].state :"..allMissionData[j].state )
if v.Id == allMissionData[j].missionId then
if v.progress == 0 then
v.progress = allMissionData[j].progress
@@ -795,7 +798,7 @@ function this.GetRewardData()
this.SetRewardData()
local data = nil
for i = 1 ,#this.mission do
- LogGreen("id:"..this.mission[i].Id.." state:"..this.mission[i].state)
+ -- LogGreen("id:"..this.mission[i].Id.." state:"..this.mission[i].state)
end
for i = 1 ,#this.mission do
if this.mission[i].state == 1 then
@@ -889,18 +892,18 @@ function this.InitTreasureData(msg)
this.treasureData = {}
this.treasureData.tip = "无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝"
--重置时间
- LogGreen("msg.resetTime:"..msg.resetTime)
+ -- LogGreen("msg.resetTime:"..msg.resetTime)
this.treasureData.resetTime = msg.resetTime
--购买状态
- LogGreen("msg.isBuy:"..msg.isBuy)
+ -- LogGreen("msg.isBuy:"..msg.isBuy)
this.SetTreasureGiftState(msg.isBuy)
- LogGreen("msg.score:"..msg.score)
+ -- LogGreen("msg.score:"..msg.score)
this.treasureData.curScore = BagManager.GetItemCountById(EndLessMapManager.scoreValueId) or 0
this.GetTreasureData()
this.treasureData.rewardData = this.treasureDataReward
this.treasureData.curDataId,this.treasureData.curDataLevel = this.GetTreasureLevel()
for i = 1 ,#msg.treasureRewardState do
- LogGreen("msg.treasureRewardState[i].id:"..msg.treasureRewardState[i].id.." msg.treasureRewardState[i].state:"..msg.treasureRewardState[i].state)
+ -- LogGreen("msg.treasureRewardState[i].id:"..msg.treasureRewardState[i].id.." msg.treasureRewardState[i].state:"..msg.treasureRewardState[i].state)
this.SetTreasureState(msg.treasureRewardState[i].id,msg.treasureRewardState[i].state)
end
return this.treasureData
diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
index 4d90ae4a3a..e7fbfc583a 100644
--- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
@@ -10,6 +10,7 @@ local challengeMapConfig = ConfigManager.GetConfig(ConfigName.ChallengeMapConfig
local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
local endlessMorale = ConfigManager.GetConfig(ConfigName.endlessMorale)
local PassiveSkillConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillConfig)
+local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
local ctrlView = require("Modules/Map/View/MapControllView")
local pointView = require("Modules/Map/View/PointHandleView")
local MapPanel
@@ -370,19 +371,60 @@ function this.RefreshTargetRoote()
end
function this.SetShiQiValue()
- local itemCount = BagManager.GetItemCountById(this.shiQiValueId)
+ local cursinglePro
+ local itemCount = BagManager.GetItemCountById(this.shiQiValue)
local id, lv = EndLessMapManager.GetShiQiValue()
- if lv ~= EndLessMapManager.moraleLv then
+ if lv ~= EndLessMapManager.moraleLv then
isShow = true
+ cursinglePro = endlessMorale[id]
EndLessMapManager.moraleLv = lv
+ EndLessMapManager.moraleId = id
end
this.shiQiProgress.text = (endlessMorale[id].Exp and endlessMorale[id].Exp > 0) and itemCount.."/"..endlessMorale[id].Exp or "1/1"
this.shiQiLv.text = lv
this.shiQifillAmount = (endlessMorale[id].Exp and endlessMorale[id].Exp > 0) and itemCount/endlessMorale[id].Exp or 1
+
+
if isShow then
--士气等级提升
isShow = false
+ local data = {}
+ data.title = "g_guanka_jianglitishen_zh" --士气等级提升图片
+ data.itemList = {}
+ data.type = 2
+ local s = function(curId)
+ local proPs = {}
+ for k,v in ConfigPairs(endlessMorale) do
+ if v.Id <= curId then
+ for i = 1 ,#v.Props do
+ if not proPs[v.Props[i][1]] then
+ proPs[v.Props[i][1]] = 0
+ end
+ proPs[v.Props[i][1]] = proPs[v.Props[i][1]] + v.Props[i][2]
+ end
+ end
+ end
+ return proPs
+ end
+ local upPro = s(id)
+ for k,v in pairs(upPro) do
+ LogGreen("k:"..k.." v:"..v)
+ end
+ for i = 1, #cursinglePro.Props do
+ if not upPro[cursinglePro.Props[i][1]] then
+ upPro[cursinglePro.Props[i][1]] = 0
+ upPro[cursinglePro.Props[i][1]] = upPro[cursinglePro.Props[i][1]] + cursinglePro.Props[i][2]
+ end
+ local singleItem = {}
+ singleItem.icon = nil
+ singleItem.proName = string.format("全体神将%s",PropertyConfig[cursinglePro.Props[i][1]].Info)
+ LogGreen("k:"..cursinglePro.Props[i][1].." v:"..cursinglePro.Props[i][2])
+ singleItem.proValue = GetEquipPropertyFormatStr(upPro[cursinglePro.Props[i][1]] - cursinglePro.Props[i][2],PropertyConfig[cursinglePro.Props[i][1]].Style)
+ singleItem.proValue1 = ""..GetEquipPropertyFormatStr(upPro[cursinglePro.Props[i][1]],PropertyConfig[cursinglePro.Props[i][1]].Style)..""
+ table.insert(data.itemList,singleItem)
+ end
+ UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.Onhook,data)
end
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
index 8bf273b827..61d3eae5f6 100644
--- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
@@ -379,7 +379,6 @@ function this.MapInfoRequest(mapModeId,func)
MapManager.mapPointList = {}
EndLessMapManager.PointNoteDataList = {}
MapManager.InitData(msg)
- EndLessMapManager.moraleLv = msg.moraleLevel
if func then
func(msg)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
index 14bbf844a4..d66341ca15 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
@@ -15,7 +15,7 @@ local curType = 0
local type = {
[1] = {name=Language[11561],id = 106,goodsType = GoodsTypeDef.TreasureOfHeaven},
[2] = {name=Language[11316],id = 5001,goodsType = GoodsTypeDef.FindBaby},
- [2] = {name="无尽秘宝",id = 107,goodsType = GoodsTypeDef.WuJinMiBao},
+ [3] = {name="无尽秘宝",id = 107,goodsType = GoodsTypeDef.WuJinMiBao},
}
--初始化组件(用于子类重写)
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
index 91df5c8423..e3ac994e8e 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
@@ -6,8 +6,6 @@ local parent
local sortingOrder=0
local fun
local itemList = {}
-local oldLevelId = 0
-local curLevelId = 0
--传入选择英雄
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
this.timer = Timer.New()
@@ -36,47 +34,49 @@ function this:OnShow(_parent,...)
sortingOrder = _parent.sortingOrder
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
local _args = {...}
- fun = _args[1]
+ local data = _args[1]
+ fun = _args[2]
--LogGreen("FightPointPassManager.lastPassFightId "..FightPointPassManager.lastPassFightId .. " " .. FightPointPassManager.curOpenFight)
- oldLevelId = FightPointPassManager.lastPassFightId
- curLevelId = FightPointPassManager.curOpenFight
- local oldLevelConFig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,oldLevelId)
- local curLevelConFig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,curLevelId)
+
--itemList
- if curLevelConFig then
- for i = 1, math.max(#itemList, #curLevelConFig.RewardShowMin) do
- local go = itemList[i]
- if not go then
- go = newObject(this.proPre)
- go.transform:SetParent(this.Root.transform)
- go.transform.localScale = Vector3.one
- go.transform.localPosition = Vector3.zero
- itemList[i] = go
+ if data then
+ for i = 1, math.max(#itemList, #data.itemList) do
+ if not itemList[i] then
+ itemList[i] = {}
+ itemList[i].go = newObject(this.proPre)
+ itemList[i].go.transform:SetParent(this.Root.transform)
+ itemList[i].go.transform.localScale = Vector3.one
+ itemList[i].go.transform.localPosition = Vector3.zero
+ itemList[i].icon = Util.GetGameObject(itemList[i].go,"Image"):GetComponent("Image")
+ itemList[i].proName = Util.GetGameObject(itemList[i].go, "proName"):GetComponent("Text")
+ itemList[i].proValue = Util.GetGameObject(itemList[i].go, "proValue"):GetComponent("Text")
+ itemList[i].nextproValue = Util.GetGameObject(itemList[i].go, "nextproValue"):GetComponent("Text")
end
- go.gameObject:SetActive(false)
+ itemList[i].go.gameObject:SetActive(false)
end
- for i = 1, #curLevelConFig.RewardShowMin do
+ for i = 1, #data.itemList do
local go = itemList[i]
- local oldsinglePro = oldLevelConFig.RewardShowMin[i]
- local cursinglePro = curLevelConFig.RewardShowMin[i]
go.gameObject:SetActive(true)
- Util.GetGameObject(go,"Image"):GetComponent("Image").sprite = SetIcon(cursinglePro[1])
- Util.GetGameObject(go, "proName"):GetComponent("Text").text = GetLanguageStrById(itemConfig[cursinglePro[1]].Name)
- Util.GetGameObject(go, "proValue"):GetComponent("Text").text = oldsinglePro[2]
- if cursinglePro[2] - oldsinglePro[2] > 0 then
- Util.GetGameObject(go, "nextproValue"):GetComponent("Text").text = ""..cursinglePro[2]..""..Language[11567]
+ if not data.itemList[i].icon then
+ itemList[i].icon.gameObject:SetActive(false)
else
- Util.GetGameObject(go, "nextproValue"):GetComponent("Text").text = ""..cursinglePro[2]..Language[11568]
+ itemList[i].icon.gameObject:SetActive(true)
+ itemList[i].icon.sprite = SetIcon(data.itemList[i].icon)
end
+ itemList[i].proName.text = data.itemList[i].proName
+ itemList[i].proValue.text = data.itemList[i].proValue
+ itemList[i].nextproValue.text = data.itemList[i].proValue1
end
end
- if this.timer then
- this.timer:Stop()
- this.timer = nil
+ if data.type == 1 then
+ if this.timer then
+ this.timer:Stop()
+ this.timer = nil
+ end
+ this.timer = Timer.New(function()
+ parent:ClosePanel()
+ end,2):Start()
end
- this.timer = Timer.New(function()
- parent:ClosePanel()
- end,2):Start()
end
function this:OnClose()
diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
index 9602d9850f..15ce2b38ee 100644
--- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
@@ -55,8 +55,6 @@ function this.ReceiveShopData(msg)
this.allShopData = {}
for _, data in ipairs(msg.storeInfo) do
table.insert(this.allShopData, data)
- LogGreen(string.format("商店id = %d, lt = %s, startTime = %s, endTime = %s", data.id, data.lastRefreshTime, data.startTime, data.endTime))
- LogGreen("StoreType:"..this.GetShopInfo(data.id).StoreType)
end
-- 刷新物品排序
this.SortItemList()