Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
ZhangBiao 2020-08-21 11:24:02 +08:00
commit 7ae97fdff0
4 changed files with 36 additions and 263 deletions

View File

@ -4018,7 +4018,7 @@ RectTransform:
m_LocalScale: {x: 0.5, y: 0.5, z: 1}
m_Children: []
m_Father: {fileID: 1918779213236421956}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -4835,7 +4835,6 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8971455806639226018}
- {fileID: 1918779212410072921}
m_Father: {fileID: 1918779212295282661}
m_RootOrder: 3
@ -5799,85 +5798,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2589157035881278792
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8461259905776666976}
- component: {fileID: 3165797620983748209}
- component: {fileID: 6017193706718942994}
m_Layer: 5
m_Name: getRewardProgress
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8461259905776666976
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2589157035881278792}
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: 7081655482757342369}
m_RootOrder: 5
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: 306.1, y: -38.83}
m_SizeDelta: {x: 73.9, y: 42.04}
m_Pivot: {x: 0.36038244, y: 0.5}
--- !u!222 &3165797620983748209
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2589157035881278792}
m_CullTransparentMesh: 0
--- !u!114 &6017193706718942994
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2589157035881278792}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.93333334, b: 0.8392157, a: 0.8156863}
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_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: (7/7)
--- !u!1 &2710803833489432309
GameObject:
m_ObjectHideFlags: 0
@ -6706,7 +6626,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 769.89, y: -57.93}
m_AnchoredPosition: {x: 766.38, y: -71.02497}
m_SizeDelta: {x: 167.13, y: 61.81}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1401530783241735296
@ -8925,7 +8845,7 @@ MonoBehaviour:
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 0}
m_TargetGraphic: {fileID: 486927142858868952}
m_OnClick:
m_PersistentCalls:
m_Calls: []
@ -9980,7 +9900,6 @@ RectTransform:
- {fileID: 1377542536350534115}
- {fileID: 7235002840401175143}
- {fileID: 5927569354025994995}
- {fileID: 8461259905776666976}
m_Father: {fileID: 956434821998691110}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -13404,142 +13323,3 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 6264444577279135484}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &9196253626930733588
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1918779213236421956}
m_Modifications:
- target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3}
propertyPath: m_Name
value: ItemView
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_SizeDelta.x
value: 135
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_SizeDelta.y
value: 135
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_Pivot.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_LocalScale.x
value: 0.8
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_LocalScale.y
value: 0.8
objectReference: {fileID: 0}
- target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
propertyPath: m_LocalScale.z
value: 0.8
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3}
--- !u!224 &8971455806639226018 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973,
type: 3}
m_PrefabInstance: {fileID: 9196253626930733588}
m_PrefabAsset: {fileID: 0}

View File

@ -157,10 +157,9 @@ function this:topBar()
Util.GetGameObject(this.openExtra,"MeiKaiQi"):SetActive(true)
this.openExtra:GetComponent("Animator").enabled = true
Timer.New(function()
local id = ActivityGiftManager.GetActivityIdByType(8)
NetManager.GetActivityRewardRequest(-2,id,function(msg)
NetManager.GetActivityRewardRequest(-2,QinglongSerectTreasureManager.activityId,function(msg)
PrivilegeManager.RefreshPrivilegeUsedTimes(1007, 1)
this.refresh(curType)
this.refresh()
end)
end,1.5):Start()
end)
@ -209,12 +208,13 @@ function this:SingleTask(rewardItem, rewardSingleData)
end
scoreLevel.text = rewardSingleData.level
itemsList[rewardItem][1]:OnOpen(false, rewardSingleData.Reward[1].item, 0.8, false)
itemsList[rewardItem][2]:OnOpen(false, rewardSingleData.Reward[2].item, 0.8, false)
if rewardSingleData.Reward[3] then
itemsList[rewardItem][3]:OnOpen(false, rewardSingleData.Reward[3].item, 0.8, false)
else
itemsList[rewardItem][3].gameObject:SetActive(false)
for i = 1, #itemsList[rewardItem] do
if i <= #rewardSingleData.Reward and rewardSingleData.Reward[i] then
itemsList[rewardItem][i].gameObject:SetActive(true)
itemsList[rewardItem][i]:OnOpen(false, rewardSingleData.Reward[i].item, 0.8, false)
else
itemsList[rewardItem][i].gameObject:SetActive(false)
end
end
--初始化按钮状态

View File

@ -172,8 +172,8 @@ function this:SingleTask(go, rewardSingleData)
local value = sConFigData.taskValue[2][1]
titleText.text = strs[1].."("..(math.abs(sConFigData.progress) > math.abs(value) and math.abs(value) or math.abs(sConFigData.progress)) .."/"..math.abs(value)..")"
local rewardText = Util.GetGameObject(activityRewardGo, "reward"):GetComponent("Text")
rewardText.text = strs[2]..sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name .."/次"
rewardText.text = (strs[2] and strs[2] or "")..sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name .."/次"
local state = sConFigData.state
local lingquButton = Util.GetGameObject(activityRewardGo.gameObject, "lingquButton")
local red = Util.GetGameObject(lingquButton.gameObject, "redPoint")
red:SetActive(state == 1)

