Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统

wangzhenxing 2020-10-23 09:55:02 +09:00
commit 1466227510
12 changed files with 2112 additions and 1162 deletions

View File

@ -1,5 +1,79 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &45006566340254810
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5060544670283051999}
- component: {fileID: 3314124443306695926}
- component: {fileID: 6575626385250298023}
m_Layer: 5
m_Name: starPre (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5060544670283051999
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 45006566340254810}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.0004802, y: 1.0004802, z: 1}
m_Children: []
m_Father: {fileID: 1826272153389452366}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 25, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3314124443306695926
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 45006566340254810}
m_CullTransparentMesh: 0
--- !u!114 &6575626385250298023
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 45006566340254810}
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: 2fc66648425db004b8bc96f72e5188be, 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 &66685117577685786
GameObject:
m_ObjectHideFlags: 0
@ -1649,6 +1723,8 @@ RectTransform:
- {fileID: 2911012451187661427}
- {fileID: 1160129503841078063}
- {fileID: 6379374368765155729}
- {fileID: 1826272153389452366}
- {fileID: 1468911190892258987}
m_Father: {fileID: 6274243969840597889}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1964,6 +2040,71 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1017975324530418394
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1468911190892258987}
- component: {fileID: 110862887510415020}
m_Layer: 5
m_Name: starKuangGrid (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1468911190892258987
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1017975324530418394}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 100}
m_LocalScale: {x: 1.0603921, y: 1.0603921, z: 1}
m_Children:
- {fileID: 7295545614476179048}
- {fileID: 598960275740256669}
- {fileID: 4433729899765380431}
- {fileID: 5528079592724988461}
- {fileID: 728516731321390853}
m_Father: {fileID: 7919175646116931966}
m_RootOrder: 6
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: -87, y: 110}
m_SizeDelta: {x: 439.78, y: 50}
m_Pivot: {x: 0, y: 0}
--- !u!114 &110862887510415020
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1017975324530418394}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 50, y: 50}
m_Spacing: {x: -5.77, y: 0}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!1 &1031766527896224152
GameObject:
m_ObjectHideFlags: 0
@ -2117,6 +2258,80 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 100
--- !u!1 &1079051691281377951
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 728516731321390853}
- component: {fileID: 3824200343888627036}
- component: {fileID: 7831714964674910955}
m_Layer: 5
m_Name: starPre (5)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &728516731321390853
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079051691281377951}
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: 1468911190892258987}
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: 201.92, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3824200343888627036
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079051691281377951}
m_CullTransparentMesh: 0
--- !u!114 &7831714964674910955
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079051691281377951}
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: 2fc66648425db004b8bc96f72e5188be, 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 &1094515686275134226
GameObject:
m_ObjectHideFlags: 0
@ -2885,7 +3100,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: 525, y: 93}
m_AnchoredPosition: {x: 525, y: 131}
m_SizeDelta: {x: 767.9, y: 193.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1994249981271611886
@ -2917,7 +3132,7 @@ MonoBehaviour:
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 201, y: 181.69}
m_Spacing: {x: -22.4, y: 0}
m_Spacing: {x: 8.7, y: 0}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!1 &1835657115501262399
@ -3074,6 +3289,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1932564741687894196
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5528079592724988461}
- component: {fileID: 3097199454911493717}
- component: {fileID: 7869703601906540251}
m_Layer: 5
m_Name: starPre (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5528079592724988461
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1932564741687894196}
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: 1468911190892258987}
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: 157.69, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3097199454911493717
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1932564741687894196}
m_CullTransparentMesh: 0
--- !u!114 &7869703601906540251
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1932564741687894196}
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: 2fc66648425db004b8bc96f72e5188be, 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 &2219114386436738735
GameObject:
m_ObjectHideFlags: 0
@ -3222,6 +3511,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2412154024282357026
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6552063236640901728}
- component: {fileID: 5296141163024175539}
- component: {fileID: 7560571023486009278}
m_Layer: 5
m_Name: starPre (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6552063236640901728
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2412154024282357026}
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: 1826272153389452366}
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: 157.69, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5296141163024175539
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2412154024282357026}
m_CullTransparentMesh: 0
--- !u!114 &7560571023486009278
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2412154024282357026}
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: 2fc66648425db004b8bc96f72e5188be, 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 &2675230695179063936
GameObject:
m_ObjectHideFlags: 0
@ -3600,6 +3963,71 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &2793509207267942026
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1826272153389452366}
- component: {fileID: 8646842270212524032}
m_Layer: 5
m_Name: starKuangGrid
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1826272153389452366
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2793509207267942026}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 100}
m_LocalScale: {x: 1.0603921, y: 1.0603921, z: 1}
m_Children:
- {fileID: 5060544670283051999}
- {fileID: 1285829250814013160}
- {fileID: 289114772560873779}
- {fileID: 6552063236640901728}
- {fileID: 2690273579411082698}
m_Father: {fileID: 7919175646116931966}
m_RootOrder: 5
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: -391, y: 110}
m_SizeDelta: {x: 439.78, y: 50}
m_Pivot: {x: 0, y: 0}
--- !u!114 &8646842270212524032
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2793509207267942026}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 50, y: 50}
m_Spacing: {x: -5.77, y: 0}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!1 &2912582491272809147
GameObject:
m_ObjectHideFlags: 0
@ -3696,6 +4124,80 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u60C5\u62A5"
LanguageIndex: 11443
--- !u!1 &2986185126863200128
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 289114772560873779}
- component: {fileID: 3774985574065760307}
- component: {fileID: 7193693709181794696}
m_Layer: 5
m_Name: starPre (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &289114772560873779
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2986185126863200128}
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: 1826272153389452366}
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: 113.46, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3774985574065760307
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2986185126863200128}
m_CullTransparentMesh: 0
--- !u!114 &7193693709181794696
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2986185126863200128}
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: 2fc66648425db004b8bc96f72e5188be, 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 &3062382246345236250
GameObject:
m_ObjectHideFlags: 0
@ -4708,6 +5210,80 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4519744478655991595}
m_CullTransparentMesh: 0
--- !u!1 &4640251205205072801
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4433729899765380431}
- component: {fileID: 3628476296018424974}
- component: {fileID: 9165044882015892518}
m_Layer: 5
m_Name: starPre (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4433729899765380431
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4640251205205072801}
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: 1468911190892258987}
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: 113.46, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3628476296018424974
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4640251205205072801}
m_CullTransparentMesh: 0
--- !u!114 &9165044882015892518
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4640251205205072801}
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: 2fc66648425db004b8bc96f72e5188be, 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 &4653357126713985120
GameObject:
m_ObjectHideFlags: 0
@ -9940,6 +10516,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7507938675167224878
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1285829250814013160}
- component: {fileID: 8986143152591456570}
- component: {fileID: 9221803244158560265}
m_Layer: 5
m_Name: starPre (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1285829250814013160
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7507938675167224878}
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: 1826272153389452366}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 69.229996, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8986143152591456570
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7507938675167224878}
m_CullTransparentMesh: 0
--- !u!114 &9221803244158560265
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7507938675167224878}
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: 2fc66648425db004b8bc96f72e5188be, 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 &7548343065809240177
GameObject:
m_ObjectHideFlags: 0
@ -10622,6 +11272,80 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 999999
--- !u!1 &8412869008248925191
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7295545614476179048}
- component: {fileID: 5308895418694287527}
- component: {fileID: 9093972133929537377}
m_Layer: 5
m_Name: starPre (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7295545614476179048
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8412869008248925191}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.0004802, y: 1.0004802, z: 1}
m_Children: []
m_Father: {fileID: 1468911190892258987}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 25, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5308895418694287527
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8412869008248925191}
m_CullTransparentMesh: 0
--- !u!114 &9093972133929537377
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8412869008248925191}
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: 2fc66648425db004b8bc96f72e5188be, 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 &8547117727421135574
GameObject:
m_ObjectHideFlags: 0
@ -10855,6 +11579,154 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u653B\u51FB\u529B\uFF1A"
LanguageIndex: 10710
--- !u!1 &9067874593442608422
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2690273579411082698}
- component: {fileID: 6378110538820440333}
- component: {fileID: 532379423277231544}
m_Layer: 5
m_Name: starPre (5)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2690273579411082698
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9067874593442608422}
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: 1826272153389452366}
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: 201.92, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6378110538820440333
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9067874593442608422}
m_CullTransparentMesh: 0
--- !u!114 &532379423277231544
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9067874593442608422}
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: 2fc66648425db004b8bc96f72e5188be, 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 &9136536806095611223
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 598960275740256669}
- component: {fileID: 2558532194180060291}
- component: {fileID: 7152155318977388330}
m_Layer: 5
m_Name: starPre (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &598960275740256669
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9136536806095611223}
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: 1468911190892258987}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 69.229996, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2558532194180060291
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9136536806095611223}
m_CullTransparentMesh: 0
--- !u!114 &7152155318977388330
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9136536806095611223}
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: 2fc66648425db004b8bc96f72e5188be, 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 &9218122449304559234
GameObject:
m_ObjectHideFlags: 0

