Merge branch 'game' of http://127.0.0.1:3000/fatiao/ro-webgl into game
This commit is contained in:
commit
009aec5a26
@ -91,10 +91,10 @@ RectTransform:
|
||||
- {fileID: 3355045564119416944}
|
||||
m_Father: {fileID: 3355045564741082464}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -280, y: -20}
|
||||
m_SizeDelta: {x: 510, y: 160}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 290}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &3355045563742763626
|
||||
MonoBehaviour:
|
||||
@ -113,8 +113,8 @@ MonoBehaviour:
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 10
|
||||
m_ChildAlignment: 7
|
||||
m_Spacing: 80
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
@ -392,7 +392,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &3355045564822916621
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -588,7 +588,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &3355045565117353325
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -812,6 +812,11 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: BattleTime
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 554392712098037060, guid: 2e62841493918ae48a4e4521740aa9dd,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
@ -936,6 +941,16 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 3355045563564552987}
|
||||
m_Modifications:
|
||||
- target: {fileID: 421872729371089588, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 421872729371089588, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1051115823982349548, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: depObjs.Array.data[0]
|
||||
@ -1066,6 +1081,16 @@ PrefabInstance:
|
||||
propertyPath: m_HorizontalAlignment
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2620956778736910042, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2620956778736910042, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8043164457427414739, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
@ -1090,6 +1115,16 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 3355045564119416944}
|
||||
m_Modifications:
|
||||
- target: {fileID: 421872729371089588, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 421872729371089588, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1051115823982349548, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: depObjs.Array.data[0]
|
||||
@ -1220,6 +1255,16 @@ PrefabInstance:
|
||||
propertyPath: m_HorizontalAlignment
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2620956778736910042, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2620956778736910042, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8043164457427414739, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
@ -1244,6 +1289,16 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 3355045565446995986}
|
||||
m_Modifications:
|
||||
- target: {fileID: 421872729371089588, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 421872729371089588, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1051115823982349548, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: depObjs.Array.data[0]
|
||||
@ -1374,6 +1429,16 @@ PrefabInstance:
|
||||
propertyPath: m_HorizontalAlignment
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2620956778736910042, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2620956778736910042, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8043164457427414739, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
@ -1398,6 +1463,16 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 3355045564472010215}
|
||||
m_Modifications:
|
||||
- target: {fileID: 421872729371089588, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 421872729371089588, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1051115823982349548, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: depObjs.Array.data[0]
|
||||
@ -1528,6 +1603,16 @@ PrefabInstance:
|
||||
propertyPath: m_HorizontalAlignment
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2620956778736910042, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2620956778736910042, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8043164457427414739, guid: 016f6c10df53cb24e8f0e7e81b8afcd4,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
|
||||
@ -1876,10 +1876,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6439693826171470085}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 60, y: 60}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &78984252923001945
|
||||
CanvasRenderer:
|
||||
@ -3870,10 +3870,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1521075458964391978}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 60, y: 60}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7867971644339496928
|
||||
CanvasRenderer:
|
||||
@ -4066,10 +4066,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5807207042552167384}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 60, y: 60}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6487090189725054545
|
||||
CanvasRenderer:
|
||||
@ -5705,10 +5705,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2287615686351435112}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 60, y: 60}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7651469012647359013
|
||||
CanvasRenderer:
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,316 +1,322 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &3016158187586197544
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5248686921407379108}
|
||||
- component: {fileID: 8044487090562287277}
|
||||
m_Layer: 5
|
||||
m_Name: TopView
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5248686921407379108
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3016158187586197544}
|
||||
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: 5418892521828950389}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 240}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &8044487090562287277
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3016158187586197544}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &5418892521828950385
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5418892521828950389}
|
||||
- component: {fileID: 5418892521828950390}
|
||||
- component: {fileID: 1431389795426265943}
|
||||
- component: {fileID: 3419162533176449020}
|
||||
m_Layer: 5
|
||||
m_Name: UIDojoBattle
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5418892521828950389
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5418892521828950385}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_Children:
|
||||
- {fileID: 5248686921407379108}
|
||||
- {fileID: 5551253224151222508}
|
||||
- {fileID: 5400844451299349257}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
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, y: 0}
|
||||
--- !u!223 &5418892521828950390
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5418892521828950385}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 1
|
||||
m_Camera: {fileID: 0}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_AdditionalShaderChannelsFlag: 25
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!114 &1431389795426265943
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5418892521828950385}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!114 &3419162533176449020
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5418892521828950385}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 149dc709694e27c4e824a959fffb987e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_LeftSafe: 0
|
||||
m_RightSafe: 0
|
||||
m_UpSafe: 1
|
||||
m_BottomSafe: 1
|
||||
autoHideTrans: []
|
||||
--- !u!1 &7319900223047683566
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5551253224151222508}
|
||||
- component: {fileID: 7690160057508697444}
|
||||
m_Layer: 5
|
||||
m_Name: BottomView
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5551253224151222508
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7319900223047683566}
|
||||
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: 5418892521828950389}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 240}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!222 &7690160057508697444
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7319900223047683566}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1001 &8157093890156299876
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 5418892521828950389}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4305571832591865196, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: RagePvp
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865196, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 5f84c6794d73d6b41971423bec391b05, type: 3}
|
||||
--- !u!224 &5400844451299349257 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 8157093890156299876}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &3016158187586197544
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5248686921407379108}
|
||||
- component: {fileID: 8044487090562287277}
|
||||
m_Layer: 5
|
||||
m_Name: TopView
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5248686921407379108
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3016158187586197544}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5418892521828950389}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 240}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &8044487090562287277
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3016158187586197544}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &5418892521828950385
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5418892521828950389}
|
||||
- component: {fileID: 5418892521828950390}
|
||||
- component: {fileID: 1431389795426265943}
|
||||
- component: {fileID: 3419162533176449020}
|
||||
m_Layer: 5
|
||||
m_Name: UIDojoBattle
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5418892521828950389
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5418892521828950385}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 5248686921407379108}
|
||||
- {fileID: 5551253224151222508}
|
||||
- {fileID: 5400844451299349257}
|
||||
m_Father: {fileID: 0}
|
||||
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, y: 0}
|
||||
--- !u!223 &5418892521828950390
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5418892521828950385}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 1
|
||||
m_Camera: {fileID: 0}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_VertexColorAlwaysGammaSpace: 0
|
||||
m_AdditionalShaderChannelsFlag: 25
|
||||
m_UpdateRectTransformForStandalone: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!114 &1431389795426265943
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5418892521828950385}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!114 &3419162533176449020
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5418892521828950385}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 149dc709694e27c4e824a959fffb987e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_LeftSafe: 0
|
||||
m_RightSafe: 0
|
||||
m_UpSafe: 1
|
||||
m_BottomSafe: 1
|
||||
autoHideTrans: []
|
||||
--- !u!1 &7319900223047683566
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5551253224151222508}
|
||||
- component: {fileID: 7690160057508697444}
|
||||
m_Layer: 5
|
||||
m_Name: BottomView
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5551253224151222508
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7319900223047683566}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5418892521828950389}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 240}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!222 &7690160057508697444
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7319900223047683566}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1001 &8157093890156299876
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 5418892521828950389}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4305571832591865196, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: RagePvp
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865196, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 5f84c6794d73d6b41971423bec391b05, type: 3}
|
||||
--- !u!224 &5400844451299349257 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4305571832591865197, guid: 5f84c6794d73d6b41971423bec391b05,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 8157093890156299876}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,11 +1,9 @@
|
||||
local BattleEnemyPart = class("BattleEnemyPart")
|
||||
|
||||
function BattleEnemyPart:ctor()
|
||||
end
|
||||
--#region 生命周期
|
||||
|
||||
function BattleEnemyPart:ctor()
|
||||
|
||||
function BattleEnemyPart:InitGo(host,uiGo)
|
||||
self.host = host
|
||||
self.viewLua = CommonUtil.BindGridViewItem2Lua(self.host, "BattleEnemy", uiGo)
|
||||
end
|
||||
|
||||
function BattleEnemyPart:AddEventListener()
|
||||
@ -21,6 +19,37 @@ end
|
||||
function BattleEnemyPart:AddUIEventListener()
|
||||
end
|
||||
|
||||
|
||||
function BattleEnemyPart:Hide()
|
||||
self:RemoveEventListener()
|
||||
self.viewLua:SetActive(false)
|
||||
self:HidePlayerNodes()
|
||||
self:Clear()
|
||||
end
|
||||
|
||||
function BattleEnemyPart:Clear()
|
||||
self.enemyMembers = nil
|
||||
self.actorHeadMapping = nil
|
||||
self:DisposeLeftTimer()
|
||||
end
|
||||
|
||||
function BattleEnemyPart:Dispose()
|
||||
self:Clear()
|
||||
self.host = nil
|
||||
self.viewLua = nil
|
||||
end
|
||||
|
||||
--#endregion 生命周期
|
||||
|
||||
|
||||
|
||||
function BattleEnemyPart:InitGo(host,uiGo)
|
||||
self.host = host
|
||||
self.viewLua = CommonUtil.BindGridViewItem2Lua(self.host, "BattleEnemy", uiGo)
|
||||
end
|
||||
|
||||
|
||||
|
||||
function BattleEnemyPart:Show(enemyName,members, isLeftTime, totalTime)
|
||||
self.enemyName = enemyName
|
||||
self.enemyMembers = members
|
||||
@ -29,8 +58,12 @@ function BattleEnemyPart:Show(enemyName,members, isLeftTime, totalTime)
|
||||
self.actorHeadMapping = {}
|
||||
|
||||
for i =1, #self.enemyMembers do
|
||||
|
||||
|
||||
local actor = self.enemyMembers[i]
|
||||
LogWarning("tzy_enemyhead_ "..Inspect(actor))
|
||||
local go = self:GetHeadGo(i)
|
||||
go.gameObject:SetActive(true)
|
||||
self.actorHeadMapping[tostring(actor.ID)] = go
|
||||
self:SetPlayerData(actor.ID,go.headBoxItemNew,self.enemyMembers[i])
|
||||
end
|
||||
@ -57,17 +90,13 @@ end
|
||||
function BattleEnemyPart:HidePlayerNodes()
|
||||
for i =1, 4 do
|
||||
local go = self:GetHeadGo(i)
|
||||
go.gameObject:SetActive(false)
|
||||
go.headBoxItemNew:SetActive(false)
|
||||
go.headBoxItemNew.headItem.head.button.interactable = false
|
||||
end
|
||||
end
|
||||
|
||||
function BattleEnemyPart:Hide()
|
||||
self:RemoveEventListener()
|
||||
self.viewLua:SetActive(false)
|
||||
self:HidePlayerNodes()
|
||||
self:Clear()
|
||||
end
|
||||
|
||||
|
||||
function BattleEnemyPart:SetPlayerData(uid,playerNode,actorData)
|
||||
CommonUtil.SetPlayerHeadAndFrame(self.host,playerNode.headItem,actorData,true,actorData.HeadFrameId)
|
||||
@ -75,6 +104,33 @@ function BattleEnemyPart:SetPlayerData(uid,playerNode,actorData)
|
||||
self:RefreshFighterSp(uid,actorData.Sp,actorData.Sp)
|
||||
playerNode.deadNode:SetActive(false)
|
||||
playerNode:SetActive(true)
|
||||
|
||||
|
||||
|
||||
--名称
|
||||
playerNode.go_none_selected.text_name.text.text = actorData.Name
|
||||
|
||||
--头像
|
||||
local idx = tonumber(tostring(actorData.ID))
|
||||
LogWarning("tzy_enemy_actorData.ID = " .."uid "..tostring(uid).." id "..idx)
|
||||
--region 设置Avatar
|
||||
local headpath = "HeroDraw/Role_" .. idx
|
||||
|
||||
local go_none_selected = playerNode.go_none_selected.img_head
|
||||
local go_selected = playerNode.go_selected.img_head
|
||||
|
||||
self:SetHeadsImg(go_none_selected, headpath, idx)
|
||||
self:SetHeadsImg(go_selected, headpath, idx)
|
||||
end
|
||||
|
||||
function BattleEnemyPart:SetHeadsImg(go, path, idx)
|
||||
CommonUtil.LoadIcon(self, path, function(sprite)
|
||||
go.image.sprite = sprite
|
||||
go.image:SetNativeSize()
|
||||
end)
|
||||
|
||||
local imgpos = go.gameObject:GetComponent(Enum.TypeInfo.RectTransform)
|
||||
imgpos.anchoredPosition = CommonUtil.GetRole_Illustration_Info(idx)
|
||||
end
|
||||
|
||||
function BattleEnemyPart:RefreshFighterLife(actorId,life,maxLife)
|
||||
@ -156,16 +212,6 @@ function BattleEnemyPart:ShowLeftTime(time)
|
||||
end
|
||||
end
|
||||
|
||||
function BattleEnemyPart:Clear()
|
||||
self.enemyMembers = nil
|
||||
self.actorHeadMapping = nil
|
||||
self:DisposeLeftTimer()
|
||||
end
|
||||
|
||||
function BattleEnemyPart:Dispose()
|
||||
self:Clear()
|
||||
self.host = nil
|
||||
self.viewLua = nil
|
||||
end
|
||||
|
||||
return BattleEnemyPart
|
||||
|
||||
@ -54,6 +54,7 @@ function BattleHeadsBoxPart:Show()
|
||||
self.actorHeadMapping[tostring(actor.ID)] = go
|
||||
self.actorBuffs[tostring(actor.ID)] = {}
|
||||
go.headPosItem:SetActive(false)
|
||||
go.gameObject:SetActive(true)
|
||||
self:SetPlayerData(actor.ID, go.headBoxItemNew, actor)
|
||||
if i == 1 then
|
||||
self:ShowCurrentSelectPlayerData(actor.ID)
|
||||
@ -227,6 +228,7 @@ end
|
||||
function BattleHeadsBoxPart:HidePlayerNodes()
|
||||
for i = 1, 4 do
|
||||
local go = self:GetHeadGo(i)
|
||||
go.gameObject:SetActive(false)
|
||||
go.headPosItem:SetActive(true)
|
||||
go.headBoxItemNew:SetActive(false)
|
||||
go.headBoxItemNew.headItem.head.button.interactable = false
|
||||
@ -249,11 +251,22 @@ function BattleHeadsBoxPart:SetPlayerData(actorId, playerNode, actorData)
|
||||
playerNode.headItem.head.button.interactable = true
|
||||
self.host.uiBase:AddButtonUniqueEventListener(playerNode.headItem.head.button, self, self.OnClickPlayer, uid)
|
||||
|
||||
--新增
|
||||
--名称
|
||||
playerNode.go_none_selected.text_name.text.text = actorData.Name
|
||||
|
||||
--头像
|
||||
local idx = tonumber(tostring(actorData.ID))
|
||||
LogError("actorData.ID = " .. tonumber(tostring(actorData.ID)))
|
||||
--region 设置Avatar
|
||||
local headpath = "HeroDraw/Role_" .. idx
|
||||
|
||||
local go_none_selected = playerNode.go_none_selected.img_head
|
||||
local go_selected = playerNode.go_selected.img_head
|
||||
|
||||
self:SetHeadsImg(go_none_selected, headpath, idx)
|
||||
self:SetHeadsImg(go_selected, headpath, idx)
|
||||
|
||||
--[[
|
||||
local cfgData = CommonUtil.GetHeroCfgDataByUid(tonumber(tostring(actorData.ID)))
|
||||
CommonUtil.LoadIcon(self.host, cfgData.Avatar, function(sprite)
|
||||
playerNode.go_none_selected.img_head.image.sprite = sprite
|
||||
@ -261,6 +274,8 @@ function BattleHeadsBoxPart:SetPlayerData(actorId, playerNode, actorData)
|
||||
playerNode.go_selected.img_head.image.sprite = sprite
|
||||
playerNode.go_selected.img_head.image:SetNativeSize()
|
||||
end)
|
||||
]]
|
||||
|
||||
--[[
|
||||
2个不同来源的立绘加载方式
|
||||
|
||||
@ -287,6 +302,17 @@ function BattleHeadsBoxPart:SetPlayerData(actorId, playerNode, actorData)
|
||||
--self.host.uiBase:AddButtonUniqueEventListener(playerNode.go_selected.btn_ChageState.button, self, self.OnClickPlayer, uid)
|
||||
end
|
||||
|
||||
function BattleHeadsBoxPart:SetHeadsImg(go, path,idx)
|
||||
CommonUtil.LoadIcon(self, path, function(sprite)
|
||||
go.image.sprite = sprite
|
||||
go.image:SetNativeSize()
|
||||
end)
|
||||
|
||||
local imgpos = go.gameObject:GetComponent(Enum.TypeInfo.RectTransform)
|
||||
imgpos.anchoredPosition=CommonUtil.GetRole_Illustration_Info(idx)
|
||||
|
||||
end
|
||||
|
||||
--更新hp
|
||||
function BattleHeadsBoxPart:RefreshFighterLife(actorId, life, maxLife)
|
||||
local headGo = self:GetActorHeadGo(actorId)
|
||||
@ -494,7 +520,6 @@ function BattleHeadsBoxPart:OnRefreshCastSkill(skillParam)
|
||||
|
||||
-- 打印技能释放信息
|
||||
--LogWarning(" 角色 " .. actorName .. " 释放了 技能: " .. skillName .. " 技能id" ..skillId2.. " str:"..skillName2)
|
||||
|
||||
else
|
||||
LogWarning("收到技能释放事件,但参数为空")
|
||||
end
|
||||
@ -520,7 +545,7 @@ function BattleHeadsBoxPart:ShowSkillName(actorId, skillCfg)
|
||||
-- 使用Sequence创建动画序列
|
||||
local seq = DG.Tweening.DOTween.Sequence()
|
||||
:Append(cg:DOFade(1, 0.3):SetEase(DG.Tweening.Ease.InOutSine)) -- 淡入
|
||||
:AppendInterval(0.5) -- 保持显示1秒
|
||||
:AppendInterval(0.5) -- 保持显示1秒
|
||||
:Append(cg:DOFade(0, 0.3):SetEase(DG.Tweening.Ease.InOutSine)) -- 淡出
|
||||
:OnComplete(function()
|
||||
-- 动画完成后隐藏
|
||||
|
||||
@ -341,12 +341,27 @@ function BattleStatisticsPart:ShowFighterStatistics(node,data)
|
||||
node.progress.image.fillAmount = data.heroDamagePercent
|
||||
node.percent.text.text = CommonUtil.GetPreciseDecimal(data.damagePercent*100,2) .. "%"
|
||||
node.slider.slider.value = data.heroDamagePercent
|
||||
CommonUtil.LoadIcon(self.host, data.headIcon, function(sprite)
|
||||
node.head_image.image.sprite = sprite
|
||||
end)
|
||||
|
||||
--设置头像
|
||||
--LogWarning("tzy_id " .. Inspect(data.fighterId))
|
||||
local idx = tonumber(tostring(data.fighterId))
|
||||
local headpath = "HeroDraw/Role_" .. idx
|
||||
self:SetHeadsImg(node.head_image,headpath,idx)
|
||||
|
||||
node:SetActive(true)
|
||||
end
|
||||
|
||||
function BattleStatisticsPart:SetHeadsImg(go, path, idx)
|
||||
CommonUtil.LoadIcon(self, path, function(sprite)
|
||||
go.image.sprite = sprite
|
||||
go.image:SetNativeSize()
|
||||
end)
|
||||
|
||||
local imgpos = go.gameObject:GetComponent(Enum.TypeInfo.RectTransform)
|
||||
imgpos.anchoredPosition = CommonUtil.GetRoleHeadInfo(idx)
|
||||
end
|
||||
|
||||
|
||||
--重置数据
|
||||
function BattleStatisticsPart:ResetData()
|
||||
if self.statisticsActorNodes ~= nil then
|
||||
|
||||
@ -1893,6 +1893,7 @@ local streamer_act = {
|
||||
local streamer_act_lock=false
|
||||
|
||||
function UIBattleView:Set_Streamer_Act()
|
||||
if not self.ReceiveGo then return end
|
||||
local streamer = self.ReceiveGo.treeHeart.skeletonGraphic
|
||||
|
||||
local act = streamer_act[math.random(#streamer_act)]
|
||||
@ -1922,6 +1923,7 @@ end
|
||||
|
||||
function UIBattleView:Set_Streamer_Idle()
|
||||
|
||||
if not self.ReceiveGo then return end
|
||||
local streamer = self.ReceiveGo.treeHeart.skeletonGraphic
|
||||
|
||||
local act = streamer_idle[math.random(#streamer_idle)]
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
---@field public gameObject UnityEngine.GameObject
|
||||
---@field public text UnityEngine.UI.Text
|
||||
|
||||
---@class UIBuyTimes__Generate_closeBtn
|
||||
---@class UIBuyTimes__Generate_btnClose
|
||||
---@field public gameObject UnityEngine.GameObject
|
||||
---@field public button UnityEngine.UI.Button
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
---@field private uIAnimator UIBuyTimes__Generate_uIAnimator
|
||||
---@field private AnyBtn UIBuyTimes__Generate_AnyBtn
|
||||
---@field private window UnityEngine.GameObject
|
||||
---@field private closeBtn UIBuyTimes__Generate_closeBtn
|
||||
---@field private btnClose UIBuyTimes__Generate_btnClose
|
||||
---@field private number UIBuyTimes__Generate_number
|
||||
---@field private leftTimesText UIBuyTimes__Generate_leftTimesText
|
||||
---@field private slider UIBuyTimes__Generate_slider
|
||||
@ -138,13 +138,13 @@ end
|
||||
---@private
|
||||
function UIBuyTimesView:InitGenerate__5(Root, data)
|
||||
--[[
|
||||
UIAnimator/Window/Bg/CloseBox/BtnClose
|
||||
UIAnimator/Window/Bg/BtnClose
|
||||
--]]
|
||||
local tmp = Root:Find("UIAnimator/Window/Bg/CloseBox/BtnClose").gameObject
|
||||
local tmp = Root:Find("UIAnimator/Window/Bg/BtnClose").gameObject
|
||||
if tolua.getpeer(tmp) == nil then
|
||||
tolua.setpeer(tmp, {})
|
||||
end
|
||||
self.closeBtn = tmp
|
||||
self.btnClose = tmp
|
||||
|
||||
tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
|
||||
end
|
||||
@ -261,10 +261,10 @@ function UIBuyTimesView:GenerateDestroy()
|
||||
tolua.setpeer(self.window, nil)
|
||||
end
|
||||
self.window = nil
|
||||
if tolua.getpeer(self.closeBtn) ~= nil then
|
||||
tolua.setpeer(self.closeBtn, nil)
|
||||
if tolua.getpeer(self.btnClose) ~= nil then
|
||||
tolua.setpeer(self.btnClose, nil)
|
||||
end
|
||||
self.closeBtn = nil
|
||||
self.btnClose = nil
|
||||
if tolua.getpeer(self.number) ~= nil then
|
||||
tolua.setpeer(self.number, nil)
|
||||
end
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
---@field public gameObject UnityEngine.GameObject
|
||||
---@field public text UnityEngine.UI.Text
|
||||
|
||||
---@class UIDojoBuyTimes__Generate_closeBtn
|
||||
---@class UIDojoBuyTimes__Generate_btnClose
|
||||
---@field public gameObject UnityEngine.GameObject
|
||||
---@field public button UnityEngine.UI.Button
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
---@field private uIAnimator UIDojoBuyTimes__Generate_uIAnimator
|
||||
---@field private AnyBtn UIDojoBuyTimes__Generate_AnyBtn
|
||||
---@field private window UnityEngine.GameObject
|
||||
---@field private closeBtn UIDojoBuyTimes__Generate_closeBtn
|
||||
---@field private btnClose UIDojoBuyTimes__Generate_btnClose
|
||||
---@field private costText UIDojoBuyTimes__Generate_costText
|
||||
---@field private title UnityEngine.GameObject
|
||||
---@field private leftTimesText UIDojoBuyTimes__Generate_leftTimesText
|
||||
@ -116,13 +116,13 @@ end
|
||||
---@private
|
||||
function UIDojoBuyTimesView:InitGenerate__5(Root, data)
|
||||
--[[
|
||||
UIAnimator/Window/Bg/CloseBox/BtnClose
|
||||
UIAnimator/Window/Bg/BtnClose
|
||||
--]]
|
||||
local tmp = Root:Find("UIAnimator/Window/Bg/CloseBox/BtnClose").gameObject
|
||||
local tmp = Root:Find("UIAnimator/Window/Bg/BtnClose").gameObject
|
||||
if tolua.getpeer(tmp) == nil then
|
||||
tolua.setpeer(tmp, {})
|
||||
end
|
||||
self.closeBtn = tmp
|
||||
self.btnClose = tmp
|
||||
|
||||
tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
|
||||
end
|
||||
@ -195,10 +195,10 @@ function UIDojoBuyTimesView:GenerateDestroy()
|
||||
tolua.setpeer(self.window, nil)
|
||||
end
|
||||
self.window = nil
|
||||
if tolua.getpeer(self.closeBtn) ~= nil then
|
||||
tolua.setpeer(self.closeBtn, nil)
|
||||
if tolua.getpeer(self.btnClose) ~= nil then
|
||||
tolua.setpeer(self.btnClose, nil)
|
||||
end
|
||||
self.closeBtn = nil
|
||||
self.btnClose = nil
|
||||
if tolua.getpeer(self.costText) ~= nil then
|
||||
tolua.setpeer(self.costText, nil)
|
||||
end
|
||||
|
||||
@ -3076,6 +3076,7 @@ function ToNumber(num)
|
||||
return tonumber(tostring(num))
|
||||
end
|
||||
|
||||
--获得头像偏移位置和背景颜色
|
||||
function GetRoleHeadInfo(uid)
|
||||
if uid == 1 then
|
||||
return Vector2(8, -183), Color(231/255,186/255,101/255, 1)
|
||||
@ -3092,3 +3093,18 @@ function GetRoleHeadInfo(uid)
|
||||
end
|
||||
return Vector2(0, 0), Color(1,1,1,1)
|
||||
end
|
||||
|
||||
function GetRole_Illustration_Info(idx)
|
||||
local pos;
|
||||
|
||||
if idx == 1 then pos = Vector2(6, 2, 0) end
|
||||
if idx == 2 then pos = Vector2(33, -7, 0) end
|
||||
if idx == 3 then pos = Vector2(-50, -18, 0) end
|
||||
if idx == 4 then pos = Vector2(-6, 45, 0) end
|
||||
if idx == 5 then pos = Vector2(-8, 31, 0) end
|
||||
if idx == 6 then pos = Vector2(-15, 11, 0) end
|
||||
|
||||
return pos
|
||||
|
||||
|
||||
end
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user