Merge branch 'china/dev' into china/test
commit
27b9aa2e12
|
@ -43967,7 +43967,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7144930083889366428
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -80170,7 +80170,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &3173719562454643619
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -104108,7 +104108,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &9139396969791315054
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -168462,7 +168462,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &6960185033272747284
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -168689,7 +168689,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &-8409425785127076249
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -179918,7 +179918,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &176820800635632652
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -180289,7 +180289,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &5298674135033318747
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -185869,7 +185869,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &8339478454819500014
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -186017,7 +186017,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1691281247155542861
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -191580,7 +191580,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &3217903925305295122
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -226877,7 +226877,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &2578355701318810613
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -237006,7 +237006,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &4060928337411048415
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -231,6 +231,8 @@ RectTransform:
|
|||
- {fileID: 5650718797871551373}
|
||||
- {fileID: 2844344768517366783}
|
||||
- {fileID: 7049372687872576015}
|
||||
- {fileID: 7056634786308864761}
|
||||
- {fileID: 8998353619713856732}
|
||||
- {fileID: 8825631604627643149}
|
||||
- {fileID: 2427959115560483584}
|
||||
m_Father: {fileID: 3847735914630897183}
|
||||
|
@ -357,8 +359,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 319.2, y: -419.8}
|
||||
m_SizeDelta: {x: 256.6, y: 304}
|
||||
m_AnchoredPosition: {x: 316.9, y: -416.2}
|
||||
m_SizeDelta: {x: 319.3, y: 378.2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1655664878
|
||||
CanvasRenderer:
|
||||
|
@ -16547,8 +16549,8 @@ 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: 4.1, y: 8.1}
|
||||
m_SizeDelta: {x: 324, y: 326}
|
||||
m_AnchoredPosition: {x: 8.300003, y: 8.099991}
|
||||
m_SizeDelta: {x: 396.3, y: 400}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3313502045988818360
|
||||
CanvasRenderer:
|
||||
|
@ -16674,7 +16676,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 4.100006, y: 8.100098}
|
||||
m_SizeDelta: {x: 300, y: 300}
|
||||
m_SizeDelta: {x: 364, y: 374}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8417744968267042988
|
||||
CanvasRenderer:
|
||||
|
@ -22299,7 +22301,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1005476532}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
@ -23121,6 +23123,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &7102213659773939474
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8998353619713856732}
|
||||
- component: {fileID: 8762636570120661910}
|
||||
- component: {fileID: 4750401788150939220}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8998353619713856732
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7102213659773939474}
|
||||
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: 1005476532}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 324, y: -406.09998}
|
||||
m_SizeDelta: {x: 575, y: 575}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8762636570120661910
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7102213659773939474}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4750401788150939220
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7102213659773939474}
|
||||
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: 0
|
||||
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: 149c1462fc7748244952e4fd2edb9d6b, 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 &7209575186043740822
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -28924,7 +29000,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0.000014984968}
|
||||
m_AnchoredPosition: {x: 0, y: 0.000030517578}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &6617612647759148344
|
||||
|
@ -28945,7 +29021,7 @@ MonoBehaviour:
|
|||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 28.6
|
||||
m_Spacing: 25
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 1
|
||||
|
@ -33614,8 +33690,8 @@ RectTransform:
|
|||
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: -113.73001}
|
||||
m_SizeDelta: {x: 0, y: -119.8}
|
||||
m_AnchoredPosition: {x: 0, y: -94.6}
|
||||
m_SizeDelta: {x: 0, y: -81.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4696751499710555437
|
||||
CanvasRenderer:
|
||||
|
@ -33768,6 +33844,80 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
--- !u!1 &8988791518745566998
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7056634786308864761}
|
||||
- component: {fileID: 6592801749698823444}
|
||||
- component: {fileID: 5602061117581275867}
|
||||
m_Layer: 5
|
||||
m_Name: Image (4)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7056634786308864761
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8988791518745566998}
|
||||
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: 1005476532}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 304, y: -392}
|
||||
m_SizeDelta: {x: 1024, y: 836}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6592801749698823444
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8988791518745566998}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5602061117581275867
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8988791518745566998}
|
||||
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: 0
|
||||
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: 30c5caf46e716ab428cbd0a654b03f1d, 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 &9030145728978423027
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -34397,7 +34547,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1005476532}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
|
|
@ -62,7 +62,7 @@ function this:GetSkipState()
|
|||
if AppConst.isOpenGM then
|
||||
return SKIP_STATE.UNLOCK
|
||||
end
|
||||
LogError("fightType "..fightType)
|
||||
-- LogError("fightType "..fightType)
|
||||
if UpdateBtnGMFunc[fightType] then
|
||||
return UpdateBtnGMFunc[fightType]()
|
||||
else
|
||||
|
@ -518,11 +518,13 @@ function this.ShowBattleResult(result, msg)
|
|||
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.DEATH_POS then-- 十绝阵结算界面特殊显示
|
||||
this.ShowBattleResultByDeathPos()
|
||||
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.BACK or BattleManager.GetLastBattleType() == BATTLE_TYPE.ARENA then
|
||||
this:ClosePanel()
|
||||
this:ClosePanel()
|
||||
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.TASUILINGXIAO then
|
||||
this.ShowBattleResultByTaSuiLingXiao()
|
||||
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.JumpServerhightLadder then
|
||||
this.ShowBattleResultByJumpServerHightLadder(result)
|
||||
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.LINGMAIMIJING then
|
||||
this:ClosePanel()
|
||||
else
|
||||
if result == 0 then -- 失败
|
||||
local haveRecord = BattleRecordManager.isHaveRecord()
|
||||
|
|
|
@ -92,7 +92,9 @@ function PlayerView:onCreate(go, role, position, root)
|
|||
-- zs:SetActive(true)
|
||||
-- zs:GetComponent("Image").sprite = self.spLoader:LoadSprite(zsName)
|
||||
-- end
|
||||
|
||||
-- 阴影
|
||||
self.shadow = Util.GetGameObject(self.RootPanel.PlayerPanel, "live_"..position.."/shadow")
|
||||
self.shadow:SetActive(true)
|
||||
self.RoleLiveGO = poolManager:LoadLive(self.livePath, go.transform.parent, Vector3.one, Vector3.zero)
|
||||
self.RoleLiveGOGraphic = self.RoleLiveGO:GetComponent("SkeletonGraphic")
|
||||
self.RoleLiveGOTran = self.RoleLiveGO:GetComponent("RectTransform")
|
||||
|
@ -394,7 +396,6 @@ end
|
|||
|
||||
function PlayerView:OnSkillPlay()
|
||||
if not self.GameObject then
|
||||
LogError("111111111")
|
||||
return
|
||||
end
|
||||
self.lvHpObj:SetActive(false)
|
||||
|
|
|
@ -32,7 +32,12 @@ function this:OnShow(_parent)
|
|||
self.data = LingMaiMiJingManager.recordData
|
||||
if #self.data > 0 then
|
||||
self.empty:SetActive(false)
|
||||
PlayerPrefs.SetString(PlayerManager.uid.."LingMai",self.data[1].time)
|
||||
for i = 1, #this.recordData do
|
||||
if this.recordData[i].time == 1 then
|
||||
PlayerPrefs.SetString(PlayerManager.uid.."LingMai",self.data[1].time)
|
||||
break
|
||||
end
|
||||
end
|
||||
else
|
||||
self.empty:SetActive(true)
|
||||
PlayerPrefs.SetString(PlayerManager.uid.."LingMai","")
|
||||
|
|
|
@ -516,9 +516,8 @@ Hero_Prop_Func = {
|
|||
|
||||
[Hero_Prop_Type.TailsManSou] = function(_heroData)
|
||||
local propList, conPropList, teamPropList, conTeamPropList, dePropList
|
||||
local SingleProVal = TailsManSoulManager.GetTailsmanPassivePower()
|
||||
if SingleProVal and #SingleProVal > 0 then --talismanConFig.OpenSkillRules and #talismanConFig.OpenSkillRules > 0 then
|
||||
--单体加成 --单体等级限制加成 --团体加成 --减乘
|
||||
local SingleProVal = TailsManSoulManager.GetTailsmanPassivePower1(_heroData)
|
||||
if SingleProVal and #SingleProVal > 0 then
|
||||
propList, conPropList, teamPropList, conTeamPropList, dePropList = PassiveListToPropList(SingleProVal)
|
||||
end
|
||||
return propList, conPropList, teamPropList, conTeamPropList, dePropList
|
||||
|
|
|
@ -138,16 +138,20 @@ function this.CheckRedPoint()
|
|||
if not PlayerPrefs.GetString(PlayerManager.uid.."LingMai") then
|
||||
PlayerPrefs.SetString(PlayerManager.uid.."LingMai", "")
|
||||
end
|
||||
if PlayerPrefs.GetString(PlayerManager.uid.."LingMai") ~= tostring(this.recordData[1].time) then
|
||||
return true
|
||||
for i = 1, #this.recordData do
|
||||
if PlayerPrefs.GetString(PlayerManager.uid.."LingMai") ~= tostring(this.recordData[i].time) and this.recordData[i].time == 1 then
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
function this.CheckRecord()
|
||||
if this.recordData[1] then
|
||||
return PlayerPrefs.GetString(PlayerManager.uid.."LingMai") ~= tostring(this.recordData[1].time)
|
||||
for i = 1, #this.recordData do
|
||||
if this.recordData[i].time == 1 then
|
||||
return PlayerPrefs.GetString(PlayerManager.uid.."LingMai") ~= tostring(this.recordData[i].time)
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
|
|
@ -210,7 +210,7 @@ function LingMaiMiJingPanel:SetVeins()
|
|||
end
|
||||
Util.AddOnceClick(go,function ()
|
||||
if LingMaiMiJingManager.state == 1 then
|
||||
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.LINGMAIMIJING,data.serverName and data.serverName or nil,data)
|
||||
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.LINGMAIMIJING,data.servername and data.servername or nil,data)
|
||||
else
|
||||
PopupTipPanel.ShowTip("<color=red>灵脉秘境未开启!</color>")
|
||||
end
|
||||
|
|
|
@ -78,7 +78,10 @@ local this = GMPanel
|
|||
"1#60198#6","1#60199#6","1#60201#6","1#60161#6","1#60162#6","1#60163#6","1#60164#6","1#60165#6","1#60166#6","1#60186#6","1#60187#6","1#60188#6","1#60189#6",
|
||||
"1#60178#6","1#60179#6","1#60202#6","1#60203#6","1#60204#6","1#60205#6","1#60206#6","1#60207#6","1#60208#6","1#60209#6","1#60210#6","1#60211#6","1#60212#6","1#60213#6",
|
||||
}
|
||||
local moneyList = {"1#74#999", "1#87#999", "1#1226#99999999", "1#5000050#99", "1#20007#10", "1#1203#10000", "1#14#500000000","1#16#400000000", "1#3#500000000", "1#4#9999999", "1#20#999999",}
|
||||
local moneyList = {"1#14#100000000","1#16#100000000","1#4#100000000","1#19#100000000","1#20#100000000","1#21#100000000","1#23#100000000","1#26#100000000","1#29#100000000","1#32#100000000","1#66#100000000",
|
||||
"1#69#100000000","1#74#100000000","1#79#100000000","1#80#100000000","1#87#100000000","1#1001#100000000","1#1201#100000000","1#1202#100000000","1#1203#100000000","1#1204#100000000",
|
||||
"1#1205#100000000","1#1206#100000000","1#1207#100000000","1#1208#100000000","1#1210#100000000","1#1211#100000000","1#1220#100000000","1#1228#100000000"
|
||||
,"1#1229#100000000","1#1230#100000000","1#1231#100000000","1#1232#100000000","1#1240#100000000","1#1241#100000000","1#1242#100000000","1#1273#100000000"}
|
||||
--初始化组件(用于子类重写)
|
||||
function GMPanel:InitComponent()
|
||||
this.spLoader = SpriteLoader.New()
|
||||
|
@ -111,6 +114,8 @@ function GMPanel:InitComponent()
|
|||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成所有装备", inputTip = {""}, callBack = this.GetEquipe},
|
||||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成很多物品", inputTip = {""}, callBack = this.GetAllItems},
|
||||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "鑫鹏的gm", inputTip = {""}, callBack = this.SendToXinPeng},
|
||||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "一键法宝碎片", inputTip = {""}, callBack = this.GetFaBaoSuiPian},
|
||||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "一键变身卡", inputTip = {""}, callBack = this.GetBianshenka},
|
||||
|
||||
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "16#%s#0", btnTip = "跳转", inputTip = {"输入兽潮层数"}, callBack = nil},
|
||||
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "15#%s#0", btnTip = "获取", inputTip = {"孙龙秘宝积分"}, callBack = this.SetSunLongScroe},
|
||||
|
@ -354,9 +359,37 @@ function this.GetMoney()
|
|||
local time = Timer.New(function ()
|
||||
NetManager.GMEvent(moneyList[index])
|
||||
index = index + 1
|
||||
end, 1, 10, true)
|
||||
end, 0.5, 10, true)
|
||||
time:Start()
|
||||
end
|
||||
-- 一键法宝碎片
|
||||
function this.GetFaBaoSuiPian()
|
||||
local ic = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
local i = 0
|
||||
coroutine.start(function()
|
||||
for _, configInfo in ConfigPairs(ConfigManager.GetConfig(ConfigName.ItemConfig)) do
|
||||
if ItemType.talismanSoulChip == configInfo.ItemType then
|
||||
NetManager.GMEvent("1#"..configInfo.Id.."#1000")
|
||||
coroutine.wait(0.01)
|
||||
end
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
-- 一键变身卡
|
||||
function this.GetBianshenka()
|
||||
local ic = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
local i = 0
|
||||
coroutine.start(function()
|
||||
for _, configInfo in ConfigPairs(ConfigManager.GetConfig(ConfigName.ItemConfig)) do
|
||||
if ItemType.Incarnation == configInfo.ItemType then
|
||||
NetManager.GMEvent("1#"..configInfo.Id.."#1")
|
||||
coroutine.wait(0.01)
|
||||
end
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
-- 测试跳转
|
||||
function this.TestJump(text)
|
||||
JumpManager.GoJump(tonumber(text))
|
||||
|
|
|
@ -6084,12 +6084,16 @@ function NetManager.FaBaoSoulUpLvRequest(id,lv, func)
|
|||
data.level = lv
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.FA_BAO_SOUL_UPLV_REQUEST, MessageTypeProto_pb.FA_BAO_SOUL_UPLV_RESPONSE, msg, function(buffer)
|
||||
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
|
||||
TailsManSoulManager.SetTailsmanLvById(id,lv)
|
||||
CheckRedPointStatus(RedPointType.tailsmanSoul_gold)
|
||||
CheckRedPointStatus(RedPointType.tailsmanSoul_red)
|
||||
CheckRedPointStatus(RedPointType.tailsmanSoul_whiteGold)
|
||||
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.TailsManSou)
|
||||
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
|
||||
local herodata = HeroManager.GetAllHeroList()
|
||||
for k,v in pairs(herodata) do
|
||||
HeroPropManager.SetDirtyByType(v.dynamicId, Hero_Prop_Type.TailsManSou)
|
||||
end
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
|
|
|
@ -445,7 +445,7 @@ function this.RefreshBtnShow()
|
|||
this.btnBox:SetActive(true)
|
||||
|
||||
-- 按钮功能
|
||||
local btnType = this._Config.btnType
|
||||
local btnType = this._Config.btnType or {}
|
||||
for index, btn in ipairs(this.btnList) do
|
||||
btn:SetActive(btnType[index] ~= nil)
|
||||
if btnType[index] then
|
||||
|
|
|
@ -53,7 +53,7 @@ function TailsManSouPanel:BindEvent()
|
|||
local s = function(data)
|
||||
local lis1 = {}
|
||||
for k,v in pairs(data) do
|
||||
table.insert(lis1,string.format("<color=#00FF00>%s:+%s</color>",propertyConfig[k].Info,GetPropertyFormatStr(propertyConfig[k].Style,v)))
|
||||
table.insert(lis1,string.format("<color=#00FF00>%s+%s</color>",propertyConfig[k].Info,GetPropertyFormatStr(propertyConfig[k].Style,v)))
|
||||
end
|
||||
return lis1
|
||||
end
|
||||
|
|
|
@ -4,6 +4,7 @@ local trumpBook = ConfigManager.GetConfig(ConfigName.TrumpBook)
|
|||
local Trump = ConfigManager.GetConfig(ConfigName.Trump)
|
||||
local TrumpLevelupPool = ConfigManager.GetConfig(ConfigName.TrumpLevelupPool)
|
||||
local passiveSkillConfig = ConfigManager.GetConfig(ConfigName.XiuXianSkillConfig)
|
||||
local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
|
||||
this.TailsmanList = {}
|
||||
function this.Initialize()
|
||||
end
|
||||
|
@ -63,6 +64,10 @@ function this.SetTailsmanLv(data)
|
|||
this.SetTailsmanLvById(data[i].id,data[i].level)
|
||||
end
|
||||
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.TailsManSou)
|
||||
local herodata = HeroManager.GetAllHeroList()
|
||||
for k,v in pairs(herodata) do
|
||||
HeroPropManager.SetDirtyByType(v.dynamicId, Hero_Prop_Type.TailsManSou)
|
||||
end
|
||||
end
|
||||
|
||||
--根据法宝id 获取设置等级
|
||||
|
@ -100,7 +105,7 @@ function this.GetTailsmanPassivePower()
|
|||
local data = {}
|
||||
for i = 1,#datas do
|
||||
for j = 1,#datas[i].skillConfig do
|
||||
if datas[i].lv <= datas[i].skillConfig[j][1] then
|
||||
if datas[i].lv == datas[i].skillConfig[j][1] then
|
||||
table.insert(data,datas[i].skillConfig[j][2])
|
||||
end
|
||||
end
|
||||
|
@ -108,6 +113,27 @@ function this.GetTailsmanPassivePower()
|
|||
return data
|
||||
end
|
||||
|
||||
function this.GetTailsmanPassivePower1(_heroData)
|
||||
local idList = {}
|
||||
local SingleProVal = this.GetTailsmanPassivePower()
|
||||
if SingleProVal and #SingleProVal > 0 then --talismanConFig.OpenSkillRules and #talismanConFig.OpenSkillRules > 0 then
|
||||
for i = 1,#SingleProVal do
|
||||
if passiveSkillConfig[SingleProVal[i]] then
|
||||
local config = passiveSkillConfig[SingleProVal[i]]
|
||||
if config.FitList[1] == 0 or
|
||||
(config.FitList[1] == 1 and heroConfig[_heroData.tId].PropertyName == config.FitList[2]) or
|
||||
(config.FitList[1] == 2 and heroConfig[_heroData.tId].Profession == config.FitList[2]) then
|
||||
for i = 1,#config.SkillId do
|
||||
table.insert(idList,config.SkillId[i])
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
return idList
|
||||
end
|
||||
|
||||
|
||||
function this.CheckRedData(red)
|
||||
local list = {}
|
||||
if red == RedPointType.tailsmanSoul_gold then
|
||||
|
|
|
@ -113,7 +113,6 @@ end
|
|||
function TailsmanSoulMainPanel:OnOpen(curCompId)
|
||||
self.curCompId = curCompId
|
||||
self.index = 1
|
||||
|
||||
end
|
||||
|
||||
function TailsmanSoulMainPanel:OnShow()
|
||||
|
@ -128,21 +127,23 @@ function TailsmanSoulMainPanel:OnShow()
|
|||
end
|
||||
|
||||
function TailsmanSoulMainPanel:SetSkillGridPos()
|
||||
local pos = self.skillGrid:GetComponent("RectTransform").anchoredPosition3D
|
||||
for i = 1,#self.skillList do
|
||||
if self.complv > i then
|
||||
pos.y = self.skillGridPos.y + GetPreferredHeight(self.skillList[i].go.transform)
|
||||
end
|
||||
end
|
||||
self.skillGrid:GetComponent("RectTransform").anchoredPosition3D = pos
|
||||
-- local pos = self.skillGrid:GetComponent("RectTransform").anchoredPosition3D
|
||||
-- for i = 1,#self.skillList do
|
||||
-- if self.complv > i then
|
||||
-- pos.y = self.skillGridPos.y + GetPreferredHeight(self.skillList[i].go.transform)
|
||||
-- end
|
||||
-- end
|
||||
-- self.skillGrid:GetComponent("RectTransform").anchoredPosition3D = pos
|
||||
end
|
||||
|
||||
function TailsmanSoulMainPanel:GetSkillDataList()
|
||||
local datas = {}
|
||||
for k,v in pairs(self.skillDataList) do
|
||||
local str = v
|
||||
if self.complv >= k then
|
||||
if self.complv == k then
|
||||
str = string.format("<color=#00FF00>%s</color>",str)
|
||||
elseif self.complv < k then
|
||||
str = string.format("<color=#BFBFBF>%s</color>",str)
|
||||
else
|
||||
str = string.format("<color=#FFCF9E>%s</color>",str)
|
||||
end
|
||||
|
|
|
@ -15,22 +15,22 @@ public class RoleProperty : MonoBehaviour
|
|||
"速度",
|
||||
"伤害加成系数(%)",
|
||||
"伤害减免系数(%)",
|
||||
"施法率(%)",
|
||||
"后期基础施法率(%)",
|
||||
"命中lv(%)",
|
||||
"闪避率(%)",
|
||||
"暴击率(%)",
|
||||
"暴击伤害系数(%)",
|
||||
"抗暴率(%)",
|
||||
"治疗加成系数(%)",
|
||||
"受到治疗加成系数(%)",
|
||||
"队伍伤害加成系数(%)",
|
||||
"队伍伤害减免系数(%)",
|
||||
"火系伤害减免系数(%)",
|
||||
"风系伤害减免系数(%)",
|
||||
"冰系伤害减免系数(%)",
|
||||
"地系伤害减免系数(%)",
|
||||
"光系伤害减免系数(%)",
|
||||
"暗系伤害减免系数(%)",
|
||||
"属性伤害加成系数(%)",
|
||||
"人系伤害加成(%)",
|
||||
"佛系伤害加成(%)",
|
||||
"妖系伤害加成(%)",
|
||||
"道系伤害加成(%)",
|
||||
"人系伤害减免(%)",
|
||||
"佛系伤害减免(%)",
|
||||
"妖系伤害减免(%)",
|
||||
"道系伤害减免(%)",
|
||||
"暴击伤害减免(%)",
|
||||
"初始怒气值",
|
||||
};
|
||||
private Dictionary<string, float> _dic = new Dictionary<string, float>();
|
||||
|
|
Loading…
Reference in New Issue