View File

@ -1517,8 +1517,10 @@ end
function this.GetAllHeroTeamAddProVal(teamHeroInfos,curteamHeroDid)
local teamProVal = {}
--英雄 法宝 魂印 被动技能
local heroAllNum = 0
for i = 1, 6 do
if teamHeroInfos[i] then
heroAllNum = heroAllNum + 1
local heroSkillSingleHeroProVal, heroSkillLvProVal, heroSkillAllHeroProVal, heroSkillSpecialProVal =
CalculateHeroPassiveSkillProAddVal(1, teamHeroInfos[i].heroId,nil,nil, curteamHeroDid and HeroManager.GetSingleHeroData(curteamHeroDid).heroConfig.PropertyName or nil)
local falismanSingleHeroProVal, falismanLvProVal, falismanAllHeroProVal, falismanSpecialProVal =
@ -1529,6 +1531,12 @@ function this.GetAllHeroTeamAddProVal(teamHeroInfos,curteamHeroDid)
this.DoubleTableCompound(teamProVal,soulPrinAllHeroProVal)
end
end
--灵兽编队加成
local pokemonFormationAllHeroProVal = PokemonManager.GetPokemonFormationTeamAddPro(heroAllNum)
for key, value in pairs(pokemonFormationAllHeroProVal) do
LogPink("灵兽编队加成 "..value)
end
this.DoubleTableCompound(teamProVal, pokemonFormationAllHeroProVal)
--光环加成
local aureoleProAdd = FormationManager.GetCurFormationElementAdd(teamHeroInfos)
this.DoubleTableCompound(teamProVal, aureoleProAdd)
@ -1698,6 +1706,9 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
--灵兽羁绊
local pokemonFetterAddPro = PokemonManager.GetAllPokemonFetterAddPros()
--灵兽羁绊单加战力 暂时去掉
-- local allPokemonFetterAddWarPowerVal = PokemonManager.GetAllPokemonFetterAddProsSWarPower()--allSoulPrintAddWarPowerVal--
-- LogError("灵兽羁绊加成静态战力 "..allPokemonFetterAddWarPowerVal)
--if pokemonFetterAddPro and LengthOfTable(pokemonFetterAddPro) > 0 then
-- for i, v in pairs(pokemonFetterAddPro) do
-- if v > 0 then
@ -1848,12 +1859,12 @@ curHeroData.MLSproList={}
--Log("allEquipScore "..allEquipScore)
--最后计算英雄战斗力
if _type == 1 then
--最后加魂印战力
--最后加魂印战力 加灵兽羁绊静态战力
allAddProVal[HeroProType.WarPower] =
allEquipScore + CalculateWarForce(allAddProVal) + allSoulPrintAddWarPowerVal
allEquipScore + CalculateWarForce(allAddProVal) + allSoulPrintAddWarPowerVal-- + allPokemonFetterAddWarPowerVal
elseif _type == 2 then
allAddProVal[HeroProType.WarPower] =
allEquipScore + CalculateWarForce(allAddProVal) + allSoulPrintAddWarPowerVal
allEquipScore + CalculateWarForce(allAddProVal) + allSoulPrintAddWarPowerVal-- + allPokemonFetterAddWarPowerVal
--最后加魂印战力
end
--for i, v in pairs(allAddProVal) do

