【主题活动】bug修复
parent
f091914b4f
commit
46eeceb79d
|
@ -3789,7 +3789,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 1
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u83B7\u53D6\u9014\u5F84"
|
m_Text: "\u672C\u671FUP\u5185\u5BB9"
|
||||||
--- !u!1 &3439750458242139417
|
--- !u!1 &3439750458242139417
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -16694,7 +16694,7 @@ GameObject:
|
||||||
- component: {fileID: 7816124763777208762}
|
- component: {fileID: 7816124763777208762}
|
||||||
- component: {fileID: 837186586659951150}
|
- component: {fileID: 837186586659951150}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: page_1
|
m_Name: page3
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
|
@ -21967,7 +21967,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 1
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u83B7\u53D6\u9014\u5F84"
|
m_Text: "\u672C\u671FUP\u5185\u5BB9"
|
||||||
--- !u!1 &8166231329145986132
|
--- !u!1 &8166231329145986132
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -9204,7 +9204,7 @@ GameObject:
|
||||||
- component: {fileID: 9092643564979373074}
|
- component: {fileID: 9092643564979373074}
|
||||||
- component: {fileID: 9088744695994303588}
|
- component: {fileID: 9088744695994303588}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: page_2
|
m_Name: page4
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
|
@ -9325,7 +9325,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 1
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u83B7\u53D6\u9014\u5F84"
|
m_Text: "\u672C\u671FUP\u5185\u5BB9"
|
||||||
--- !u!1 &9182117690183553055
|
--- !u!1 &9182117690183553055
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -9429,11 +9429,6 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 9092643564979373074}
|
m_TransformParent: {fileID: 9092643564979373074}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 8096286917689290514, guid: 385d5e664702ab74aa985d27de27bb19,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: Effect_UI_changjing_qiankuanbaoguo
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2626320712165749272, guid: 385d5e664702ab74aa985d27de27bb19,
|
- target: {fileID: 2626320712165749272, guid: 385d5e664702ab74aa985d27de27bb19,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -9489,6 +9484,11 @@ PrefabInstance:
|
||||||
propertyPath: m_LocalEulerAnglesHint.z
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8096286917689290514, guid: 385d5e664702ab74aa985d27de27bb19,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: Effect_UI_changjing_qiankuanbaoguo
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 385d5e664702ab74aa985d27de27bb19, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 385d5e664702ab74aa985d27de27bb19, type: 3}
|
||||||
--- !u!4 &582742966390753427 stripped
|
--- !u!4 &582742966390753427 stripped
|
||||||
|
|
|
@ -123,7 +123,7 @@ function ActivityDetail:RefreshMonsterRate()
|
||||||
table.insert(list4,v)--其他
|
table.insert(list4,v)--其他
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
table.insert(monsterRateList,{tag=Language[10192],name="金色奖励",value=self:ReculateRate(list1)-mainMonsterRate})
|
table.insert(monsterRateList,{tag=Language[10192],name="其他金色奖励",value=self:ReculateRate(list1)-mainMonsterRate})
|
||||||
table.insert(monsterRateList,{tag=Language[10195],name="紫色奖励",value=self:ReculateRate(list2)})
|
table.insert(monsterRateList,{tag=Language[10195],name="紫色奖励",value=self:ReculateRate(list2)})
|
||||||
table.insert(monsterRateList,{tag=Language[10196],name="蓝色奖励",value=self:ReculateRate(list3)})
|
table.insert(monsterRateList,{tag=Language[10196],name="蓝色奖励",value=self:ReculateRate(list3)})
|
||||||
table.insert(monsterRateList,{tag=Language[11766],name=Language[11766],value=self:ReculateRate(list4)})
|
table.insert(monsterRateList,{tag=Language[11766],name=Language[11766],value=self:ReculateRate(list4)})
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
DynamicActivityManager = {}
|
DynamicActivityManager = {}
|
||||||
local this = DynamicActivityManager
|
local this = DynamicActivityManager
|
||||||
|
this.ZhenQiBaoGeIndex = 0
|
||||||
|
|
||||||
local SpiritAnimalSummonConfig = ConfigManager.GetConfig(ConfigName.SpiritAnimalSummon)
|
local SpiritAnimalSummonConfig = ConfigManager.GetConfig(ConfigName.SpiritAnimalSummon)
|
||||||
this.curLevel = 0--社稷大典的等级
|
this.curLevel = 0--社稷大典的等级
|
||||||
|
|
|
@ -148,6 +148,7 @@ function DynamicActivityPanel:InitComponent()
|
||||||
|
|
||||||
-- 上部货币显示
|
-- 上部货币显示
|
||||||
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft})
|
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft})
|
||||||
|
DynamicActivityManager.ZhenQiBaoGeIndex = #tabs - 4
|
||||||
end
|
end
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
function DynamicActivityPanel:BindEvent()
|
function DynamicActivityPanel:BindEvent()
|
||||||
|
|
|
@ -125,7 +125,9 @@ function LingShouBaoGe:SetData()
|
||||||
if Live then
|
if Live then
|
||||||
poolManager:UnLoadLive(bgName, Live)
|
poolManager:UnLoadLive(bgName, Live)
|
||||||
end
|
end
|
||||||
Live = poolManager:LoadLive(bgName, this.grid.transform, Vector3.one*scale, Vector2.New(pos[1],pos[2]))
|
Live = poolManager:LoadLive(bgName, this.grid.transform, Vector3.one*scale*0.8, Vector2.New(pos[1],pos[2]+176))
|
||||||
|
local RoleLiveGOGraphic = Live:GetComponent("SkeletonGraphic")
|
||||||
|
RoleLiveGOGraphic.AnimationState:SetAnimation(0, "idle", true)
|
||||||
|
|
||||||
local leftTime = lotterySetting[singleRecruit.Id].DiamondBoxContain[1][2] - ActData.value
|
local leftTime = lotterySetting[singleRecruit.Id].DiamondBoxContain[1][2] - ActData.value
|
||||||
this.tip2.text = Language[11480].."<color=green>"..leftTime.."</color>次必出灵兽·"..SpiritAnimalConfig[showData.monsterId].Name
|
this.tip2.text = Language[11480].."<color=green>"..leftTime.."</color>次必出灵兽·"..SpiritAnimalConfig[showData.monsterId].Name
|
||||||
|
@ -267,10 +269,14 @@ function LingShouBaoGe:TimeCountDown()
|
||||||
this.timer:Stop()
|
this.timer:Stop()
|
||||||
this.timer = nil
|
this.timer = nil
|
||||||
end
|
end
|
||||||
|
|
||||||
local timeDown=CalculateSecondsNowTo_N_OClock(5)
|
local timeDown=CalculateSecondsNowTo_N_OClock(5)
|
||||||
this.tip1.text = TimeToHMS(timeDown)..Language[12200]
|
this.tip1.text = TimeToHMS(timeDown)..Language[12200]
|
||||||
local timeDown2 = ActData.endTime - GetTimeStamp()
|
local timeDown2 = ActData.endTime - GetTimeStamp()
|
||||||
this.leftTime.text = Language[10028]..TimeToFelaxible(timeDown2)
|
this.leftTime.text = Language[10028]..TimeToFelaxible(timeDown2)
|
||||||
|
|
||||||
|
this.tip1.gameObject:SetActive(timeDown < timeDown2)
|
||||||
|
|
||||||
this.timer = Timer.New(function()
|
this.timer = Timer.New(function()
|
||||||
if timeDown < 1 then
|
if timeDown < 1 then
|
||||||
this.timer:Stop()
|
this.timer:Stop()
|
||||||
|
|
|
@ -151,7 +151,7 @@ function SheJiDaDian:BindEvent()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
Util.AddOnceClick(this.btnAdd,function ()
|
Util.AddOnceClick(this.btnAdd,function ()
|
||||||
UIManager.OpenPanel(UIName.DynamicActivityPanel,14)
|
UIManager.OpenPanel(UIName.DynamicActivityPanel,DynamicActivityManager.ZhenQiBaoGeIndex)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
Util.AddOnceClick(this.btnBox,function ()
|
Util.AddOnceClick(this.btnBox,function ()
|
||||||
|
|
|
@ -263,7 +263,7 @@ function this.ShowRewardInfo()
|
||||||
|
|
||||||
elseif curRankType == 2 then--设计大典
|
elseif curRankType == 2 then--设计大典
|
||||||
local configList = {}
|
local configList = {}
|
||||||
configList = ConfigManager.GetAllConfigsDataByKey(ConfigName.GodSacrificeConfig,"RewardType",tabNum)
|
configList = ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.GodSacrificeConfig,"ActivityId",ActivityId,"RewardType",tabNum)
|
||||||
this.ScrollView:SetData(configList, function (index, go)
|
this.ScrollView:SetData(configList, function (index, go)
|
||||||
this.ActivityRewardSingleShow(go, configList[index],index)
|
this.ActivityRewardSingleShow(go, configList[index],index)
|
||||||
end)
|
end)
|
||||||
|
|
Loading…
Reference in New Issue