[gm]======变身卡修改提交

dev_chengFeng
wangzhenxing 2022-11-02 11:48:41 +08:00
parent 840e322366
commit d2af9edc0f
8 changed files with 46497 additions and 15385 deletions

View File

@ -600,6 +600,80 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &5785410541853046842
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4366512690011259364}
- component: {fileID: 4344924413819869344}
- component: {fileID: 2199205243636941777}
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 &4366512690011259364
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5785410541853046842}
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: 5326869500111421911}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4344924413819869344
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5785410541853046842}
m_CullTransparentMesh: 0
--- !u!114 &2199205243636941777
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5785410541853046842}
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: 8908080ead3926f4e9e9951397b9e29b, 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 &5794519113580741025
GameObject:
m_ObjectHideFlags: 0
@ -807,6 +881,80 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &6024869442191785049
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1385336478088949971}
- component: {fileID: 7556323069212088893}
- component: {fileID: 162012290282527405}
m_Layer: 5
m_Name: Image (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1385336478088949971
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6024869442191785049}
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: 5326869500111421911}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7556323069212088893
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6024869442191785049}
m_CullTransparentMesh: 0
--- !u!114 &162012290282527405
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6024869442191785049}
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: 8908080ead3926f4e9e9951397b9e29b, 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 &6995970723649002454
GameObject:
m_ObjectHideFlags: 0
@ -1153,12 +1301,14 @@ RectTransform:
- {fileID: 3057938159168777605}
- {fileID: 5849587362301269875}
- {fileID: 8112703959684203346}
- {fileID: 1385336478088949971}
- {fileID: 4366512690011259364}
m_Father: {fileID: 6013867569192212373}
m_RootOrder: 3
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: 240, y: 158}
m_AnchoredPosition: {x: 213, y: 158}
m_SizeDelta: {x: 702.3, y: 90.099976}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8653944307383921909
@ -1189,7 +1339,7 @@ MonoBehaviour:
m_ChildAlignment: 4
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 70, y: 70}
m_CellSize: {x: 50, y: 50}
m_Spacing: {x: 0, y: 0}
m_Constraint: 0
m_ConstraintCount: 2

View File

@ -651,7 +651,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: -9.5, y: 82}
m_AnchoredPosition: {x: -9.5, y: 101}
m_SizeDelta: {x: 539.1, y: 212.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6092173542560657070
@ -1161,6 +1161,80 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: 1000
LanguageIndex: 11153
--- !u!1 &1614492036364691668
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1432556332622662979}
- component: {fileID: 6225479995391900482}
- component: {fileID: 8748369014912673535}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1432556332622662979
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1614492036364691668}
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: 3357357022721853643}
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: -52.8, y: -27}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6225479995391900482
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1614492036364691668}
m_CullTransparentMesh: 0
--- !u!114 &8748369014912673535
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1614492036364691668}
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: 5341503cbcd7cd54a9f1cac2364cffef, 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 &1843901691531674325
GameObject:
m_ObjectHideFlags: 0
@ -3296,7 +3370,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: -9.5, y: -67}
m_AnchoredPosition: {x: -9.5, y: -81}
m_SizeDelta: {x: 312, y: 88}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8249586693005641494
@ -3489,7 +3563,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 23.2, y: 7.6}
m_AnchoredPosition: {x: 23.2, y: 7.6000004}
m_SizeDelta: {x: 45, y: 45}
m_Pivot: {x: 0, y: 1}
--- !u!222 &4688765661218624246
@ -3614,7 +3688,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 23.2, y: 7.6}
m_AnchoredPosition: {x: 23.2, y: 7.6000004}
m_SizeDelta: {x: 45, y: 45}
m_Pivot: {x: 0, y: 1}
--- !u!222 &1309446761635765985
@ -3872,6 +3946,85 @@ MonoBehaviour:
m_Spacing: {x: 100, y: 0}
m_Constraint: 1
m_ConstraintCount: 2
--- !u!1 &6176149331498503815
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2158538580550940344}
- component: {fileID: 7664333273200512379}
- component: {fileID: 1568928487870219027}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2158538580550940344
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6176149331498503815}
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: 3357357022721853643}
m_RootOrder: 1
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: 34.9, y: -29.7}
m_SizeDelta: {x: 102.1, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7664333273200512379
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6176149331498503815}
m_CullTransparentMesh: 0
--- !u!114 &1568928487870219027
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6176149331498503815}
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: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 1000
--- !u!1 &6178998977080599659
GameObject:
m_ObjectHideFlags: 0
@ -4031,6 +4184,43 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u751F\u547D\uFF1A5000"
LanguageIndex: 11153
--- !u!1 &6357874055172058770
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3357357022721853643}
m_Layer: 5
m_Name: costItem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3357357022721853643
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6357874055172058770}
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: 1432556332622662979}
- {fileID: 2158538580550940344}
m_Father: {fileID: 7641017260553095228}
m_RootOrder: 3
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: 14.8}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6591624520537772728
GameObject:
m_ObjectHideFlags: 0
@ -4643,6 +4833,7 @@ RectTransform:
- {fileID: 4330089018124155953}
- {fileID: 1811486981567623331}
- {fileID: 4095452165657825508}
- {fileID: 3357357022721853643}
m_Father: {fileID: 3747604606915676520}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5009,7 +5200,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: -9.5, y: -67}
m_AnchoredPosition: {x: -9.5, y: -81}
m_SizeDelta: {x: 312, y: 88}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &393867596834846613