View File

@ -15,13 +15,13 @@ function PokemonGetInfoPopup:InitComponent()
this.starGrid = Util.GetGameObject(self.transform, "bg/PokemonInfo/PokemonInfo")
--属性
for i = 1, 5 do
for i = 0, 4 do
proList[i] = Util.GetGameObject(self.transform,"bg/PokemonInfo/pro/singlePro ("..i..")")
end
self.skillName=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/nameText"):GetComponent("Text")
self.skillLv=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/skillImage/skillLv"):GetComponent("Text")
self.skillIcon=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/icon"):GetComponent("Image")
this.skillName=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/nameText"):GetComponent("Text")
this.skillLv=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/skillImage/skillLv"):GetComponent("Text")
this.skillIcon=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/icon"):GetComponent("Image")
end
local triggerCallBack
--绑定事件(用于子类重写)
@ -65,12 +65,26 @@ function this.GetShowPanelData()
SetHeroStars(this.starGrid, pokemonBackData.star,2,Vector2.New(60,60),-11.92,Vector2.New(0.5,0.5))
--属性
local allAddProVal=PokemonManager.GetSinglePokemonAddProData(pokemonBackData.id)
for i = 1, 5 do
Util.GetGameObject(proList[i].transform,"proName"):GetComponent("Text").text = ""
Util.GetGameObject(proList[i].transform,"proValue"):GetComponent("Text").text = ""
Util.GetGameObject(proList[i].transform,"Image"):GetComponent("Image").sprite =
Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,onePokemonSid).ResourceID))
proList[0]:SetActive(true)
Util.GetGameObject(proList[0].transform,"proName"):GetComponent("Text").text ="等级"
Util.GetGameObject(proList[0].transform,"proValue"):GetComponent("Text").text = pokemonBackData.level
Util.GetGameObject(proList[0].transform,"Image"):GetComponent("Image").sprite = Util.LoadSprite(PropertyTypeIconDef[1])
for i = 1, 4 do
Util.GetGameObject(proList[i].transform,"proName"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.PropertyConfig,i).Info
Util.GetGameObject(proList[i].transform,"proValue"):GetComponent("Text").text = allAddProVal[i]
Util.GetGameObject(proList[i].transform,"Image"):GetComponent("Image").sprite = Util.LoadSprite(PropertyTypeIconDef[i + 1])
end
local curSkillId = 0
local skillArray = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,pokemonBackData.tempId).SkillArray
for i = 1, #skillArray do
if skillArray[i][1] == pokemonBackData.star then
curSkillId = skillArray[i][2]
end
end
local curSkillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,curSkillId)
this.skillName.text = curSkillConFig.Name
this.skillLv.text = curSkillConFig.Id%10
this.skillIcon.sprite = Util.LoadSprite(GetResourcePath(curSkillConFig.Icon))
end
function this.NoGetShowPanelData()
local pokemonSData=ConfigManager.GetConfigData(ConfigName.SpiritAnimal, pokemonSid)
@ -79,11 +93,23 @@ function this.NoGetShowPanelData()
SetHeroStars(this.starGrid, 0,2,Vector2.New(60,60),-11.92)
--属性
local allAddProVal = PokemonManager.GetSinglePokemonAddProDataBySid(pokemonSid) --this.CalculateHeroAllProValList(heroSData,heroStar,heroStar ~= heroSData.Star)
for i = 1, 5 do
proList[0]:SetActive(false)
for i = 1, 4 do
Util.GetGameObject(proList[i].transform,"proName"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.PropertyConfig,i).Info
Util.GetGameObject(proList[i].transform,"proValue"):GetComponent("Text").text = allAddProVal[i]
Util.GetGameObject(proList[i].transform,"Image"):GetComponent("Image").sprite = Util.LoadSprite(PropertyTypeIconDef[i])
Util.GetGameObject(proList[i].transform,"Image"):GetComponent("Image").sprite = Util.LoadSprite(PropertyTypeIconDef[i + 1])
end
local curSkillId = 0
local skillArray = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,pokemonSid).SkillArray
for i = 1, #skillArray do
if skillArray[i][1] == 0 then
curSkillId = skillArray[i][2]
end
end
local curSkillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,curSkillId)
this.skillName.text = curSkillConFig.Name
this.skillLv.text = curSkillConFig.Id%10
this.skillIcon.sprite = Util.LoadSprite(GetResourcePath(curSkillConFig.Icon))
end
function this.ShowPokemonLive(_heroSConfigData)

