Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
fad04ec385
|
|
@ -6140,7 +6140,7 @@ ParticleSystem:
|
|||
--- !u!199 &199678057150230830
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -10790,7 +10790,7 @@ ParticleSystem:
|
|||
--- !u!199 &199183534652431558
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -11759,8 +11759,8 @@ RectTransform:
|
|||
m_Father: {fileID: 4149605185548300908}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 9, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 86}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
|
|
@ -16637,7 +16637,7 @@ ParticleSystem:
|
|||
--- !u!199 &6121824411910985413
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -21891,7 +21891,7 @@ ParticleSystem:
|
|||
--- !u!199 &1859792028664134497
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -26663,7 +26663,7 @@ ParticleSystem:
|
|||
--- !u!199 &5653487957444314079
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -31471,7 +31471,7 @@ ParticleSystem:
|
|||
--- !u!199 &5322675852388844486
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -36339,7 +36339,7 @@ ParticleSystem:
|
|||
--- !u!199 &1989098124910706582
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -36924,7 +36924,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 8149096206500743259}
|
||||
- component: {fileID: 6478149376130003659}
|
||||
- component: {fileID: 3704644641793328992}
|
||||
m_Layer: 5
|
||||
m_Name: redPoint
|
||||
m_TagString: Untagged
|
||||
|
|
@ -36942,13 +36941,14 @@ RectTransform:
|
|||
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_Children:
|
||||
- {fileID: 6495405209606197774}
|
||||
m_Father: {fileID: 6435868022123484491}
|
||||
m_RootOrder: 2
|
||||
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: -1937.7, y: -37.359936}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6478149376130003659
|
||||
|
|
@ -36959,35 +36959,6 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2235105257177767706}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3704644641793328992
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2235105257177767706}
|
||||
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: 0
|
||||
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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &2247990139953262614
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -42323,7 +42294,7 @@ ParticleSystem:
|
|||
--- !u!199 &8746374249705677081
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -47213,7 +47184,7 @@ ParticleSystem:
|
|||
--- !u!199 &8823971680245043867
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -52029,7 +52000,7 @@ ParticleSystem:
|
|||
--- !u!199 &8430471708784069297
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -57344,7 +57315,7 @@ ParticleSystem:
|
|||
--- !u!199 &7962120996366852011
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -62354,7 +62325,7 @@ ParticleSystem:
|
|||
--- !u!199 &2541572793355743759
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -69495,7 +69466,7 @@ ParticleSystem:
|
|||
--- !u!199 &1560116421555167131
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -74720,7 +74691,7 @@ ParticleSystem:
|
|||
--- !u!199 &6019895091589445860
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -79476,7 +79447,7 @@ ParticleSystem:
|
|||
--- !u!199 &6020120546775422180
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -84174,7 +84145,7 @@ ParticleSystem:
|
|||
--- !u!199 &6020477104265238278
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -88908,7 +88879,7 @@ ParticleSystem:
|
|||
--- !u!199 &6019664593993108532
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -93556,7 +93527,7 @@ ParticleSystem:
|
|||
--- !u!199 &6019812380086944594
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -98363,7 +98334,7 @@ ParticleSystem:
|
|||
--- !u!199 &6019339336154760656
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -104523,7 +104494,7 @@ ParticleSystem:
|
|||
--- !u!199 &4720626719302079074
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -109579,7 +109550,7 @@ ParticleSystem:
|
|||
--- !u!199 &5535316913343579795
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -116465,7 +116436,7 @@ ParticleSystem:
|
|||
--- !u!199 &629998129000523010
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -116735,3 +116706,133 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1001 &3960999450061541886
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 8149096206500743259}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4044842431821162333, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: GuideEffect
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4947693646914895887, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 53b44f029897fbe44b680b2fd498f643, type: 3}
|
||||
--- !u!224 &6495405209606197774 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3960999450061541886}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -872,11 +872,36 @@ end
|
|||
function this.GetAllRewardData()
|
||||
local rewardData = {}
|
||||
local rewardData1 = {}
|
||||
local caluteLv = function(count)
|
||||
local id,moraleLv1
|
||||
for k,v in ConfigPairs(endlessTreasure) do
|
||||
if not v.Integral or #v.Integral < 1 or #v.Integral[1] < 2 then
|
||||
moraleLv1 = v.Level
|
||||
id = v.Id
|
||||
break
|
||||
elseif count < v.Integral[1][2] then
|
||||
moraleLv1 = v.Level
|
||||
id = v.Id
|
||||
break
|
||||
end
|
||||
end
|
||||
return id,moraleLv1
|
||||
end
|
||||
|
||||
local itemCount = BagManager.GetItemCountById(this.scoreValueId)
|
||||
local config = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,107)
|
||||
local willItemCount = itemCount + 0
|
||||
for i = 1,#config.BaseReward do
|
||||
if config.BaseReward[i][1] == this.scoreValueId then
|
||||
willItemCount = willItemCount + config.BaseReward[i][2]
|
||||
end
|
||||
end
|
||||
local id,lv = caluteLv(willItemCount) or 0,0
|
||||
for k,v in ipairs(this.treasureDataReward) do
|
||||
if v.Reward then
|
||||
for n,m in ipairs(v.Reward) do
|
||||
if m.type == 2 then
|
||||
if this.treasureData.curDataId >= v.Id then
|
||||
if id >= v.Id then
|
||||
table.insert(rewardData,m)
|
||||
else
|
||||
table.insert(rewardData1,m)
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ function EndLessMapView:InitComponent(gameObject, mapPanel)
|
|||
end
|
||||
|
||||
function EndLessMapView:OnSortingOrderChange()
|
||||
|
||||
Util.SetParticleSortLayer(this.btnNoteRed,MapPanel.sortingOrder)
|
||||
end
|
||||
|
||||
function EndLessMapView:BindEvent()
|
||||
|
|
|
|||
|
|
@ -106,8 +106,7 @@ function this:showRewardTianGong()
|
|||
|
||||
local direct = {}
|
||||
local indirect ={}
|
||||
local curScore = TreasureOfHeavenManger.curScore--当前分数
|
||||
|
||||
local curScore = TreasureOfHeavenManger.curScore
|
||||
for i = 1, #rewardData do
|
||||
if curScore >= rewardData[i].Integral then
|
||||
if rewardStateData[i].state == 1 or rewardStateData[i].state == 0 then--已达成但不能领取的
|
||||
|
|
@ -153,7 +152,26 @@ end
|
|||
function this:showRewardQinglong()
|
||||
local direct = {}
|
||||
local indirect ={}
|
||||
|
||||
local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig,16)
|
||||
local strs = string.split(config.Value,"|")
|
||||
local curScore = BagManager.GetItemCountById(QinglongSerectTreasureManager.scoreId)
|
||||
for i = 1,#strs do
|
||||
local strs1 = string.split(strs[i],"#")
|
||||
if tonumber(strs1[1]) == QinglongSerectTreasureManager.scoreId then
|
||||
curScore = curScore + tonumber(strs1[2])
|
||||
end
|
||||
end
|
||||
local Getlv = function(curScore)
|
||||
local lv = 0
|
||||
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.TreasureSunlongConfig)) do
|
||||
if not v.Integral or v.Integral[1][2] > curScore then
|
||||
return lv
|
||||
else
|
||||
lv = v.Level
|
||||
end
|
||||
end
|
||||
end
|
||||
local level = Getlv(curScore)
|
||||
for i = 1, #rewardData do
|
||||
-- body
|
||||
local reward = rewardData[i]
|
||||
|
|
@ -162,15 +180,22 @@ function this:showRewardQinglong()
|
|||
local num = reward.Reward[j].item[2]
|
||||
if reward.Reward[j].type == 2 then
|
||||
if reward.state == 1 or reward.state == 0 then
|
||||
if not direct[id] then
|
||||
if not direct[id] then
|
||||
direct[id] = 0
|
||||
end
|
||||
direct[id] = direct[id] + num
|
||||
elseif reward.state == -2 then
|
||||
if not indirect[id] then
|
||||
indirect[id] = 0
|
||||
if level >= reward.level then
|
||||
if not direct[id] then
|
||||
direct[id] = 0
|
||||
end
|
||||
direct[id] = direct[id] + num
|
||||
else
|
||||
if not indirect[id] then
|
||||
indirect[id] = 0
|
||||
end
|
||||
indirect[id] = indirect[id] + num
|
||||
end
|
||||
indirect[id] = indirect[id] + num
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -207,7 +232,7 @@ function this:SetItem(direct,indirect)
|
|||
|
||||
local index = 1
|
||||
for key, value in pairs(direct) do
|
||||
LogGreen("direct key:"..key.." value:"..value)
|
||||
--LogGreen("direct key:"..key.." value:"..value)
|
||||
if not this.taskList[index] then
|
||||
local item = SubUIManager.Open(SubUIConfig.ItemView, this.box1.transform)
|
||||
this.taskList[index] = item
|
||||
|
|
@ -224,7 +249,7 @@ function this:SetItem(direct,indirect)
|
|||
Util.GetGameObject(this.Content, "empty").gameObject:SetActive(true)
|
||||
end
|
||||
for key, value in pairs(indirect) do
|
||||
LogGreen("indirect key:"..key.." value:"..value)
|
||||
--LogGreen("indirect key:"..key.." value:"..value)
|
||||
if not this.taskList[index] then
|
||||
local item = SubUIManager.Open(SubUIConfig.ItemView, this.box2.transform)
|
||||
this.taskList[index] = item
|
||||
|
|
|
|||
|
|
@ -120,8 +120,8 @@ function SecretBoxBuyOnePanel:OnOpen(...)
|
|||
|
||||
if this.recruitType <= RecruitType.LightDarkSingle then --光暗什么...的抽卡
|
||||
this.itemIcon1.sprite=this.spLoader:LoadSprite("r_RareItem_Specail_0002")
|
||||
this.detailText.text = Language[11840]
|
||||
this.detailText1.text = Language[11840]
|
||||
this.detailText.text = "赠送1个元神玉,20置换玉"
|
||||
this.detailText1.text = "赠送1个元神玉,20置换玉"
|
||||
elseif this.recruitType == drawtType.FindFairySingle then --东海寻仙
|
||||
this.FindFairyCountDown(FindFairyManager.GetActivityTime())
|
||||
FindFairyManager.SetFreeExtract(1)
|
||||
|
|
|
|||
Loading…
Reference in New Issue