View File

@ -8,21 +8,19 @@ this.scoreId = 0
this.score = 0
this.traiWeekTime = 0
local level = 0
this.activityId = 0
function this.Initialize()
this.InitializeData()
end
function this.InitializeData()
rewardData = {}
taskData = {}
this.scoreId = TreasureSunlongConfig[1].Integral[1][1]
local id = ActivityGiftManager.GetActivityIdByType(8)
if not ActivityGiftManager.GetActivityOpenStatus(id) then
return
end
local treasureSunlongConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.TreasureSunlongConfig,"ActivityId",id)
for i, v in ConfigPairs(treasureSunlongConfig) do
for i, v in ConfigPairs(TreasureSunlongConfig) do
rewardData[v.Level] = {}
rewardData[v.Level].level = v.Level
rewardData[v.Level].activityId = v.ActivityId
if v.Integral then
rewardData[v.Level].needScore = v.Integral[1][2]
else
@ -42,8 +40,7 @@ function this.InitializeData()
end
rewardData[v.Level].Reward = temp
end
local treasureSunlongtaskConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.TreasureSunLongTaskConfig,"ActivityId",id)
for i, v in ConfigPairs(treasureSunlongtaskConfig) do
for i, v in ConfigPairs(TreasureSunLongTaskConfig) do
if not taskData[v.Type] then
taskData[v.Type] = {}
end
@ -66,19 +63,18 @@ function this.UpdateTreasureState()
v.state = 0
end
end
local TreasureRewardState = ActivityGiftManager.GetActivityTypeInfo(8)
-- if TreasureRewardState then
-- --state -2 未达成 -1 普通和额外全部领取 0未领取 1激活秘宝可以再次领取
-- if TreasureRewardState.mission then
-- for k,v in ipairs(TreasureRewardState.mission) do
-- if level >= v.missionId then
-- rewardData[v.missionId].state = v.state
-- else
-- rewardData[v.missionId].state = -2
-- end
-- end
-- end
-- end
this.activityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody)
local TreasureRewardState = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TreasureOfSomeBody)
if TreasureRewardState and TreasureRewardState.mission then
--state -2 未达成 -1 普通和额外全部领取 0未领取 1激活秘宝可以再次领取
for k,v in ipairs(TreasureRewardState.mission) do
if v and level >= v.missionId then
rewardData[v.missionId].state = v.state
else
rewardData[v.missionId].state = -2
end
end
end
end
function this.UpdateTrailWeekTime(msg)
@ -91,7 +87,7 @@ function this.GetTrailWeekTime(msg)
end
function this.GetTimeStartToEnd()
local info= ActivityGiftManager.GetActivityInfoByType(801)
local info= ActivityGiftManager.GetActivityInfoByType(this.activityId)
if info then
local startTime= this.GetTimeShow(info.startTime)
local endtime= this.GetTimeShow(info.endTime)
@ -124,7 +120,7 @@ end
function this.GetAllRewardData()
local temp ={}
for i, v in pairs(rewardData) do
if i ~= 0 then
if i ~= 0 and v.activityId == this.activityId then
table.insert(temp,v)
end
end
@ -144,12 +140,11 @@ function this.GetLevel()
end
function this.GetQinglongTaskData(_curtype)
local id = ActivityGiftManager.GetActivityIdByType(8)
local curtype = _curtype + 1
local temp = TaskManager.GetTypeTaskList(TaskTypeDef.TreasureOfSomeBody)
local task = {}
for k,v in ipairs(temp) do
if taskData[curtype][v.missionId] and taskData[curtype][v.missionId].ActivityId == id then
if taskData[curtype][v.missionId] and taskData[curtype][v.missionId].ActivityId == this.activityId then
taskData[curtype][v.missionId].progress = v.progress
taskData[curtype][v.missionId].state = v.state
table.insert(task, taskData[curtype][v.missionId])
@ -160,8 +155,7 @@ function this.GetQinglongTaskData(_curtype)
end
function this.GetQinglongSerectTreasureRedPot()
local id =ActivityGiftManager.GetActivityIdByType(8)
if not ActivityGiftManager.GetActivityOpenStatus(id) then
if this.activityId==0 or not ActivityGiftManager.GetActivityOpenStatus(this.activityId) then
return false
end
local state = this.GetTreasureState()
@ -176,8 +170,7 @@ function this.GetQinglongSerectTreasureRedPot()
end
function this.GetSerectTreasureTrailRedPot()
local id =ActivityGiftManager.GetActivityIdByType(8)
if not ActivityGiftManager.GetActivityOpenStatus(id) then
if this.activityId == 0 or not ActivityGiftManager.GetActivityOpenStatus(this.activityId) then
return false
end
for i = 1,2 do