【天书秘卷】 修改

dev_chengFeng
jiaoyangna 2021-03-25 15:34:05 +08:00
parent dd075e3c4c
commit 299a7ceff1
6 changed files with 128 additions and 116 deletions

View File

@ -24000,7 +24000,7 @@ RectTransform:
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: 1262, y: 450.5}
m_AnchoredPosition: {x: 1250, y: -24}
m_SizeDelta: {x: 300, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4025510138618195971

View File

@ -264,7 +264,7 @@ RectTransform:
m_Children:
- {fileID: 2149471666774432408}
m_Father: {fileID: 6861030463589856289}
m_RootOrder: 8
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}
@ -500,7 +500,6 @@ GameObject:
m_Component:
- component: {fileID: 8458557718928898840}
- component: {fileID: 455843809901100221}
- component: {fileID: 2822981987166467604}
m_Layer: 0
m_Name: box
m_TagString: Untagged
@ -522,9 +521,9 @@ RectTransform:
m_Father: {fileID: 8396209728857207438}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 50}
m_AnchoredPosition: {x: -0.000020082896, y: 50}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &455843809901100221
@ -541,29 +540,15 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 62
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 5
m_ChildAlignment: 4
m_Spacing: -0.9
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!114 &2822981987166467604
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2084043858434005442}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!1 &2324518939165282330
GameObject:
m_ObjectHideFlags: 0
@ -669,7 +654,7 @@ RectTransform:
m_Children:
- {fileID: 6081459106550561746}
m_Father: {fileID: 6861030463589856289}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1313,7 +1298,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6861030463589856289}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@ -1358,7 +1343,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6861030463589856289}
m_RootOrder: 3
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}
@ -1578,7 +1563,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6861030463589856289}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1797,7 +1782,6 @@ RectTransform:
m_Children:
- {fileID: 4910584181017763717}
- {fileID: 4337632453246120809}
- {fileID: 5814215708146817654}
- {fileID: 4246864129654946524}
- {fileID: 8463856118875763708}
- {fileID: 6567555574747465628}
@ -1956,7 +1940,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6861030463589856289}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -2173,80 +2157,6 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
--- !u!1 &7631005152891186903
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5814215708146817654}
- component: {fileID: 9048690916534063661}
- component: {fileID: 741216287473020464}
m_Layer: 5
m_Name: select
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5814215708146817654
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7631005152891186903}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 100}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6861030463589856289}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 2489, y: -305}
m_SizeDelta: {x: 762.35, y: 501.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9048690916534063661
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7631005152891186903}
m_CullTransparentMesh: 0
--- !u!114 &741216287473020464
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7631005152891186903}
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: e0b47bc9a280e904f8fa3ee0e74d04ef, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &8074562993270738609
GameObject:
m_ObjectHideFlags: 0
@ -2429,12 +2339,12 @@ RectTransform:
- {fileID: 1994294546225590454}
- {fileID: 8458557718928898840}
m_Father: {fileID: 6861030463589856289}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -470.02505, y: 50.1}
m_SizeDelta: {x: 940, y: 100.2}
m_AnchoredPosition: {x: -536.9, y: 50.1}
m_SizeDelta: {x: 806.3, y: 100.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3105191926613661990
MonoBehaviour:

View File

@ -401,7 +401,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8298748580827318525}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -815,6 +815,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 9119434493110128929}
- {fileID: 931482766990349484}
m_Father: {fileID: 5391102142789844470}
m_RootOrder: 0
@ -881,6 +882,101 @@ MonoBehaviour:
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &8764192060461733297
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9119434493110128929}
- component: {fileID: 3912399978798336808}
- component: {fileID: 4641605307051509082}
- component: {fileID: 5865686551213295576}
m_Layer: 5
m_Name: mask
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &9119434493110128929
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8764192060461733297}
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: 8298748580827318525}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.8, y: 15.9}
m_SizeDelta: {x: 30.2, y: 28.6}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &3912399978798336808
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8764192060461733297}
m_CullTransparentMesh: 0
--- !u!114 &4641605307051509082
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8764192060461733297}
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: e0b47bc9a280e904f8fa3ee0e74d04ef, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &5865686551213295576
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8764192060461733297}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &8847800419531988836
GameObject:
m_ObjectHideFlags: 0

View File