View File

@ -273,6 +273,7 @@ end
function this.CheckRedData(red)
local list = {}
--return false
if red == RedPointType.incarnation_people then
list = this.GetItemDataListByPro(1)
elseif red == RedPointType.incarnation_buddish then
@ -308,22 +309,45 @@ end
--检测化身卡是否可以升星
function this.CheckCardUpStarRedData(id)
local starCost= ChangingCard[id].StarUpCost
local star= this.itemDataList[id].star
if star<#starCost then
local costData=starCost[star+1]
local allItemList= BagManager.GetBagAllDataByItemType(29)
local curHaveItemNum=0
for i, v in pairs(allItemList) do
if v.quality==costData[1] and v.num>0 then
curHaveItemNum=curHaveItemNum+v.num
LogError("id======================"..id.." star=="..star)
local starConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.ChangingCardStar,"PoolId",ChangingCard[id].Star,"Level",star)
local isShow=true
if starConfig and star<ChangingCard[id].StarMax then
local cost=starConfig.PropList
for i = 1, #cost do
if cost[i][1]==0 then
local num=BagManager.GetItemCountById(ChangingCard[id].CardId)
LogError("num==========="..num.." cost[i][2]=="..cost[i][2])
if num<cost[i][2] then
isShow=false
end
else
local num2=BagManager.GetItemCountById(cost[i][1])
LogError("num==========="..num2.." cost[i][2]=="..cost[i][2])
if num2<cost[i][2] then
isShow=false
end
end
end
if curHaveItemNum>=costData[2] then
return true
end
else
isShow=false
end
return false
return isShow
-- if star<#starCost then
-- local costData=starCost[star+1]
-- local allItemList= BagManager.GetBagAllDataByItemType(29)
-- local curHaveItemNum=0
-- for i, v in pairs(allItemList) do
-- if v.quality==costData[1] and v.num>0 then
-- curHaveItemNum=curHaveItemNum+v.num
-- end
-- end
-- if curHaveItemNum>=costData[2] then
-- return true
-- end
-- end
--return false
end
---检测化身之力红点
@ -353,20 +377,28 @@ function this.GetChangeCardProperty(cardId,isNextLv,isNextStar)
if changeCardInfo then
local cardConfig=ConfigManager.GetConfigData(ConfigName.ChangingCard,cardId)
LogError("cardConfig.Star=="..cardConfig.Star.." star=="..star)
local propList={}
for k,v in pairs(cardConfig.PropList) do
propList[v[1]]=v[2]
end
if changeCardInfo then
if star>0 then
local starConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.ChangingCardStar,"PoolId",cardConfig.Star,"Level",star)
local startProp
if star==1 then
startProp=cardConfig.Star1UpProps
elseif star==2 then
startProp=cardConfig.Star2UpProps
elseif star==3 then
startProp=cardConfig.Star3UpProps
end
-- if star==1 then
-- startProp=cardConfig.Star1UpProps
-- elseif star==2 then
-- startProp=cardConfig.Star2UpProps
-- elseif star==3 then
-- startProp=cardConfig.Star3UpProps
-- elseif star==4 then
-- startProp=cardConfig.Star4UpProps
-- elseif star==5 then
-- startProp=cardConfig.Star5UpProps
-- end
startProp=starConfig.Exp
for k,v in pairs(startProp) do
if propList[v[1]] then
propList[v[1]]=propList[v[1]]+v[2]
@ -401,14 +433,15 @@ function this.GetChangeCardPropertyAdd(cardId,level,star)
end
if star>0 then
local startProp
if star==1 then
startProp=cardConfig.Star1UpProps
elseif star==2 then
startProp=cardConfig.Star2UpProps
elseif star==3 then
startProp=cardConfig.Star3UpProps
end
for k,v in pairs(startProp) do
-- if star==1 then
-- startProp=cardConfig.Star1UpProps
-- elseif star==2 then
-- startProp=cardConfig.Star2UpProps
-- elseif star==3 then
-- startProp=cardConfig.Star3UpProps
-- end
local starConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.ChangingCardStar,"PoolId",cardConfig.Star,"Level",star)
for k,v in pairs(starConfig.Exp) do
if propList[v[1]] then
propList[v[1]]=propList[v[1]]+v[2]
else

