gm 测试战斗添加设置皮肤

dev_chengFeng
wangzhenxing 2020-11-09 10:12:45 +09:00 committed by gaoxin
parent bd083a67a3
commit 70e019f837
3 changed files with 582 additions and 115 deletions

View File

@ -10206,6 +10206,8 @@ RectTransform:
- {fileID: 823593164}
- {fileID: 292092326}
- {fileID: 3157915663087155780}
- {fileID: 868813968902179573}
- {fileID: 4252225391505248124}
m_Father: {fileID: 536587889}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -15586,6 +15588,164 @@ RectTransform:
m_AnchoredPosition: {x: 50, y: 350}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1233415055985094673
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4948532750476380368}
- component: {fileID: 1272419744300219800}
- component: {fileID: 3565269803375206792}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4948532750476380368
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1233415055985094673}
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: 1861140687639850109}
m_RootOrder: 1
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: -0.5}
m_SizeDelta: {x: -20, y: -13}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1272419744300219800
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1233415055985094673}
m_CullTransparentMesh: 0
--- !u!114 &3565269803375206792
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1233415055985094673}
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.19607843, g: 0.19607843, b: 0.19607843, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!1 &1355655976667688470
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4252225391505248124}
- component: {fileID: 5611170720988294329}
- component: {fileID: 3655161880957599129}
m_Layer: 5
m_Name: hint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4252225391505248124
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1355655976667688470}
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: 1583022895}
m_RootOrder: 9
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: -280, y: 325.8}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5611170720988294329
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1355655976667688470}
m_CullTransparentMesh: 0
--- !u!114 &3655161880957599129
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1355655976667688470}
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.990566, g: 0.9672036, b: 0.9672036, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u8F93\u5165heroskin\u8868Type\u6570\u636E"
--- !u!1 &1368500287807936088
GameObject:
m_ObjectHideFlags: 0
@ -32757,6 +32917,86 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2452977598648775497
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 868813968902179573}
- component: {fileID: 8026452955403677681}
- component: {fileID: 2621775410146051267}
m_Layer: 5
m_Name: skin
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &868813968902179573
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2452977598648775497}
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: 1861140687639850109}
m_Father: {fileID: 1583022895}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -403.00003, y: 277}
m_SizeDelta: {x: 160, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8026452955403677681
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2452977598648775497}
m_CullTransparentMesh: 0
--- !u!114 &2621775410146051267
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2452977598648775497}
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: 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_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 50
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u76AE\u80A4"
--- !u!1 &2456885388764567530
GameObject:
m_ObjectHideFlags: 0
@ -33687,6 +33927,147 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &3462744982913778208
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1861140687639850109}
- component: {fileID: 8836652562652779353}
- component: {fileID: 5861170029619772933}
- component: {fileID: 7326204574972838857}
m_Layer: 5
m_Name: input
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1861140687639850109
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3462744982913778208}
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: 5828187794972194677}
- {fileID: 4948532750476380368}
m_Father: {fileID: 868813968902179573}
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: 229.9, y: 0}
m_SizeDelta: {x: 288.5, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8836652562652779353
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3462744982913778208}
m_CullTransparentMesh: 0
--- !u!114 &5861170029619772933
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3462744982913778208}
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: 10911, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &7326204574972838857
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3462744982913778208}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 575553740, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 5861170029619772933}
m_TextComponent: {fileID: 3565269803375206792}
m_Placeholder: {fileID: 3481995836206002083}
m_ContentType: 0
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
m_LineType: 0
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
m_OnEndEdit:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.InputField+OnChangeEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_CustomCaretColor: 0
m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
m_Text:
m_CaretBlinkRate: 0.85
m_CaretWidth: 1
m_ReadOnly: 0
--- !u!1 &3485517241287694147
GameObject:
m_ObjectHideFlags: 0
@ -36689,6 +37070,85 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &5935607984107363995
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5828187794972194677}
- component: {fileID: 991988841376371325}
- component: {fileID: 3481995836206002083}
m_Layer: 5
m_Name: Placeholder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5828187794972194677
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5935607984107363995}
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: 1861140687639850109}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.5}
m_SizeDelta: {x: -20, y: -13}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &991988841376371325
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5935607984107363995}
m_CullTransparentMesh: 0
--- !u!114 &3481995836206002083
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5935607984107363995}
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.19607843, g: 0.19607843, b: 0.19607843, a: 0.5}
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: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 40
m_FontStyle: 2
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
--- !u!1 &6081852504775427230
GameObject:
m_ObjectHideFlags: 0
@ -40096,6 +40556,26 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -6487318030585684567, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
propertyPath: tweenSequeue.Array.data[0].targetObj
value:
objectReference: {fileID: 4129064124762269953}
- target: {fileID: -6487318030585684567, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
propertyPath: tweenSequeue.Array.data[1].targetObj
value:
objectReference: {fileID: 505481942630251435}
- target: {fileID: 2566837489994421799, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
propertyPath: bgList.Array.data[0]
value:
objectReference: {fileID: 5081784950964498227}
- target: {fileID: 144333933674822358, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1048028496800183147, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
propertyPath: tweenSequeue.Array.data[0].targetObj
@ -40156,26 +40636,6 @@ PrefabInstance:
propertyPath: tweenSequeue.Array.data[11].targetObj
value:
objectReference: {fileID: 6877802733299079670}
- target: {fileID: -6487318030585684567, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
propertyPath: tweenSequeue.Array.data[0].targetObj
value:
objectReference: {fileID: 4129064124762269953}
- target: {fileID: -6487318030585684567, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
propertyPath: tweenSequeue.Array.data[1].targetObj
value:
objectReference: {fileID: 505481942630251435}
- target: {fileID: 2566837489994421799, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
propertyPath: bgList.Array.data[0]
value:
objectReference: {fileID: 5081784950964498227}
- target: {fileID: 144333933674822358, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1089584654, guid: 033555e17bce00144bd07cb89f96eeee, type: 3}
propertyPath: tweenSequeue.Array.data[0].targetObj
value:
@ -40232,66 +40692,6 @@ PrefabInstance:
objectReference: {fileID: 6312300445513884430}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 033555e17bce00144bd07cb89f96eeee, type: 3}
--- !u!224 &555307947776181567 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: -4381370023651553062, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!224 &4129064124762269953 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 9064487652359765220, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!114 &584845731430101409 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5520054798291412036, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &4937887547557597456 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1517028597, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!224 &505481942630251435 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4865351776209694286, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!114 &7839912598430078695 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: -6320221020064447742, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &4442105955692558202 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8728927548142084767, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1221853641445313121 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: -3138441702078980220, guid: 033555e17bce00144bd07cb89f96eeee,
@ -40304,27 +40704,9 @@ MonoBehaviour:
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &4937887546737047830 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1787096307, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!224 &4937887546167997099 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 213509966, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!224 &6877802733299079670 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2014300538817104915, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!114 &6312300445513884430 stripped
--- !u!114 &7839912598430078695 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1377869764117395179, guid: 033555e17bce00144bd07cb89f96eeee,
m_CorrespondingSourceObject: {fileID: -6320221020064447742, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
@ -40334,27 +40716,27 @@ MonoBehaviour:
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &1956309828548242706 stripped
--- !u!224 &505481942630251435 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6890740402721913079, guid: 033555e17bce00144bd07cb89f96eeee,
m_CorrespondingSourceObject: {fileID: 4865351776209694286, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!224 &4937887546756377638 stripped
--- !u!224 &4937887546737047830 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1806694851, guid: 033555e17bce00144bd07cb89f96eeee,
m_CorrespondingSourceObject: {fileID: 1787096307, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5081784950964498227 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 144333933674822358, guid: 033555e17bce00144bd07cb89f96eeee,
--- !u!224 &4937887547038943933 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2022055768, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!224 &4937887546623915046 stripped
--- !u!224 &6877802733299079670 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1673863619, guid: 033555e17bce00144bd07cb89f96eeee,
m_CorrespondingSourceObject: {fileID: 2014300538817104915, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
@ -40364,6 +40746,12 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!224 &1956309828548242706 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6890740402721913079, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!224 &6567648645582726314 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2279418630260814159, guid: 033555e17bce00144bd07cb89f96eeee,
@ -40394,9 +40782,81 @@ MonoBehaviour:
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &4937887547038943933 stripped
--- !u!224 &4937887546623915046 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2022055768, guid: 033555e17bce00144bd07cb89f96eeee,
m_CorrespondingSourceObject: {fileID: 1673863619, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!224 &4937887547557597456 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1517028597, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!224 &4937887546167997099 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 213509966, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!224 &555307947776181567 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: -4381370023651553062, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5081784950964498227 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 144333933674822358, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!114 &4442105955692558202 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8728927548142084767, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &4129064124762269953 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 9064487652359765220, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!114 &584845731430101409 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5520054798291412036, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &4937887546756377638 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1806694851, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
--- !u!114 &6312300445513884430 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1377869764117395179, guid: 033555e17bce00144bd07cb89f96eeee,
type: 3}
m_PrefabInstance: {fileID: 4937887546107680229}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:

View File

@ -305,6 +305,8 @@ function this.RefreshFightData(type)
data.professionId = roleData.Profession
data.quality = roleData.Quality
data.star = 10
data.skinId=role.skinId
LogError("skinId==="..role.skinId)
data.type = 1
local paskill = string.split(role.passivity, "#")
data.passivity = BattleManager.GetPassivityData(paskill) or {}
@ -312,7 +314,7 @@ function this.RefreshFightData(type)
for pi = 1, 25 do
data.property[pi] = role.props[pi] or 0
end
data.skill = BattleManager.GetSkillData(role.skill) or {}
data.skill = BattleManager.GetSkillData(role.skill,role.skinId) or {}
data.superSkill = BattleManager.GetSkillData(role.superSkill) or {}
-- 添加角色数据
this.AddRoleData(data)

View File

@ -10,6 +10,8 @@ function RoleSetView:Init(root)
self.roleId = Util.GetGameObject(root, "roleId/input"):GetComponent("InputField")
self.passivity = Util.GetGameObject(root, "passivity/input"):GetComponent("InputField")
self.skill = Util.GetGameObject(root, "skill/input"):GetComponent("InputField")
self.skin = Util.GetGameObject(root, "skin/input"):GetComponent("InputField")
self.skin.text="0"
self.superSkill = Util.GetGameObject(root, "superSkill/input"):GetComponent("InputField")
self.props = Util.GetGameObject(root, "props")
@ -53,13 +55,14 @@ function RoleSetView:LoadFromConfig()
local passivity = config.PassiveSkillList and table.concat(config.PassiveSkillList, "#") or ""
local skill = config.SkillList[1] or ""
local superSkill = config.SkillList[2] or ""
local skinId=tonumber(self.skin.text)
self.localData = {
monsterId,
config.MonsterId, -- roleId
passivity,
skill,
superSkill,
skinId,
config.Level,
config.Hp,
config.Hp,
@ -83,6 +86,7 @@ function RoleSetView:LoadFromConfig()
self.passivity.text = self:GetLocalData(3)
self.skill.text = self:GetLocalData(4)
self.superSkill.text = self:GetLocalData(5)
self.skin.text="0"
for propIndex, prop in ipairs(self.propList) do
prop.text = self:GetLocalData(propIndex + 5)
end
@ -103,7 +107,6 @@ function RoleSetView:saveToLocal()
str = str .. "|"..(self.data.passivity or "")
str = str .. "|"..(self.data.skill or "")
str = str .. "|"..(self.data.superSkill or "")
for propIndex, prop in ipairs(self.data.props) do
str = str .. "|"..(prop or "")
end
@ -118,7 +121,7 @@ function RoleSetView:GetLocalData(index)
"", -- 被动
1011, -- 普技
1012, -- 特殊
0, --皮肤
100, -- 等级
100000, -- hp
100000, -- maxhp
@ -157,6 +160,7 @@ function RoleSetView:Show(camp, pos, data, func)
self.passivity.text = data.passivity or self:GetLocalData(3)
self.skill.text = data.skill or self:GetLocalData(4)
self.superSkill.text = data.superSkill or self:GetLocalData(5)
self.skin.text=data.skinId or 0
for propIndex, prop in ipairs(self.propList) do
prop.text = data.props[propIndex] or self:GetLocalData(propIndex + 5)
end
@ -169,6 +173,7 @@ function RoleSetView:ApplyData()
self.data.passivity = self.passivity.text
self.data.skill = tonumber(self.skill.text)
self.data.superSkill = tonumber(self.superSkill.text)
self.data.skinId=tonumber(self.skin.text)
for propIndex, prop in ipairs(self.propList) do
local value = prop.text == "" and 0 or tonumber(prop.text)
self.data.props[propIndex] = tonumber(value)