10 star update

dev_chengFeng
jiaoyangna 2020-07-25 21:57:46 +08:00
parent 7f9c4f6862
commit b1bf2876cb
3 changed files with 51 additions and 47 deletions

View File

@ -13139,17 +13139,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1242165500799944717}
m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449}
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: 1242165501697595033}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 25, y: 25}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1242165500799944712
CanvasRenderer:
@ -13179,7 +13179,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 530bdd8705cf0c841b413c2c589ac956, type: 3}
m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -14180,7 +14180,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1242165501697595032}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
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:
@ -14221,7 +14221,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3}
m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -16189,17 +16189,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1340243952308603536}
m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449}
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: 1340243953256715268}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 25, y: 25}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1340243952308603541
CanvasRenderer:
@ -16229,7 +16229,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 530bdd8705cf0c841b413c2c589ac956, type: 3}
m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -17305,7 +17305,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1340243953256715269}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
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:
@ -17346,7 +17346,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3}
m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -19180,17 +19180,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1348321217833440233}
m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449}
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: 1348321219368619389}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 25, y: 25}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1348321217833440236
CanvasRenderer:
@ -19220,7 +19220,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 530bdd8705cf0c841b413c2c589ac956, type: 3}
m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -21274,7 +21274,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1348321219368619388}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
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:
@ -21315,7 +21315,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3}
m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -25065,7 +25065,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2133922644093258179}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
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:
@ -25106,7 +25106,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3}
m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -25735,17 +25735,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2133922644722210646}
m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449}
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: 2133922644093258178}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 25, y: 25}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2133922644722210643
CanvasRenderer:
@ -25775,7 +25775,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 530bdd8705cf0c841b413c2c589ac956, type: 3}
m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -31325,7 +31325,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5230579649609104589}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
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:
@ -31366,7 +31366,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3}
m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -33577,13 +33577,13 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5230579651144147544}
m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449}
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: 5230579649609104588}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15}
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: 0, y: 0}
@ -33617,7 +33617,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 530bdd8705cf0c841b413c2c589ac956, type: 3}
m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -35867,17 +35867,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6313290791475996402}
m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449}
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: 6313290792692152422}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 25, y: 25}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6313290791475996407
CanvasRenderer:
@ -35907,7 +35907,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 530bdd8705cf0c841b413c2c589ac956, type: 3}
m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -37439,7 +37439,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6313290792692152423}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
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:
@ -37480,7 +37480,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3}
m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -193,7 +193,7 @@ GetHeroCardStarFg = {
[7] = "t_zhandoukuang_hong002",
[8] = "t_zhandoukuang_hong002",
[9] = "t_zhandoukuang_hong002",
[10] = "t_zhandoukuang_hong002",
[10] = "t_zhandoukuang_zhuangshi002",
[11] = "t_zhandoukuang_zhuangshi002",
[12] = "t_zhandoukuang_zhuangshi002",
[13] = "t_zhandoukuang_zhuangshi002",
@ -214,7 +214,7 @@ GetHeroCardStarZs = {
[7] = "t_zhandoukuang_hong01",
[8] = "t_zhandoukuang_hong01",
[9] = "t_zhandoukuang_hong01",
[10] = "t_zhandoukuang_hong01",
[10] = "t_zhandoukuang_zhuanshi01",
[11] = "t_zhandoukuang_zhuanshi01",
[12] = "t_zhandoukuang_zhuanshi01",
[13] = "t_zhandoukuang_zhuanshi01",

View File

@ -279,7 +279,11 @@ function this.BtnClick(id)
PopupTipPanel.ShowTip(Language[10327])
return
end
if ActTimeCtrlManager.SingleFuncState(id) then
UIManager.OpenPanel(UIName.GuildCarDelayMainPanel)
else
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(id))
end
elseif id == FUNCTION_OPEN_TYPE.TRIAL then
if ActTimeCtrlManager.SingleFuncState(id) then
CarbonManager.difficulty = 2