太初特权添加提示
parent
8779ae8ef0
commit
1a2a407d66
|
@ -10126,6 +10126,81 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &566289984364020573
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 3507712842139378022}
|
||||||
|
- component: {fileID: 1199149195758025077}
|
||||||
|
- component: {fileID: 5375523233167145410}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: hint
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &3507712842139378022
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 566289984364020573}
|
||||||
|
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:
|
||||||
|
- {fileID: 2938181862533689189}
|
||||||
|
m_Father: {fileID: 1272852733815832172}
|
||||||
|
m_RootOrder: 7
|
||||||
|
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: -207, y: 294.7}
|
||||||
|
m_SizeDelta: {x: 671, y: 54.4}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &1199149195758025077
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 566289984364020573}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &5375523233167145410
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 566289984364020573}
|
||||||
|
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: 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: 21300000, guid: 9de42f8f578587d419a05e3442ef5937, 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 &566446588389268076
|
--- !u!1 &566446588389268076
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -16077,10 +16152,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 8199983033545063705}
|
m_Father: {fileID: 8199983033545063705}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 25, y: -25}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 50, y: 50}
|
m_SizeDelta: {x: 0, y: 50}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5903031530968450716
|
--- !u!222 &5903031530968450716
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -16234,7 +16309,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 136, y: 50}
|
m_SizeDelta: {x: 0, y: 50}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &3108775219584601888
|
--- !u!114 &3108775219584601888
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -38733,10 +38808,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 8199983033545063705}
|
m_Father: {fileID: 8199983033545063705}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 93, y: -25}
|
m_AnchoredPosition: {x: 93, y: 0}
|
||||||
m_SizeDelta: {x: 86, y: 40}
|
m_SizeDelta: {x: 0, y: 40}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5714047808390805826
|
--- !u!222 &5714047808390805826
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -39136,7 +39211,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 105, y: 40}
|
m_SizeDelta: {x: 0, y: 40}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &999754687884629988
|
--- !u!222 &999754687884629988
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -39735,6 +39810,85 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &7710879233988826699
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2938181862533689189}
|
||||||
|
- component: {fileID: 5076479696871453864}
|
||||||
|
- component: {fileID: 5583806558055747447}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Text
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &2938181862533689189
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7710879233988826699}
|
||||||
|
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: 3507712842139378022}
|
||||||
|
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}
|
||||||
|
m_AnchoredPosition: {x: -251, y: 0}
|
||||||
|
m_SizeDelta: {x: 160, y: 30}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &5076479696871453864
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7710879233988826699}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &5583806558055747447
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7710879233988826699}
|
||||||
|
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: 0.98823535, g: 0.7843138, b: 0.38823533, 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_FontData:
|
||||||
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
|
m_FontSize: 35
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 3
|
||||||
|
m_MaxSize: 40
|
||||||
|
m_Alignment: 3
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 1
|
||||||
|
m_VerticalOverflow: 1
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: "\u7279\u6743\u53EA\u751F\u6548\u5F53\u524D\u6FC0\u6D3B\u6700\u9AD8\u7684\u7279\u6743\uFF0C\u4E0D\u4F1A\u76F8\u4E92\u53E0\u52A0"
|
||||||
--- !u!1 &7932383035861034236
|
--- !u!1 &7932383035861034236
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -39933,6 +40087,7 @@ RectTransform:
|
||||||
- {fileID: 3673471341400026499}
|
- {fileID: 3673471341400026499}
|
||||||
- {fileID: 1216994767185876133}
|
- {fileID: 1216994767185876133}
|
||||||
- {fileID: 419905863}
|
- {fileID: 419905863}
|
||||||
|
- {fileID: 3507712842139378022}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
@ -40412,7 +40567,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0}
|
m_AnchorMin: {x: 0.5, y: 0}
|
||||||
m_AnchorMax: {x: 0.5, y: 0}
|
m_AnchorMax: {x: 0.5, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 100.7}
|
m_AnchoredPosition: {x: 0, y: 100.70001}
|
||||||
m_SizeDelta: {x: 1080, y: 198}
|
m_SizeDelta: {x: 1080, y: 198}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7343478569695879895
|
--- !u!222 &7343478569695879895
|
||||||
|
|
|
@ -79,6 +79,8 @@ function EveryDayGiftNew:InitComponent()
|
||||||
Util.GetGameObject(self.freeBtnAnim.gameObject,"yinying/ray 3"),
|
Util.GetGameObject(self.freeBtnAnim.gameObject,"yinying/ray 3"),
|
||||||
Util.GetGameObject(self.freeBtnAnim.gameObject,"yinying/ray 4"),
|
Util.GetGameObject(self.freeBtnAnim.gameObject,"yinying/ray 4"),
|
||||||
}
|
}
|
||||||
|
self.hintObj=Util.GetGameObject(self.gameObject, "hint")
|
||||||
|
self.hintTxt=Util.GetGameObject(self.gameObject, "hint/Text"):GetComponent("Text")
|
||||||
end
|
end
|
||||||
|
|
||||||
function EveryDayGiftNew:BindEvent()
|
function EveryDayGiftNew:BindEvent()
|
||||||
|
@ -149,7 +151,7 @@ function EveryDayGiftNew:RefreshData(none,isTop,isAni)
|
||||||
self.shopData = DynamicActivityManager.GetGiftDataByType(self.actConfig.ShopData)
|
self.shopData = DynamicActivityManager.GetGiftDataByType(self.actConfig.ShopData)
|
||||||
--成长礼包
|
--成长礼包
|
||||||
self:SetGrowGift()
|
self:SetGrowGift()
|
||||||
|
self.hintObj:SetActive(false)
|
||||||
--特殊处理部分
|
--特殊处理部分
|
||||||
Log("actType:"..tostring(self.actType))
|
Log("actType:"..tostring(self.actType))
|
||||||
if self.actType == FUNCTION_OPEN_TYPE.MeiRiLiBao then
|
if self.actType == FUNCTION_OPEN_TYPE.MeiRiLiBao then
|
||||||
|
@ -163,6 +165,8 @@ function EveryDayGiftNew:RefreshData(none,isTop,isAni)
|
||||||
if self.actType == 98 then
|
if self.actType == 98 then
|
||||||
self.extarTitle:SetActive(true)
|
self.extarTitle:SetActive(true)
|
||||||
self.extarBg:SetActive(false)
|
self.extarBg:SetActive(false)
|
||||||
|
self.hintObj:SetActive(true)
|
||||||
|
self.hintTxt.text="特权只生效当前激活最高的特权,不会相互叠加"
|
||||||
self:RefreshFreeData()
|
self:RefreshFreeData()
|
||||||
end
|
end
|
||||||
if not self.scrollView then
|
if not self.scrollView then
|
||||||
|
@ -502,7 +506,6 @@ function EveryDayGiftNew:RefreshFreeData()
|
||||||
type=35
|
type=35
|
||||||
end
|
end
|
||||||
local freeData = ShopManager.GetShopDataByType(type).storeItem
|
local freeData = ShopManager.GetShopDataByType(type).storeItem
|
||||||
LogError("freeData len=="..#freeData)
|
|
||||||
local boughtNum = ShopManager.GetShopItemHadBuyTimes(type, freeData[1].id)
|
local boughtNum = ShopManager.GetShopItemHadBuyTimes(type, freeData[1].id)
|
||||||
local limitNum = ShopManager.GetShopItemLimitBuyCount(freeData[1].id)
|
local limitNum = ShopManager.GetShopItemLimitBuyCount(freeData[1].id)
|
||||||
--LogError("freeData[1].id=="..freeData[1].id)
|
--LogError("freeData[1].id=="..freeData[1].id)
|
||||||
|
|
Loading…
Reference in New Issue