@ -1625,10 +1625,10 @@ function this.GetAllHeroTeamAddProVal(teamHeroInfos,curteamHeroDid)
this.DoubleTableCompound(teamProVal, pokemonFetterAddPro)
--神将羁绊加成
local heroFetterAddPro = TianShuMiJuanManger.GetAllFetterAddProsBy(1)
this.DoubleTableCompound(teamProVal, pokemonFetterAddPro)
this.DoubleTableCompound(teamProVal, heroFetterAddPro)
--魂印羁绊加成
local hunyinFetterAddPro = TianShuMiJuanManger.GetAllFetterAddProsBy(2)
this.DoubleTableCompound(teamProVal, pokemonFetterAddPro)
this.DoubleTableCompound(teamProVal, hunyinFetterAddPro)
--光环加成
local aureoleProAdd = FormationManager.GetCurFormationElementAdd(teamHeroInfos)
this.DoubleTableCompound(teamProVal, aureoleProAdd)
@ -1809,8 +1809,14 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
local pokemonFetterAddPro = PokemonManager.GetAllPokemonFetterAddPros()
--神将羁绊
local heroFetterAddPro = TianShuMiJuanManger.GetAllFetterAddProsBy(1)
-- for index, value in pairs(heroFetterAddPro) do
-- LogError("神将羁绊 最终 加成 "..index.." "..value)
-- end
--魂印羁绊
local hunyinFetterAddPro = TianShuMiJuanManger.GetAllFetterAddProsBy(2)
-- for index, value in pairs(hunyinFetterAddPro) do
-- LogError("魂印羁绊 最终 加成 "..index.." "..value)
-- end
--灵兽羁绊单加战力 暂时去掉
-- local allPokemonFetterAddWarPowerVal = PokemonManager.GetAllPokemonFetterAddProsSWarPower()--allSoulPrintAddWarPowerVal--
-- LogError("灵兽羁绊加成静态战力 "..allPokemonFetterAddWarPowerVal)
@ -1846,11 +1852,6 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
this.DoubleTableCompound(allHeroProVal, hunyinFetterAddPro)
this.DoubleTableCompound(allHeroProVal, pokemonFormationAllHeroProVal)
end
-- for index, value in pairs(allHeroProVal) do
-- if value > 0 then
-- LogError("allHeroProVal 最终 加成 "..index.." "..value)
-- end
-- end
--4公式特殊减乘所有属性加成
this.DoubleTableCompound(specialProVal, falismanSpecialProVal)
this.DoubleTableCompound(specialProVal,specialSoulPrintProVal)

View File

@ -35,7 +35,6 @@ function TianShuMiJuanMainPanel:InitComponent()
self.tabbox = Util.GetGameObject(self.gameObject,"bg/tabbox")
self.bg = Util.GetGameObject(self.gameObject,"bg/Bg"):GetComponent("Image")
self.selectKuang = Util.GetGameObject(self.gameObject,"bg/select")
self.title = Util.GetGameObject(self.gameObject,"bg/title"):GetComponent("Image")
self.btnBack = Util.GetGameObject(self.gameObject,"bg/btnBack")
self.shai = Util.GetGameObject(self.gameObject,"bg/shai")
@ -186,8 +185,8 @@ end
local sortData = {
[0] = 0,
[-1] = 1,
[1] = 2,
[1] = 1,
[-1] = 2,
}
function TianShuMiJuanMainPanel:SortData()
if not curData or #curData < 1 then

View File

@ -11,6 +11,7 @@ end
--初始化组件(用于子类重写)
function FetterItem:InitComponent()
self.name = Util.GetGameObject(self.gameObject,"bg/nameText"):GetComponent("Text")
self.mask = Util.GetGameObject(self.gameObject,"bg/mask")
self.grid = Util.GetGameObject(self.gameObject,"scroll")
self.tipText = Util.GetGameObject(self.gameObject,"tipText"):GetComponent("Text")
self.activeBtn = Util.GetGameObject(self.gameObject,"activeBtn")
@ -27,6 +28,7 @@ end
function FetterItem:BindEvent()
Util.AddOnceClick(self.activeBtn, function()
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
LogGreen("oldWarPower:"..oldWarPower)
NetManager.PokemonBookEnableRequest(self.itemData.id,function(msg)
if msg.drop and msg.drop.itemlist and #msg.drop.itemlist > 0 then
local item = msg.drop.itemlist[1]
@ -34,8 +36,8 @@ function FetterItem:BindEvent()
end
TianShuMiJuanManger.UpdateFetterId({self.itemData.id})
local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
LogGreen("newWarPower:"..newWarPower)
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = newWarPower})
--self:SetIcon(1)
parent:RefreshData()
end)
end)
@ -94,7 +96,9 @@ function FetterItem:SetIcon(status)
if status == 1 then
self.activeBtn.gameObject:SetActive(false)
self.active.gameObject:SetActive(true)
self.mask.gameObject:SetActive(false)
else
self.mask.gameObject:SetActive(false)
self.activeBtn.gameObject:SetActive(true)
self.active.gameObject:SetActive(false)
self.activeBtnRed.gameObject:SetActive(false)
@ -103,10 +107,12 @@ function FetterItem:SetIcon(status)
Util.SetGray(self.activeBtn,false)
self.activeBtnRed.gameObject:SetActive(true)
self.activeBtn:GetComponent("Button").enabled = true
self.mask.gameObject:SetActive(true)
else
Util.SetGray(self.activeBtn,true)
self.activeBtnRed.gameObject:SetActive(false)
self.activeBtn:GetComponent("Button").enabled = false
self.mask.gameObject:SetActive(false)
end
end
end