View File

@ -154,6 +154,7 @@ function PokemonInfoPanel:BindEvent()
--休息 下阵
Util.AddClick(this.restBtn, function()
--下阵协议
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
local curFormation = PokemonManager.GetAllPokemonFormationData()
for i = 1, #curFormation do
if curFormation[i] and curFormation[i].pokemonId and curFormation[i].pokemonId == curPokemonData.dynamicId then
@ -161,9 +162,8 @@ function PokemonInfoPanel:BindEvent()
end
end
NetManager.ReplaceTeamPokemonInfoRequest(curFormation, function()
local oldWarPower = 0
PokemonManager.RefreshPokemonFormation(curFormation)
local newWarPower = 0
local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
--飘战力
PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower)
end)

View File

@ -103,7 +103,9 @@ function this.GetNoUpLvPokemonData(_id,_did)
end
--获取单个灵兽属性 (灵兽属性/编队人数 灵兽属性会平分给上阵的所有神将)
function this.GetSinglePokemonAddProData(_did,_star)--_star 传值的话就用此星级计算属性
LogPink("_did 1 ".._did)
if not pokemons[_did] then return end
LogPink("_did 2 ".._did)
local addAllProVal = {}
local curPokeonData = pokemons[_did]
local curPokemonConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,curPokeonData.id)
@ -240,7 +242,17 @@ function this.GetAllPokemonFetterAddPros()
end
return addAllProVal
end
----获取所有灵兽羁绊总和静态战力
function this.GetAllPokemonFetterAddProsSWarPower()
local addPowerVal = 0
for key, value in pairs(pokemonFetter) do
local curspiritAnimalBook = spiritAnimalBook[key]
if curspiritAnimalBook and curspiritAnimalBook.ActiveForce > 0 then
addPowerVal = addPowerVal + curspiritAnimalBook.ActiveForce
end
end
return addPowerVal
end
---------------------------------------------
--灵兽编队
@ -294,6 +306,18 @@ function this.GetPokemonFormationAddPro()
end
return allPro
end
--获取灵兽编队属性 在编队中的团队属性加成 除以英雄编队人数
function this.GetPokemonFormationTeamAddPro(heroFormationNum)
local allPro = this.GetPokemonFormationAddPro()
-- local formationHeros = FormationManager.GetWuJinFormationHeroIds(formationIndex)
-- local heroFormationNum = #formationHeros
for key, value in pairs(allPro) do
allPro[key] = math.floor(value/heroFormationNum)
end
return allPro
end
--刷新编队信息 type 1 上阵 2 下阵 3 替换(上阵)
function this.RefreshPokemonFormation(_pokemonFormation)
for i = 1, #pokemonFormation do
@ -308,8 +332,9 @@ end
function this.PiaoWarPowerChange(oldWarPower,newWarPower)
--飘战力
LogPink("oldWarPower ~= newWarPower "..oldWarPower.." "..newWarPower)
if oldWarPower ~= newWarPower then
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = newWarPower,pos=Vector3.New(-467,837.2),duration=0.7,isShowBg=false,isShowOldNum=false,pivot=Vector2.New(0,0.5)})
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = newWarPower})--,pos=Vector3.New(-467,837.2),duration=0.7,isShowBg=false,isShowOldNum=false,pivot=Vector2.New(0,0.5)})
end
end
return this