View File

@ -3,12 +3,15 @@ IncarnationPanel = Inherit(BasePanel)
local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
local artResourcesConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
local specialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,155).Value
local curLevel = ConfigManager.GetConfigData(ConfigName.ChangingForce,IncarnationManager.incarnationForceLv).Level
local xiuxian=ConfigManager.GetConfig(ConfigName.XiuXianConfig)
local curLevel =PracticeManager.PracticeLevel --ConfigManager.GetConfigData(ConfigName.ChangingForce,IncarnationManager.incarnationForceLv).Level
local limits=string.split(specialConfig,"#")
local tabs = {}
local tabsRedpoints = {}
local tabsImg = {"r_hero_huo 1_zh", "r_hero_feng 1_zh", "r_hero_shui 1_zh", "r_hero_dadi 1_zh"}
local proId = 1
local curIndex=1
local allPos={1321,327,-330}
function IncarnationPanel:InitComponent()
self.spLoader = SpriteLoader.New()
for i = 1, 4 do
@ -20,6 +23,9 @@ function IncarnationPanel:InitComponent()
end
self.selectBtn = Util.GetGameObject(self.gameObject,"bg/Tabs/selectBtn")
self.btnBack = Util.GetGameObject(self.gameObject,"bg/btnBack")
self.btn_left = Util.GetGameObject(self.gameObject,"bg/left")
self.btn_left:SetActive(false)
self.btn_right = Util.GetGameObject(self.gameObject,"bg/right")
self.incarnationPowerBtn = Util.GetGameObject(self.gameObject,"bg/incarnationPowerBtn")
self.powerBtnRedPoint = Util.GetGameObject(self.gameObject,"bg/incarnationPowerBtn/redPoint")
self.addBtn = Util.GetGameObject(self.gameObject,"bg/addBtn")
@ -33,12 +39,15 @@ function IncarnationPanel:InitComponent()
self.itemPreList = {}
self.upLayoutItemList = {}
self.upLayout = Util.GetGameObject(self.gameObject,"bg/upLayout")
for i = 1,3 do
self.upLayout = Util.GetGameObject(self.gameObject,"bg/upScroll/upLayout")
self.upLayout:GetComponent("RectTransform").anchoredPosition=Vector2.New(allPos[curIndex],-221)
for i = 1,8 do
self.upLayoutItemList[i] = {}
self.upLayoutItemList[i].go = Util.GetGameObject(self.upLayout,"card"..i)
self.upLayoutItemList[i].btn = Util.GetGameObject(self.upLayoutItemList[i].go,"unLoadBtn")
self.upLayoutItemList[i].pos = Util.GetGameObject(self.upLayoutItemList[i].go,"cardPre")
self.upLayoutItemList[i].posImg = Util.GetGameObject(self.upLayoutItemList[i].go,"posText"):GetComponent("Image")
self.upLayoutItemList[i].posImg.sprite=self.spLoader:LoadSprite("r_fxgz_shuzi_"..i)
self.upLayoutItemList[i].getBtn = Util.GetGameObject(self.upLayoutItemList[i].pos,"getBtn")
self.upLayoutItemList[i].lv = Util.GetGameObject(self.upLayoutItemList[i].go,"lvText"):GetComponent("Text")
end
@ -61,7 +70,7 @@ function IncarnationPanel:BindEvent()
self:RefreshList(false,true)
end)
end
for i = 1,3 do
for i = 1,8 do
Util.AddClick(self.upLayoutItemList[i].btn, function()
if self.upLayoutData[i] and self.upLayoutData[i].id then
NetManager.UpOrDownTransformationRequest(self.upLayoutData[i].id,i,1,function()
@ -74,7 +83,7 @@ function IncarnationPanel:BindEvent()
end
end)
end
for i = 1,3 do
for i = 1,8 do
Util.AddClick(self.upLayoutItemList[i].getBtn, function()
if self.upLayoutData[i] and self.upLayoutData[i].id then
local pos = self:FindDatasIndexById(self.upLayoutData[i].id)
@ -97,6 +106,24 @@ function IncarnationPanel:BindEvent()
self:ClosePanel()
end)
Util.AddClick(self.btn_left, function()
curIndex=curIndex-1
if curIndex==1 then
self.btn_left:SetActive(false)
else
self.btn_right:SetActive(true)
end
self.upLayout:GetComponent("RectTransform").anchoredPosition=Vector2.New(allPos[curIndex],-221)
end)
Util.AddClick(self.btn_right, function()
curIndex=curIndex+1
if curIndex==3 then
self.btn_right:SetActive(false)
else
self.btn_left:SetActive(true)
end
self.upLayout:GetComponent("RectTransform").anchoredPosition=Vector2.New(allPos[curIndex],-221)
end)
Util.AddClick(self.incarnationPowerBtn, function()
UIManager.OpenPanel(UIName.IncarnationForcePanel)
end)
@ -132,8 +159,8 @@ function IncarnationPanel:SetSelectBtn()
self.selectBtn:GetComponent("RectTransform").localPosition = Vector3.zero
end
function IncarnationPanel:RefreshUpLimitLevel()
curLevel = ConfigManager.GetConfigData(ConfigName.ChangingForce,IncarnationManager.incarnationForceLv).Level
for i = 1,3 do
curLevel =PracticeManager.PracticeLevel --ConfigManager.GetConfigData(ConfigName.ChangingForce,IncarnationManager.incarnationForceLv).Level
for i = 1,8 do
self.upLayoutItemList[i].lv.gameObject:SetActive(curLevel<tonumber(limits[i]))
end
end
@ -172,11 +199,15 @@ end
function IncarnationPanel:RefreshUpList()
self.upLayoutData = IncarnationManager.GetIncarnationData1()
for i = 1,3 do
for i = 1,8 do
self.upLayoutItemList[i].pos.gameObject:SetActive(false)
self.upLayoutItemList[i].btn.gameObject:SetActive(false)
self.upLayoutItemList[i].lv.gameObject:SetActive(curLevel<tonumber(limits[i]))
self.upLayoutItemList[i].lv.text="化身之力"..limits[i].."级解锁"
--local xiuxian=ConfigManager.GetConfigData(ConfigName.XiuXianConfig,tonumber(limits[i]))
if xiuxian then
self.upLayoutItemList[i].lv.text=xiuxian[tonumber(limits[i])].RealmName..xiuxian[tonumber(limits[i])].RealmLevelName.."解锁"
end
end
for k,v in pairs(self.upLayoutData) do
self:RefreshSingleCardPre(self.upLayoutItemList[k].pos,v,false,k)
@ -224,13 +255,14 @@ function IncarnationPanel:RefreshSingleCardPre(cardPre,data,isJump,index)
UIManager.OpenPanel(UIName.RewardTailsmanChipShowPopup, data.itemId)
end)
end
for i = 0, 3 do
if i<data.star then
self.cardList[cardPre].StarGrid.transform:GetChild(i).gameObject:SetActive(true)
else
self.cardList[cardPre].StarGrid.transform:GetChild(i).gameObject:SetActive(false)
end
end
SetCardStars(self.cardList[cardPre].StarGrid,data.star,1)
-- for i = 0, 8 do
-- if i<data.star then
-- self.cardList[cardPre].StarGrid.transform:GetChild(i).gameObject:SetActive(true)
-- else
-- self.cardList[cardPre].StarGrid.transform:GetChild(i).gameObject:SetActive(false)
-- end
-- end
self.cardList[cardPre].lv.text=data.level
else
cardPre.gameObject:SetActive(false)
@ -318,7 +350,7 @@ function IncarnationPanel:SetSingleData(go,data,index)
Util.AddOnceClick(self.itemPreList[go].incarnationBtn,function()
if data.state == 1 then
local pos = 0
for i = 1,3 do
for i = 1,8 do
if self.upLayoutData[i] and self.upLayoutData[i].id then
else
pos = i
@ -327,7 +359,7 @@ function IncarnationPanel:SetSingleData(go,data,index)
end
if curLevel<tonumber(limits[pos]) then
PopupTipPanel.ShowTip("化身之力"..limits[pos].."解锁")
PopupTipPanel.ShowTip(xiuxian[tonumber(limits[pos])].RealmName..xiuxian[tonumber(limits[pos])].RealmLevelName.."解锁")
return
end
if pos > 0 then

View File

@ -37,11 +37,12 @@ end
function this:OnOpen(_cardId)
local cardData= IncarnationManager.itemDataList[_cardId]
local cardConfig=ConfigManager.GetConfigData(ConfigName.ChangingCard,_cardId)
local maxStarProp=cardConfig.Star3UpProps
local starConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.ChangingCardStar,"PoolId",cardConfig.Star,"Level",5)
local maxStarProp=starConfig.Exp
local levelConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.ChangingCardLevel,"PoolId",cardConfig.LevelUpPool,"Level",cardConfig.LevelMax)
local maxLevelProp=levelConfig.PropList
this.maxLevel.text=cardConfig.LevelMax..""
this.skillDes.text="技能:"..IncarnationManager.GetSkillDesStr(_cardId,3)
this.skillDes.text="技能:"..IncarnationManager.GetSkillDesStr(_cardId,5)
local propList={}
for k,v in pairs(maxStarProp) do
if propList[v[1]] then

