【家园】提交
parent
fbe50eb413
commit
a07fdc40ac
|
@ -2623,9 +2623,10 @@ RectTransform:
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
|
- {fileID: 1808343596136388061}
|
||||||
- {fileID: 2104573366148519731}
|
- {fileID: 2104573366148519731}
|
||||||
m_Father: {fileID: 7170594154832535396}
|
m_Father: {fileID: 7170594154832535396}
|
||||||
m_RootOrder: 9
|
m_RootOrder: 8
|
||||||
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: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
|
@ -2685,12 +2686,12 @@ RectTransform:
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7170594154832535396}
|
m_Father: {fileID: 7164347909414573019}
|
||||||
m_RootOrder: 8
|
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: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 300, y: -322}
|
m_AnchoredPosition: {x: 300, y: -22}
|
||||||
m_SizeDelta: {x: 600, y: 44}
|
m_SizeDelta: {x: 600, y: 44}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5754960984505972489
|
--- !u!222 &5754960984505972489
|
||||||
|
@ -8567,7 +8568,6 @@ RectTransform:
|
||||||
- {fileID: 7261243957124939696}
|
- {fileID: 7261243957124939696}
|
||||||
- {fileID: 3048299352760249542}
|
- {fileID: 3048299352760249542}
|
||||||
- {fileID: 6464136021967784008}
|
- {fileID: 6464136021967784008}
|
||||||
- {fileID: 1808343596136388061}
|
|
||||||
- {fileID: 7164347909414573019}
|
- {fileID: 7164347909414573019}
|
||||||
- {fileID: 4816209239398321187}
|
- {fileID: 4816209239398321187}
|
||||||
m_Father: {fileID: 1101023488916946089}
|
m_Father: {fileID: 1101023488916946089}
|
||||||
|
@ -9516,7 +9516,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7164347909414573019}
|
m_Father: {fileID: 7164347909414573019}
|
||||||
m_RootOrder: 0
|
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: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
|
@ -11244,7 +11244,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7170594154832535396}
|
m_Father: {fileID: 7170594154832535396}
|
||||||
m_RootOrder: 10
|
m_RootOrder: 9
|
||||||
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: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
|
|
|
@ -6547,7 +6547,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: 100, y: 100}
|
m_SizeDelta: {x: 60, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1768263974513368297
|
--- !u!222 &1768263974513368297
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -6579,7 +6579,7 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 36
|
m_FontSize: 30
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 3
|
m_MinSize: 3
|
||||||
|
@ -6590,7 +6590,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u52A0\u901F"
|
m_Text: "\u7279\u6743\u52A0\u901F"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
--- !u!114 &8618035793283017194
|
--- !u!114 &8618035793283017194
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -7140,7 +7140,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: 100, y: 100}
|
m_SizeDelta: {x: 60, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &188231627901731036
|
--- !u!222 &188231627901731036
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -7172,7 +7172,7 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 36
|
m_FontSize: 30
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 3
|
m_MinSize: 3
|
||||||
|
@ -7183,7 +7183,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u52A0\u901F"
|
m_Text: "\u7279\u6743\u52A0\u901F"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
--- !u!114 &1745825756369886717
|
--- !u!114 &1745825756369886717
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -9802,7 +9802,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: 100, y: 100}
|
m_SizeDelta: {x: 60, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4774252036350291411
|
--- !u!222 &4774252036350291411
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -9834,10 +9834,10 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 36
|
m_FontSize: 30
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 3
|
m_MinSize: 0
|
||||||
m_MaxSize: 40
|
m_MaxSize: 40
|
||||||
m_Alignment: 4
|
m_Alignment: 4
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
|
@ -9845,7 +9845,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u52A0\u901F"
|
m_Text: "\u7279\u6743\u52A0\u901F"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
--- !u!114 &4612142329038410853
|
--- !u!114 &4612142329038410853
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -10543,7 +10543,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: 100, y: 100}
|
m_SizeDelta: {x: 60, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1030502146301907539
|
--- !u!222 &1030502146301907539
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -10575,7 +10575,7 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 36
|
m_FontSize: 30
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 3
|
m_MinSize: 3
|
||||||
|
@ -13708,7 +13708,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: 100, y: 100}
|
m_SizeDelta: {x: 60, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8554166235160559710
|
--- !u!222 &8554166235160559710
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -13740,7 +13740,7 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 36
|
m_FontSize: 30
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 3
|
m_MinSize: 3
|
||||||
|
@ -13751,7 +13751,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u52A0\u901F"
|
m_Text: "\u7279\u6743\u52A0\u901F"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
--- !u!114 &7676188271378239918
|
--- !u!114 &7676188271378239918
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -17594,7 +17594,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: 100, y: 100}
|
m_SizeDelta: {x: 60, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &6511619314263466086
|
--- !u!222 &6511619314263466086
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -17626,7 +17626,7 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 36
|
m_FontSize: 30
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 3
|
m_MinSize: 3
|
||||||
|
@ -17637,7 +17637,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u52A0\u901F"
|
m_Text: "\u7279\u6743\u52A0\u901F"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
--- !u!114 &6200336063431582331
|
--- !u!114 &6200336063431582331
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -18387,7 +18387,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: 100, y: 100}
|
m_SizeDelta: {x: 60, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4344618113695364633
|
--- !u!222 &4344618113695364633
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -18419,7 +18419,7 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 36
|
m_FontSize: 30
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 3
|
m_MinSize: 3
|
||||||
|
@ -18430,7 +18430,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u52A0\u901F"
|
m_Text: "\u7279\u6743\u52A0\u901F"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
--- !u!114 &2402848269352071433
|
--- !u!114 &2402848269352071433
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
|
|
@ -1028,6 +1028,9 @@ RedPointType = {
|
||||||
LingMaiMiJing = 920,--灵脉秘境
|
LingMaiMiJing = 920,--灵脉秘境
|
||||||
|
|
||||||
chaozhifanli = 90001,
|
chaozhifanli = 90001,
|
||||||
|
|
||||||
|
--家园红点
|
||||||
|
HomeLand = 700--主城家园红点
|
||||||
}
|
}
|
||||||
|
|
||||||
RedPointStatus = {
|
RedPointStatus = {
|
||||||
|
|
|
@ -57,7 +57,7 @@ function this:OnShow(_parent,_args)
|
||||||
this.limit:SetActive(true)
|
this.limit:SetActive(true)
|
||||||
this.harvest:SetActive(true)
|
this.harvest:SetActive(true)
|
||||||
this.limitIcon.sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(data.dataSingle.Storage[1][1]))
|
this.limitIcon.sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(data.dataSingle.Storage[1][1]))
|
||||||
this.limitNum = data.dataSingle.Storage[1][2]
|
this.limitNum.text = data.dataSingle.Storage[1][2]
|
||||||
this.harvestNum.text = string.format("%s/每小时",data.dataSingle.Gain[2])
|
this.harvestNum.text = string.format("%s/每小时",data.dataSingle.Gain[2])
|
||||||
this.harvestIcon.sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(data.dataSingle.Gain[1]))
|
this.harvestIcon.sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(data.dataSingle.Gain[1]))
|
||||||
|
|
||||||
|
|
|
@ -226,4 +226,87 @@ function this.CheckPrivilege(func)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
--烦人的红点检测(我决定1-4写一个、5写一个,6写一个、任务写一个、7移植过来,然后写个总的检测跑一遍所有)
|
||||||
|
function this.CheckRedMain()
|
||||||
|
if this.Check1to5Building() then
|
||||||
|
LogRed("1")
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
if this.CheckMission() then
|
||||||
|
LogRed("2")
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
if this.CheckEquipUpgrade() then
|
||||||
|
LogRed("3")
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
LogRed("4")
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
function this.Check1to5Building()
|
||||||
|
local data = this.BuildData
|
||||||
|
for i = 1, 5 do
|
||||||
|
if this.singleUpgrade(i) or this.singleGet(i) then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
--1-5建筑的单个升级
|
||||||
|
function this.singleUpgrade(id)
|
||||||
|
local data = this.BuildData[id].dataSingle
|
||||||
|
LogGreen("Id:"..tostring(data.Id))
|
||||||
|
if BagManager.GetTotalItemNum(data.Cost[1][1]) >= data.Cost[1][2] then--所需材料够
|
||||||
|
if not data.Rule or (this.BuildData[data.Rule[1]].level >= data.Rule[2]) then--到达升级条件
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
--1-4建筑的单个领取
|
||||||
|
function this.singleGet(id)
|
||||||
|
local data = this.BuildData[id]
|
||||||
|
if data.dataMain.Type == 1 then
|
||||||
|
return (GetTimeStamp() - data.startTime)/60*data.dataSingle.Gain[2] >= data.dataSingle.Storage[1][2]
|
||||||
|
end
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
--检测任务
|
||||||
|
function this.CheckMission()
|
||||||
|
local data = this.SetRewardData()
|
||||||
|
for index, value in ipairs(data) do
|
||||||
|
if value.state == 1 then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
--摘星阁
|
||||||
|
function this.CheckEquipUpgrade()
|
||||||
|
for i = 1, 4 do
|
||||||
|
if this.CheckSingleEquipUpgrade(i) then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
--摘星阁单个装备检测
|
||||||
|
function this.CheckSingleEquipUpgrade(id)
|
||||||
|
local bool = false
|
||||||
|
local data = this.EquipData[id]
|
||||||
|
if BagManager.GetTotalItemNum(data.Cost[1][1]) >= data.Cost[1][2] then--所需材料够
|
||||||
|
if this.BuildData[data.Limit[1]].level >= data.Limit[2] then--到达升级条件
|
||||||
|
bool = true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return bool
|
||||||
|
end
|
||||||
|
|
||||||
return HomeLandManager
|
return HomeLandManager
|
|
@ -646,7 +646,6 @@ function this.ExecuteLoading()
|
||||||
--[[[5] = ]]function() NetManager.AllEquipTreasureRequest(0, LoadingPanel.OnStep) end, -- 宝物
|
--[[[5] = ]]function() NetManager.AllEquipTreasureRequest(0, LoadingPanel.OnStep) end, -- 宝物
|
||||||
-- [[[6] = ]]function() NetManager.GetSoulPrintDataRequest(0, LoadingPanel.OnStep) end, -- 魂印(走背包了)
|
-- [[[6] = ]]function() NetManager.GetSoulPrintDataRequest(0, LoadingPanel.OnStep) end, -- 魂印(走背包了)
|
||||||
--[[[7] = ]]function() NetManager.DiffMonsterRequest(0,LoadingPanel.OnStep) end, -- 异妖
|
--[[[7] = ]]function() NetManager.DiffMonsterRequest(0,LoadingPanel.OnStep) end, -- 异妖
|
||||||
--[[[55] =]]function() HomeLandManager.GetData(LoadingPanel.OnStep) end, --家园获取数据
|
|
||||||
--[[[8] = ]]function() NetManager.HeroInfoRequest(0, LoadingPanel.OnStep) end, -- 神将信息
|
--[[[8] = ]]function() NetManager.HeroInfoRequest(0, LoadingPanel.OnStep) end, -- 神将信息
|
||||||
--[[[9] = ]]function() NetManager.TeamInfoRequest(LoadingPanel.OnStep) end, -- 编队
|
--[[[9] = ]]function() NetManager.TeamInfoRequest(LoadingPanel.OnStep) end, -- 编队
|
||||||
--[[[10] =]]function() NetManager.GetAllMailData(LoadingPanel.OnStep) end, -- 邮件
|
--[[[10] =]]function() NetManager.GetAllMailData(LoadingPanel.OnStep) end, -- 邮件
|
||||||
|
@ -697,6 +696,7 @@ function this.ExecuteLoading()
|
||||||
--[[[52] =]]function() NetManager.GetLingMaiInfoRequest(0,LoadingPanel.OnStep) end, --灵脉秘境
|
--[[[52] =]]function() NetManager.GetLingMaiInfoRequest(0,LoadingPanel.OnStep) end, --灵脉秘境
|
||||||
--[[[53] =]]function() NetManager.SendGetTailsmanSoulData(LoadingPanel.OnStep) end, --法宝之灵
|
--[[[53] =]]function() NetManager.SendGetTailsmanSoulData(LoadingPanel.OnStep) end, --法宝之灵
|
||||||
--[[[54] =]]function() NetManager.RequestArenaRankData(1,LoadingPanel.OnStep) end, --获取竞技场数据
|
--[[[54] =]]function() NetManager.RequestArenaRankData(1,LoadingPanel.OnStep) end, --获取竞技场数据
|
||||||
|
--[[[55] =]]function() HomeLandManager.GetData(LoadingPanel.OnStep) end, --家园获取数据
|
||||||
function() -- 登录请求最终接口,所有请求放在此接口之前
|
function() -- 登录请求最终接口,所有请求放在此接口之前
|
||||||
-- 登录成功确认
|
-- 登录成功确认
|
||||||
NetManager.LoginConfimRequest()
|
NetManager.LoginConfimRequest()
|
||||||
|
|
|
@ -152,10 +152,12 @@ function this:InitComponent()
|
||||||
this.btnPokemon = Util.GetGameObject(this.gameObject, "scene/layer6/btnPokemon")
|
this.btnPokemon = Util.GetGameObject(this.gameObject, "scene/layer6/btnPokemon")
|
||||||
-- this.btnTianFu = Util.GetGameObject(this.gameObject, "scene/layer6/btnTianFu")
|
-- this.btnTianFu = Util.GetGameObject(this.gameObject, "scene/layer6/btnTianFu")
|
||||||
this.btnWaiDi = Util.GetGameObject(this.gameObject, "scene/layer4/btnWaiDi")
|
this.btnWaiDi = Util.GetGameObject(this.gameObject, "scene/layer4/btnWaiDi")
|
||||||
this.btnHomeLand = Util.GetGameObject(this.gameObject, "scene/layer6/btnHomeLand")
|
|
||||||
this.btnJumpServer = Util.GetGameObject(this.gameObject, "scene/layer4/btnJumpServer")--跨服
|
|
||||||
this.btnWaiDi:SetActive(false)
|
this.btnWaiDi:SetActive(false)
|
||||||
|
--家园
|
||||||
|
this.btnHomeLand = Util.GetGameObject(this.gameObject, "scene/layer6/btnHomeLand")
|
||||||
this.btnHomeLand:SetActive(true)
|
this.btnHomeLand:SetActive(true)
|
||||||
|
--跨服
|
||||||
|
this.btnJumpServer = Util.GetGameObject(this.gameObject, "scene/layer4/btnJumpServer")
|
||||||
this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer3/btnCompoundHero")
|
this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer3/btnCompoundHero")
|
||||||
this.btnTianShuMiJuan = Util.GetGameObject(this.gameObject, "scene/layer6/btnTianShuMiJuan")
|
this.btnTianShuMiJuan = Util.GetGameObject(this.gameObject, "scene/layer6/btnTianShuMiJuan")
|
||||||
this.btnXingYunTanBao = Util.GetGameObject(this.gameObject, "bg/btnXingYunTanBao")
|
this.btnXingYunTanBao = Util.GetGameObject(this.gameObject, "bg/btnXingYunTanBao")
|
||||||
|
@ -198,7 +200,7 @@ function this:InitComponent()
|
||||||
this.rpSecretBox = Util.GetGameObject(this.btnSecretBox, "redPoint")
|
this.rpSecretBox = Util.GetGameObject(this.btnSecretBox, "redPoint")
|
||||||
this.rpYiYao = Util.GetGameObject(this.btnYiYao, "redPoint")
|
this.rpYiYao = Util.GetGameObject(this.btnYiYao, "redPoint")
|
||||||
this.rpAlien = Util.GetGameObject(this.btnWaiDi, "redPoint")
|
this.rpAlien = Util.GetGameObject(this.btnWaiDi, "redPoint")
|
||||||
this.rpbtnHomeLand = Util.GetGameObject(this.btnHomeLand, "redPoint")
|
this.rpbtnHomeLand = Util.GetGameObject(this.btnHomeLand, "redPoint")--家园
|
||||||
this.rpCompoundHero = Util.GetGameObject(this.btnCompoundHero, "redPoint")--神将合成、置换
|
this.rpCompoundHero = Util.GetGameObject(this.btnCompoundHero, "redPoint")--神将合成、置换
|
||||||
this.rpPokemon = Util.GetGameObject(this.btnPokemon, "redPoint")--灵兽
|
this.rpPokemon = Util.GetGameObject(this.btnPokemon, "redPoint")--灵兽
|
||||||
this.rpbtnTianShuMiJuan = Util.GetGameObject(this.btnTianShuMiJuan, "redPoint")--灵兽
|
this.rpbtnTianShuMiJuan = Util.GetGameObject(this.btnTianShuMiJuan, "redPoint")--灵兽
|
||||||
|
@ -712,6 +714,7 @@ function this.BindRedPoint()
|
||||||
BindRedPointObject(RedPointType.Alien, this.rpAlien)
|
BindRedPointObject(RedPointType.Alien, this.rpAlien)
|
||||||
BindRedPointObject(RedPointType.DiffMonster, this.rpYiYao)
|
BindRedPointObject(RedPointType.DiffMonster, this.rpYiYao)
|
||||||
-- BindRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld)
|
-- BindRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld)
|
||||||
|
BindRedPointObject(RedPointType.HomeLand, this.rpbtnHomeLand)
|
||||||
BindRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
|
BindRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
|
||||||
BindRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint)
|
BindRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint)
|
||||||
BindRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan)
|
BindRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan)
|
||||||
|
@ -736,6 +739,7 @@ function this.ClearRedPoint()
|
||||||
ClearRedPointObject(RedPointType.Alien, this.rpAlien)
|
ClearRedPointObject(RedPointType.Alien, this.rpAlien)
|
||||||
ClearRedPointObject(RedPointType.DiffMonster, this.rpYiYao)
|
ClearRedPointObject(RedPointType.DiffMonster, this.rpYiYao)
|
||||||
-- ClearRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld)
|
-- ClearRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld)
|
||||||
|
ClearRedPointObject(RedPointType.HomeLand, this.rpbtnHomeLand)
|
||||||
ClearRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
|
ClearRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
|
||||||
ClearRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint)
|
ClearRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint)
|
||||||
ClearRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan)
|
ClearRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan)
|
||||||
|
|
|
@ -6395,6 +6395,7 @@ end
|
||||||
|
|
||||||
--摘星阁装备强化信息请求
|
--摘星阁装备强化信息请求
|
||||||
function NetManager.EquipIntensifyRequset(_type,func)
|
function NetManager.EquipIntensifyRequset(_type,func)
|
||||||
|
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||||
local data = PlayerInfoProto_pb.EquipIntensifyRequset()
|
local data = PlayerInfoProto_pb.EquipIntensifyRequset()
|
||||||
data.type = _type
|
data.type = _type
|
||||||
local msg = data:SerializeToString()
|
local msg = data:SerializeToString()
|
||||||
|
@ -6403,6 +6404,14 @@ function NetManager.EquipIntensifyRequset(_type,func)
|
||||||
local msg = PlayerInfoProto_pb.EquipIntensifyResponse()
|
local msg = PlayerInfoProto_pb.EquipIntensifyResponse()
|
||||||
msg:ParseFromString(data)
|
msg:ParseFromString(data)
|
||||||
HomeLandManager.GetServerEquipData(msg,function ()
|
HomeLandManager.GetServerEquipData(msg,function ()
|
||||||
|
--设置脏数据
|
||||||
|
HeroPropManager.SetFuncPropDirty(Hero_Prop_Type.Equip)
|
||||||
|
--获取新战力
|
||||||
|
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
|
||||||
|
local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||||
|
if oldWarPower ~= tempPower then
|
||||||
|
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower})
|
||||||
|
end
|
||||||
if func then
|
if func then
|
||||||
func(msg)
|
func(msg)
|
||||||
end
|
end
|
||||||
|
|
|
@ -649,6 +649,8 @@ function this.RegisterRedCheckFunc()
|
||||||
RPData:AddCheckFunc(RedPointType.Gem,GemManager.RedPointCheck,FUNCTION_OPEN_TYPE.Gem)
|
RPData:AddCheckFunc(RedPointType.Gem,GemManager.RedPointCheck,FUNCTION_OPEN_TYPE.Gem)
|
||||||
|
|
||||||
RPData:AddCheckFunc(RedPointType.chaozhifanli,DynamicActivityManager.CheckRedPointPremium)
|
RPData:AddCheckFunc(RedPointType.chaozhifanli,DynamicActivityManager.CheckRedPointPremium)
|
||||||
|
--家园
|
||||||
|
RPData:AddCheckFunc(RedPointType.HomeLand,HomeLandManager.CheckRedMain)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 向红点绑定物体
|
-- 向红点绑定物体
|
||||||
|
|
Loading…
Reference in New Issue