View File

@ -170,11 +170,14 @@ function this.ShowPokemonInfo()
end
--长按升级结束后请求协议
function this.LongLvUpClick(oldLv)
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
NetManager.UpPokemonLevelRequest(curPokemonData.dynamicId,curPokemonData.lv,oldLv,function (msg)
PokemonManager.UpdateSinglePokemonData(curPokemonData.dynamicId,msg.level,curPokemonData.star)
curPokemonData = PokemonManager.GetSinglePokemonData(curPokemonData.dynamicId)
this.ShowPokemonInfo()
_isReqLvUp = false
local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower)
end)
end
--升级按钮点击事件处理
@ -189,10 +192,13 @@ function this.LvUpClick(isSingleLvUp)
return
end
if isSingleLvUp then
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
NetManager.UpPokemonLevelRequest(curPokemonData.dynamicId,curPokemonData.lv + 1,curPokemonData.lv, function()
PokemonManager.UpdateSinglePokemonData(curPokemonData.dynamicId,curPokemonData.lv + 1,curPokemonData.star)
curPokemonData = PokemonManager.GetSinglePokemonData(curPokemonData.dynamicId)
this.ShowPokemonInfo()
local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower)
end)
else
--前端先扣除材料

View File

@ -112,7 +112,7 @@ function this.OnShowData()
upStarMaterialsPre[i]:SetActive(true)
local configMaterialId = upStarMaterialsData[i][1]
local configMaterialNum = upStarMaterialsData[i][2]
SubUIManager.Open(SubUIConfig.ItemView, itemParent.transform):OnOpen(false, {configMaterialId,0}, 0.97)
SubUIManager.Open(SubUIConfig.ItemView, itemParent.transform):OnOpen(false, {configMaterialId,0}, 1.3)
local curMaterialBagNum = 0
if i == 1 then--需要的灵兽
curUpStarSelectPokemonData = {}
@ -163,12 +163,15 @@ function this.StarUpClick()
PopupTipPanel.ShowTip(""..ConfigManager.GetConfigData(ConfigName.ItemConfig,isUpStarMaterials).Name.."】不足!")
return
end
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
NetManager.UpPokemonStarRequest(curPokemonData.dynamicId,curUpStarSelectPokemonData, function()
PokemonManager.UpdateSinglePokemonData(curPokemonData.dynamicId,curPokemonData.lv,curPokemonData.star + 1)
curPokemonData = PokemonManager.GetSinglePokemonData(curPokemonData.dynamicId)
this.DeleteUpStarMaterials()
UIManager.OpenPanel(UIName.PokemonUpStarSuccessPanel,curPokemonData)
this.OnShowData()
local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower)
end)
end

