Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
db2d3c8433
|
@ -4933,6 +4933,8 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 3375099720580535572}
|
- component: {fileID: 3375099720580535572}
|
||||||
- component: {fileID: 6449646568492193447}
|
- component: {fileID: 6449646568492193447}
|
||||||
|
- component: {fileID: 8168218552008252908}
|
||||||
|
- component: {fileID: 4394463078046876473}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Reward
|
m_Name: Reward
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -4983,6 +4985,43 @@ MonoBehaviour:
|
||||||
m_Spacing: {x: 10, y: 0}
|
m_Spacing: {x: 10, y: 0}
|
||||||
m_Constraint: 0
|
m_Constraint: 0
|
||||||
m_ConstraintCount: 2
|
m_ConstraintCount: 2
|
||||||
|
--- !u!222 &8168218552008252908
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 316539571695134266}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &4394463078046876473
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 316539571695134266}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
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!1 &460685693485688084
|
--- !u!1 &460685693485688084
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -895,6 +895,8 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 5470173983883150034}
|
- component: {fileID: 5470173983883150034}
|
||||||
- component: {fileID: 1801400158785066317}
|
- component: {fileID: 1801400158785066317}
|
||||||
|
- component: {fileID: 5377911845628719103}
|
||||||
|
- component: {fileID: 5030811962132307092}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Reward
|
m_Name: Reward
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -945,6 +947,43 @@ MonoBehaviour:
|
||||||
m_Spacing: {x: 10, y: 0}
|
m_Spacing: {x: 10, y: 0}
|
||||||
m_Constraint: 0
|
m_Constraint: 0
|
||||||
m_ConstraintCount: 2
|
m_ConstraintCount: 2
|
||||||
|
--- !u!222 &5377911845628719103
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2153490993416923019}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &5030811962132307092
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2153490993416923019}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
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!1 &2547803359770233581
|
--- !u!1 &2547803359770233581
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -171,7 +171,7 @@ function EveryDayGiftNew:SetGrowGift()
|
||||||
|
|
||||||
-- Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index))
|
-- Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index))
|
||||||
--如果有当前声望数据,就显示,没有就显示上一档位
|
--如果有当前声望数据,就显示,没有就显示上一档位
|
||||||
local data = not not growData[DynamicActivityManager.curLevel] and growData[DynamicActivityManager.curLevel] or growData[DynamicActivityManager.curLevel-1]
|
local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1]
|
||||||
self:RefreshReward(data)
|
self:RefreshReward(data)
|
||||||
|
|
||||||
Util.AddOnceClick(self.btnLeft,function ()
|
Util.AddOnceClick(self.btnLeft,function ()
|
||||||
|
|
|
@ -95,7 +95,7 @@ function RechargeViewNew:SetGrowGift()
|
||||||
|
|
||||||
-- Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index))
|
-- Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index))
|
||||||
--如果有当前声望数据,就显示,没有就显示上一档位
|
--如果有当前声望数据,就显示,没有就显示上一档位
|
||||||
local data = not not growData[DynamicActivityManager.curLevel] and growData[DynamicActivityManager.curLevel] or growData[DynamicActivityManager.curLevel-1]
|
local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1]
|
||||||
self:RefreshReward(data)
|
self:RefreshReward(data)
|
||||||
|
|
||||||
Util.AddOnceClick(self.btnLeft,function ()
|
Util.AddOnceClick(self.btnLeft,function ()
|
||||||
|
|
|
@ -417,7 +417,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
||||||
self.isRewardItemPop=false
|
self.isRewardItemPop=false
|
||||||
local itemSId = tonumber(_reward[1])
|
local itemSId = tonumber(_reward[1])
|
||||||
local itemNum = tonumber(_reward[2]) or 0
|
local itemNum = tonumber(_reward[2]) or 0
|
||||||
self.Double:SetActive((_reward[3] and _reward[3] > 1) and true or false)
|
self.Double:SetActive((_reward[3] and _reward[3] == 2) and true or false)
|
||||||
local itemDataConFig = ConfigManager.GetConfigData(ConfigName.ItemConfig, itemSId)
|
local itemDataConFig = ConfigManager.GetConfigData(ConfigName.ItemConfig, itemSId)
|
||||||
self.fragmentIcon:SetActive(false)
|
self.fragmentIcon:SetActive(false)
|
||||||
self.heroShowGo:SetActive(false)
|
self.heroShowGo:SetActive(false)
|
||||||
|
@ -454,11 +454,10 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
||||||
self.EffectOrginScale = self.scale
|
self.EffectOrginScale = self.scale
|
||||||
-- 卸载头像框特效
|
-- 卸载头像框特效
|
||||||
self:UnLoadFrameEffect()
|
self:UnLoadFrameEffect()
|
||||||
|
|
||||||
if effectLayer > 0 and itemDataConFig.Quantity1 then
|
if effectLayer > 0 and itemDataConFig.Quantity1 then
|
||||||
self.UI_Effect_Kuang_JinSe:SetActive(itemDataConFig.Quantity1 == 5)
|
self.UI_Effect_Kuang_JinSe:SetActive(itemDataConFig.Quantity1 == 5)
|
||||||
self.UI_Effect_Kuang_HongSe:SetActive(itemDataConFig.Quantity1 == 6)
|
self.UI_Effect_Kuang_HongSe:SetActive(itemDataConFig.Quantity1 == 6)
|
||||||
self.UI_effect_WuCai_Kuang:SetActive(itemDataConFig.Quantity1 == 7)
|
self.UI_effect_WuCai_Kuang:SetActive((itemDataConFig.Quantity1 == 7) or (_reward[3] and _reward[3] == 999))
|
||||||
end
|
end
|
||||||
if itemDataConFig.ItemType == ItemType.NoType then
|
if itemDataConFig.ItemType == ItemType.NoType then
|
||||||
--0无特殊分类
|
--0无特殊分类
|
||||||
|
|
Loading…
Reference in New Issue