View File

@ -8,6 +8,8 @@ local curStar
local curLevel
local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
local curSelectMat={}
local starConfig=nil
local costEnough=false
function this:InitComponent()
this.spLoader = SpriteLoader.New()
this.mask = Util.GetGameObject(self.gameObject, "mask")
@ -15,9 +17,6 @@ function this:InitComponent()
this.titleText = Util.GetGameObject(self.gameObject, "root/bg/titleText"):GetComponent("Text")
this.prefab=Util.GetGameObject(self.gameObject, "root/prefab")
this.lvLayout=Util.GetGameObject(self.gameObject, "root/verLayout/lvLayout")
this.curLvText=Util.GetGameObject(this.lvLayout, "grid/curLv"):GetComponent("Text")
this.nextLvText=Util.GetGameObject(this.lvLayout, "grid/nextLv"):GetComponent("Text")
@ -37,6 +36,8 @@ function this:InitComponent()
--消耗相关
this.costLayout=Util.GetGameObject(self.gameObject, "root/verLayout/costLayout")
this.costGrid = Util.GetGameObject(this.costLayout, "costGrid")
this.costImg = Util.GetGameObject(this.costLayout, "costItem/Image"):GetComponent("Image")
this.costTxt = Util.GetGameObject(this.costLayout, "costItem/Text"):GetComponent("Text")
this.costItem=Util.GetGameObject(this.costLayout, "costGrid/costItem")
this.frame=Util.GetGameObject(this.costItem, "frame"):GetComponent("Image")
this.iconDefault=Util.GetGameObject(this.costItem, "iconDefault")
@ -50,6 +51,7 @@ function this:InitComponent()
this.upStarBtn = Util.GetGameObject(this.costLayout, "upStarBtn")
this.upStarText=Util.GetGameObject(this.costLayout, "upStarBtn/Text"):GetComponent("Text")
this.itemView= SubUIManager.Open(SubUIConfig.ItemView, this.prefab.transform)
end
function this:BindEvent()
@ -82,14 +84,14 @@ function this:BindEvent()
for i = 1, #curSelectMat do
selectNum=selectNum+curSelectMat[i].num
end
if selectNum<this.cardConfig.StarUpCost[curStar+1][2] then
if selectNum<starConfig.PropList[1][2] or not costEnough then
PopupTipPanel.ShowTip("材料不足")
return
end
this.upStarBtnOnClick()
end)
Util.AddClick(this.addBtn, function()
UIManager.OpenPanel(UIName.IncarnationUpStarListPanel,this,curSelectMat,this.cardConfig.StarUpCost[curStar+1])
UIManager.OpenPanel(UIName.IncarnationUpStarListPanel,this,curSelectMat,starConfig.PropList[1],this.cardConfig.CardId)
end)
end
-- type 1:升级 2:升星 cardId化身卡id
@ -131,6 +133,8 @@ function this.UpdateWin()
this.upLvBtn.gameObject:SetActive(true)
this.upStarBtn.gameObject:SetActive(false)
this.skillLayout.gameObject:SetActive(false)
this.costImg.gameObject:SetActive(false)
this.costTxt.gameObject:SetActive(false)
local cardLvConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.ChangingCardLevel,"Level",curLevel,"PoolId",this.cardConfig.LevelUpPool)
this.curDrop.text=cardLvConfig.ChangingForceExp[2]
this.SetPropInfo(this.curProp,propData)
@ -159,7 +163,10 @@ function this.UpdateWin()
Util.GetGameObject(this.curLvText.gameObject, "starImg"):SetActive(true)
Util.GetGameObject(this.nextLvText.gameObject, "starImg"):SetActive(true)
this.curLvText.text=curStar
this.curDrop.text=curStar>0 and this.cardConfig.StarUpExp[curStar][2] or 0
LogError("curStar==="..curStar)
local curStarConfig= ConfigManager.GetConfigDataByDoubleKey(ConfigName.ChangingCardStar,"PoolId",this.cardConfig.Star,"Level",curStar)
--this.curDrop.text=curStar>0 and curStarConfig.StarUpExp[2] or 0
this.curDrop.text=curStarConfig.StarUpExp[2]
this.upLvBtn.gameObject:SetActive(false)
this.upStarBtn.gameObject:SetActive(true)
this.skillLayout.gameObject:SetActive(true)
@ -173,9 +180,12 @@ function this.UpdateWin()
this.nextSkillDes.transform.parent.gameObject:SetActive(false)
this.nextDrop.gameObject:SetActive(false)
this.forceLayout.gameObject:SetActive(false)
this.costImg.gameObject:SetActive(false)
this.costTxt.gameObject:SetActive(false)
this.upStarText.text="已达上限"
else
this.nextSkillDes.gameObject:SetActive(true)
this.nextLvText.gameObject:SetActive(true)
this.nextSkillDes.text=IncarnationManager.GetSkillDesStr(curCardId,curStar+1)
this.nextProp.gameObject:SetActive(true)
this.costGrid.gameObject:SetActive(true)
@ -184,9 +194,24 @@ function this.UpdateWin()
local nextPropData=IncarnationManager.GetChangeCardProperty(curCardId,false,true)
this.nextLvText.text=curStar+1
this.SetPropInfo(this.nextProp,nextPropData)
this.SetCostItem(this.cardConfig.StarUpCost[curStar+1])
this.nextDrop.text="+"..this.cardConfig.StarUpExp[curStar+1][2]
starConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.ChangingCardStar,"PoolId",this.cardConfig.Star,"Level",curStar)
this.SetCostItem(starConfig.PropList[1])
this.nextDrop.text="+"..starConfig.StarUpExp[2]
this.upStarText.text="升 星"
if starConfig.PropList[2] then
this.costImg.gameObject:SetActive(true)
this.costTxt.gameObject:SetActive(true)
local costItemConfig=ConfigManager.GetConfigData(ConfigName.ItemConfig,starConfig.PropList[2][1])
local haveItemNum=BagManager.GetItemCountById(costItemConfig.Id)
if haveItemNum<starConfig.PropList[2][2] then
costEnough=false
this.costTxt.text=string.format("<color=#FF0000>%s</color>",haveItemNum.."/"..starConfig.PropList[2][2])
else
costEnough=true
this.costTxt.text=string.format("<color=#FFFFFF>%s</color>",haveItemNum.."/"..starConfig.PropList[2][2])
end
this.costImg.sprite=this.spLoader:LoadSprite(GetResourcePath(costItemConfig.ResourceID))
end
end
end
@ -233,7 +258,7 @@ function this.SetCostItem(costData)
end
function this:UpdateUpStarCost(_num,_curSelectList)
local needNum=this.cardConfig.StarUpCost[curStar+1][2]
local needNum=starConfig.PropList[1][2] --this.cardConfig.StarUpCost[curStar+1][2]
if _num<needNum then
this.num.text= string.format("<color=#FF0000>%s</color>",_num.."/"..needNum)
else

View File

@ -63,10 +63,10 @@ function this:RemoveListener()
end
--界面打开时调用(用于子类重写)
function this:OnOpen(_openThisPanel,_curSelectHeroList,_needInfo)
function this:OnOpen(_openThisPanel,_curSelectHeroList,_needInfo,curCardId)
openThisPanel= _openThisPanel
curSelectHeroList={}
--LogError("curCardId=="..curCardId)
print(#_curSelectHeroList)
for i = 1, #_curSelectHeroList do
table.insert(curSelectHeroList,_curSelectHeroList[i])
@ -77,11 +77,13 @@ function this:OnOpen(_openThisPanel,_curSelectHeroList,_needInfo)
heroDataList={}
local allItemList= BagManager.GetBagAllDataByItemType(29)
for i, v in pairs(allItemList) do
if v.quality==needQuality and v.num>0 then
--LogError("v.id=="..v.id)
if v.num>0 and v.id==curCardId then
--LogError("v.id=="..v.id)
table.insert(heroDataList,v)
end
end
--LogError("len====="..#heroDataList)
if not heroDataList or #heroDataList < 1 then
this.NoneImage.gameObject:SetActive(true)
else