View File

@ -13,7 +13,7 @@ function this:InitComponent(gameObject)
this.ItemPre = Util.GetGameObject(gameObject, "PokemonListPanel_UpWar/ItemPre")
local v2 = Util.GetGameObject(gameObject, "PokemonListPanel_UpWar/ScrollParentView"):GetComponent("RectTransform").rect
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(gameObject, "PokemonListPanel_UpWar/ScrollParentView").transform,
this.ItemPre, nil, Vector2.New(-v2.x*2, -v2.y*2), 1, 1, Vector2.New(0,0))
this.ItemPre, nil, Vector2.New(-v2.x*2, -v2.y*2), 1, 1, Vector2.New(0,-12))
this.ScrollView.moveTween.MomentumAmount = 1
this.ScrollView.moveTween.Strength = 1
this.NoneImage = Util.GetGameObject(gameObject, "PokemonListPanel_UpWar/NoneImage")
@ -78,7 +78,7 @@ function this.SingleItemDataShow(_go,_itemData)
Util.AddOnceClick(Util.GetGameObject(_go.transform,"upZhen"), function()
if curUpZhenPokemonData then
--替换 协议
local oldWarPower = 0
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
local pos = 0
local allPokemonFormation = PokemonManager.GetAllPokemonFormationData()
for i = 1, #allPokemonFormation do
@ -90,7 +90,7 @@ function this.SingleItemDataShow(_go,_itemData)
if pos > 0 then
NetManager.ReplaceTeamPokemonInfoRequest(allPokemonFormation, function()
PokemonManager.RefreshPokemonFormation(allPokemonFormation)
local newWarPower = 0
local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower)
parent:ClosePanel()
Game.GlobalEvent:DispatchEvent(GameEvent.Pokemon.PokemonUpZhenRefresh)
@ -98,6 +98,7 @@ function this.SingleItemDataShow(_go,_itemData)
end
else
--上阵 协议
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
local curFormation = PokemonManager.GetAllPokemonFormationData()
LogPink("#curFormation "..#curFormation)
for i = 1, #curFormation do
@ -109,11 +110,10 @@ function this.SingleItemDataShow(_go,_itemData)
NetManager.ReplaceTeamPokemonInfoRequest(curFormation, function()
local oldWarPower = 0
if upZhenIndex then
PokemonManager.RefreshPokemonFormation(curFormation)
end
local newWarPower = 0
local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
--飘战力
PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower)
parent:ClosePanel()

View File

@ -448,6 +448,11 @@ function this.SetItemData2(itemdata)
--SoulPrintManager.InitMapShotTimeSoulPrintBagData(itemdata.backData)
--SoulPrintManager.StoreData(itemdata.data)
end
elseif itemdata.itemType==6 then
if bagType==1 then
PokemonManager.UpdatePokemonDatas(itemdata.backData,true)
elseif bagType==2 then
end
end
end
--关卡通关掉落时展示经验等级信息

View File

@ -73,6 +73,7 @@ function this:OnClose()
end
function this:OnDestroy()
itemViewPre = nil
end

View File

@ -34,6 +34,7 @@ function WarPowerChangeNotifyPanelV2:InitComponent()
end
function WarPowerChangeNotifyPanelV2:OnOpen(_context)
LogPink("ssssssssssssssssssssssssssssss")
self.countNumber = self.countNumber + 1
content=_context
--table.insert(self.cacheData, context)