Compare commits
No commits in common. "28dba51958e117f0571083e79fff3df9ca5d1842" and "3aa59599426fab8058332e89e11d2f3e4f01d834" have entirely different histories.
28dba51958
...
3aa5959942
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,386 +0,0 @@
|
|||||||
%YAML 1.1
|
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
|
||||||
--- !u!1 &888909943769043762
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 2455104703269169515}
|
|
||||||
- component: {fileID: 8071289481082098997}
|
|
||||||
- component: {fileID: 5717625264412707283}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Connet
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &2455104703269169515
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 888909943769043762}
|
|
||||||
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: 946527045819641235}
|
|
||||||
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}
|
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!222 &8071289481082098997
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 888909943769043762}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!114 &5717625264412707283
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 888909943769043762}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
MarkType: 0
|
|
||||||
CustomComponentName: Connet
|
|
||||||
CustomComment:
|
|
||||||
mComponentName: RectTransform
|
|
||||||
--- !u!1 &1955485345176731299
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 1534706108698119352}
|
|
||||||
- component: {fileID: 1877138455817556542}
|
|
||||||
- component: {fileID: 1330951462221677750}
|
|
||||||
- component: {fileID: 7100170086842866590}
|
|
||||||
- component: {fileID: 1034727462169220460}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Button
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &1534706108698119352
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1955485345176731299}
|
|
||||||
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:
|
|
||||||
- {fileID: 7804531469293025173}
|
|
||||||
m_Father: {fileID: 4910365175849963417}
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
|
||||||
m_AnchoredPosition: {x: 0, y: 214}
|
|
||||||
m_SizeDelta: {x: 160, y: 30}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!222 &1877138455817556542
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1955485345176731299}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!114 &1330951462221677750
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1955485345176731299}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
m_RaycastTarget: 1
|
|
||||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
m_Maskable: 1
|
|
||||||
m_OnCullStateChanged:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
m_Sprite: {fileID: 21300000, guid: 8c77a2052664d0d4e9be892444deddd1, type: 3}
|
|
||||||
m_Type: 1
|
|
||||||
m_PreserveAspect: 0
|
|
||||||
m_FillCenter: 1
|
|
||||||
m_FillMethod: 4
|
|
||||||
m_FillAmount: 1
|
|
||||||
m_FillClockwise: 1
|
|
||||||
m_FillOrigin: 0
|
|
||||||
m_UseSpriteMesh: 0
|
|
||||||
m_PixelsPerUnitMultiplier: 1
|
|
||||||
--- !u!114 &7100170086842866590
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1955485345176731299}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Navigation:
|
|
||||||
m_Mode: 3
|
|
||||||
m_WrapAround: 0
|
|
||||||
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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
|
|
||||||
m_DisabledSprite: {fileID: 0}
|
|
||||||
m_AnimationTriggers:
|
|
||||||
m_NormalTrigger: Normal
|
|
||||||
m_HighlightedTrigger: Highlighted
|
|
||||||
m_PressedTrigger: Pressed
|
|
||||||
m_SelectedTrigger: Selected
|
|
||||||
m_DisabledTrigger: Disabled
|
|
||||||
m_Interactable: 1
|
|
||||||
m_TargetGraphic: {fileID: 1330951462221677750}
|
|
||||||
m_OnClick:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
--- !u!114 &1034727462169220460
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1955485345176731299}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
MarkType: 0
|
|
||||||
CustomComponentName: Button
|
|
||||||
CustomComment:
|
|
||||||
mComponentName: UnityEngine.UI.Button
|
|
||||||
--- !u!1 &2424100460547051079
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 7804531469293025173}
|
|
||||||
- component: {fileID: 7575573765244966374}
|
|
||||||
- component: {fileID: 6469648917734045210}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: TitleText
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &7804531469293025173
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 2424100460547051079}
|
|
||||||
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: 1534706108698119352}
|
|
||||||
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}
|
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!222 &7575573765244966374
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 2424100460547051079}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!114 &6469648917734045210
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 2424100460547051079}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
m_RaycastTarget: 1
|
|
||||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
m_Maskable: 1
|
|
||||||
m_OnCullStateChanged:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
m_FontData:
|
|
||||||
m_Font: {fileID: 12800000, guid: ed2dcf76fce32514fbf37799df2d4136, type: 3}
|
|
||||||
m_FontSize: 16
|
|
||||||
m_FontStyle: 0
|
|
||||||
m_BestFit: 0
|
|
||||||
m_MinSize: 1
|
|
||||||
m_MaxSize: 40
|
|
||||||
m_Alignment: 4
|
|
||||||
m_AlignByGeometry: 0
|
|
||||||
m_RichText: 1
|
|
||||||
m_HorizontalOverflow: 0
|
|
||||||
m_VerticalOverflow: 0
|
|
||||||
m_LineSpacing: 1
|
|
||||||
m_Text: Button
|
|
||||||
--- !u!1 &5657257549572006007
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 4910365175849963417}
|
|
||||||
- component: {fileID: 3263579343605595289}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Prefabs
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 0
|
|
||||||
--- !u!224 &4910365175849963417
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 5657257549572006007}
|
|
||||||
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:
|
|
||||||
- {fileID: 1534706108698119352}
|
|
||||||
m_Father: {fileID: 946527045819641235}
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
|
||||||
m_SizeDelta: {x: 100, y: 100}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!222 &3263579343605595289
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 5657257549572006007}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!1 &6694362606900500821
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 946527045819641235}
|
|
||||||
- component: {fileID: 3880217740787222117}
|
|
||||||
- component: {fileID: 7270361816578231170}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: UIBtnAnim
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &946527045819641235
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 6694362606900500821}
|
|
||||||
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:
|
|
||||||
- {fileID: 2455104703269169515}
|
|
||||||
- {fileID: 4910365175849963417}
|
|
||||||
m_Father: {fileID: 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}
|
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!222 &3880217740787222117
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 6694362606900500821}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!114 &7270361816578231170
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 6694362606900500821}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 5126b39382a736d409f3198a28eb8528, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
Connet: {fileID: 2455104703269169515}
|
|
||||||
Button: {fileID: 7100170086842866590}
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 8cd43b919d8882f4790788a5590e71d6
|
|
||||||
PrefabImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName: uibtnanim_prefab
|
|
||||||
assetBundleVariant:
|
|
||||||
@ -67,7 +67,7 @@ MonoBehaviour:
|
|||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_text: 1
|
m_text: 1
|
||||||
m_isRightToLeft: 0
|
m_isRightToLeft: 0
|
||||||
m_fontAsset: {fileID: 11400000, guid: 9bbfb1bdb0251664eb0932e39724900e, type: 2}
|
m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
|
||||||
m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
|
m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
|
||||||
m_fontSharedMaterials: []
|
m_fontSharedMaterials: []
|
||||||
m_fontMaterial: {fileID: 0}
|
m_fontMaterial: {fileID: 0}
|
||||||
@ -131,7 +131,7 @@ MonoBehaviour:
|
|||||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||||
m_isUsingLegacyAnimationComponent: 0
|
m_isUsingLegacyAnimationComponent: 0
|
||||||
m_isVolumetricText: 0
|
m_isVolumetricText: 0
|
||||||
m_hasFontAssetChanged: 1
|
m_hasFontAssetChanged: 0
|
||||||
m_baseMaterial: {fileID: 0}
|
m_baseMaterial: {fileID: 0}
|
||||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||||
--- !u!1 &2587655409017112171
|
--- !u!1 &2587655409017112171
|
||||||
@ -167,7 +167,7 @@ RectTransform:
|
|||||||
m_Father: {fileID: 3292507068126063065}
|
m_Father: {fileID: 3292507068126063065}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
@ -451,7 +451,7 @@ RectTransform:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 8109171602776719836}
|
m_GameObject: {fileID: 8109171602776719836}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
@ -486,7 +486,7 @@ MonoBehaviour:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 8109171602776719836}
|
m_GameObject: {fileID: 8109171602776719836}
|
||||||
m_Enabled: 0
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
|
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -35,8 +35,8 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 1, y: 0}
|
m_AnchorMin: {x: 1, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 0}
|
m_AnchorMax: {x: 1, y: 0}
|
||||||
m_AnchoredPosition: {x: -218.49231, y: 198.75409}
|
m_AnchoredPosition: {x: -351.41528, y: 251.92322}
|
||||||
m_SizeDelta: {x: 436.9846, y: 397.5081}
|
m_SizeDelta: {x: 702.8304, y: 503.8465}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4232815537607907880
|
--- !u!222 &4232815537607907880
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@ -192,9 +192,9 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0.000015258789, y: 0.000045776367}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 1, y: 1}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7435543090623703973
|
--- !u!222 &7435543090623703973
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -219,14 +219,14 @@ MonoBehaviour:
|
|||||||
m_Left: 80
|
m_Left: 80
|
||||||
m_Right: 20
|
m_Right: 20
|
||||||
m_Top: 10
|
m_Top: 10
|
||||||
m_Bottom: 10
|
m_Bottom: 20
|
||||||
m_ChildAlignment: 1
|
m_ChildAlignment: 1
|
||||||
m_Spacing: 5
|
m_Spacing: 0
|
||||||
m_ChildForceExpandWidth: 1
|
m_ChildForceExpandWidth: 1
|
||||||
m_ChildForceExpandHeight: 1
|
m_ChildForceExpandHeight: 1
|
||||||
m_ChildControlWidth: 1
|
m_ChildControlWidth: 0
|
||||||
m_ChildControlHeight: 0
|
m_ChildControlHeight: 0
|
||||||
m_ChildScaleWidth: 0
|
m_ChildScaleWidth: 1
|
||||||
m_ChildScaleHeight: 1
|
m_ChildScaleHeight: 1
|
||||||
m_ReverseArrangement: 0
|
m_ReverseArrangement: 0
|
||||||
--- !u!114 &2092374977566157491
|
--- !u!114 &2092374977566157491
|
||||||
|
|||||||
@ -274,7 +274,7 @@ RectTransform:
|
|||||||
m_Father: {fileID: 978605113392597977}
|
m_Father: {fileID: 978605113392597977}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
@ -354,9 +354,9 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 1, y: 0.5}
|
m_AnchorMin: {x: 1, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 0.5}
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 5, y: 96}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 320, y: 419.6067}
|
m_SizeDelta: {x: 320, y: 548}
|
||||||
m_Pivot: {x: 1, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &9046346095875189800
|
--- !u!222 &9046346095875189800
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -594,7 +594,7 @@ GameObject:
|
|||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &4763730971436534081
|
--- !u!224 &4763730971436534081
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: beab953c019ad884aa67d3a0bb49fdaa
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.9 MiB |
@ -1,179 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 3a00983ef5623fc408efcbb92a4907c3
|
|
||||||
TextureImporter:
|
|
||||||
internalIDToNameTable: []
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 12
|
|
||||||
mipmaps:
|
|
||||||
mipMapMode: 0
|
|
||||||
enableMipMap: 0
|
|
||||||
sRGBTexture: 1
|
|
||||||
linearTexture: 0
|
|
||||||
fadeOut: 0
|
|
||||||
borderMipMap: 0
|
|
||||||
mipMapsPreserveCoverage: 0
|
|
||||||
alphaTestReferenceValue: 0.5
|
|
||||||
mipMapFadeDistanceStart: 1
|
|
||||||
mipMapFadeDistanceEnd: 3
|
|
||||||
bumpmap:
|
|
||||||
convertToNormalMap: 0
|
|
||||||
externalNormalMap: 0
|
|
||||||
heightScale: 0.25
|
|
||||||
normalMapFilter: 0
|
|
||||||
flipGreenChannel: 0
|
|
||||||
isReadable: 0
|
|
||||||
streamingMipmaps: 0
|
|
||||||
streamingMipmapsPriority: 0
|
|
||||||
vTOnly: 0
|
|
||||||
ignoreMipmapLimit: 0
|
|
||||||
grayScaleToAlpha: 0
|
|
||||||
generateCubemap: 6
|
|
||||||
cubemapConvolution: 0
|
|
||||||
seamlessCubemap: 0
|
|
||||||
textureFormat: 1
|
|
||||||
maxTextureSize: 2048
|
|
||||||
textureSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
filterMode: 1
|
|
||||||
aniso: 2
|
|
||||||
mipBias: 0
|
|
||||||
wrapU: 1
|
|
||||||
wrapV: 1
|
|
||||||
wrapW: 0
|
|
||||||
nPOTScale: 0
|
|
||||||
lightmap: 0
|
|
||||||
compressionQuality: 50
|
|
||||||
spriteMode: 1
|
|
||||||
spriteExtrude: 1
|
|
||||||
spriteMeshType: 1
|
|
||||||
alignment: 0
|
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
|
||||||
spritePixelsToUnits: 100
|
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
|
||||||
alphaUsage: 1
|
|
||||||
alphaIsTransparency: 1
|
|
||||||
spriteTessellationDetail: -1
|
|
||||||
textureType: 8
|
|
||||||
textureShape: 1
|
|
||||||
singleChannelComponent: 0
|
|
||||||
flipbookRows: 1
|
|
||||||
flipbookColumns: 1
|
|
||||||
maxTextureSizeSet: 0
|
|
||||||
compressionQualitySet: 0
|
|
||||||
textureFormatSet: 0
|
|
||||||
ignorePngGamma: 0
|
|
||||||
applyGammaDecoding: 0
|
|
||||||
swizzle: 50462976
|
|
||||||
cookieLightType: 0
|
|
||||||
platformSettings:
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: DefaultTexturePlatform
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Standalone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: iPhone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Android
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Windows Store Apps
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: WebGL
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Server
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
spriteSheet:
|
|
||||||
serializedVersion: 2
|
|
||||||
sprites: []
|
|
||||||
outline: []
|
|
||||||
physicsShape: []
|
|
||||||
bones: []
|
|
||||||
spriteID: 5e97eb03825dee720800000000000000
|
|
||||||
internalID: 0
|
|
||||||
vertices: []
|
|
||||||
indices:
|
|
||||||
edges: []
|
|
||||||
weights: []
|
|
||||||
secondaryTextures: []
|
|
||||||
nameFileIdTable: {}
|
|
||||||
mipmapLimitGroupName:
|
|
||||||
pSDRemoveMatte: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
@ -1,179 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: ec659f457b7fd564cb1d1990add5fab1
|
|
||||||
TextureImporter:
|
|
||||||
internalIDToNameTable: []
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 12
|
|
||||||
mipmaps:
|
|
||||||
mipMapMode: 0
|
|
||||||
enableMipMap: 0
|
|
||||||
sRGBTexture: 1
|
|
||||||
linearTexture: 0
|
|
||||||
fadeOut: 0
|
|
||||||
borderMipMap: 0
|
|
||||||
mipMapsPreserveCoverage: 0
|
|
||||||
alphaTestReferenceValue: 0.5
|
|
||||||
mipMapFadeDistanceStart: 1
|
|
||||||
mipMapFadeDistanceEnd: 3
|
|
||||||
bumpmap:
|
|
||||||
convertToNormalMap: 0
|
|
||||||
externalNormalMap: 0
|
|
||||||
heightScale: 0.25
|
|
||||||
normalMapFilter: 0
|
|
||||||
flipGreenChannel: 0
|
|
||||||
isReadable: 0
|
|
||||||
streamingMipmaps: 0
|
|
||||||
streamingMipmapsPriority: 0
|
|
||||||
vTOnly: 0
|
|
||||||
ignoreMipmapLimit: 0
|
|
||||||
grayScaleToAlpha: 0
|
|
||||||
generateCubemap: 6
|
|
||||||
cubemapConvolution: 0
|
|
||||||
seamlessCubemap: 0
|
|
||||||
textureFormat: 1
|
|
||||||
maxTextureSize: 2048
|
|
||||||
textureSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
filterMode: 1
|
|
||||||
aniso: 2
|
|
||||||
mipBias: 0
|
|
||||||
wrapU: 1
|
|
||||||
wrapV: 1
|
|
||||||
wrapW: 0
|
|
||||||
nPOTScale: 0
|
|
||||||
lightmap: 0
|
|
||||||
compressionQuality: 50
|
|
||||||
spriteMode: 1
|
|
||||||
spriteExtrude: 1
|
|
||||||
spriteMeshType: 1
|
|
||||||
alignment: 0
|
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
|
||||||
spritePixelsToUnits: 100
|
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
|
||||||
alphaUsage: 1
|
|
||||||
alphaIsTransparency: 1
|
|
||||||
spriteTessellationDetail: -1
|
|
||||||
textureType: 8
|
|
||||||
textureShape: 1
|
|
||||||
singleChannelComponent: 0
|
|
||||||
flipbookRows: 1
|
|
||||||
flipbookColumns: 1
|
|
||||||
maxTextureSizeSet: 0
|
|
||||||
compressionQualitySet: 0
|
|
||||||
textureFormatSet: 0
|
|
||||||
ignorePngGamma: 0
|
|
||||||
applyGammaDecoding: 0
|
|
||||||
swizzle: 50462976
|
|
||||||
cookieLightType: 0
|
|
||||||
platformSettings:
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: DefaultTexturePlatform
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Standalone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: iPhone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Android
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Windows Store Apps
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: WebGL
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Server
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
spriteSheet:
|
|
||||||
serializedVersion: 2
|
|
||||||
sprites: []
|
|
||||||
outline: []
|
|
||||||
physicsShape: []
|
|
||||||
bones: []
|
|
||||||
spriteID: 5e97eb03825dee720800000000000000
|
|
||||||
internalID: 0
|
|
||||||
vertices: []
|
|
||||||
indices:
|
|
||||||
edges: []
|
|
||||||
weights: []
|
|
||||||
secondaryTextures: []
|
|
||||||
nameFileIdTable: {}
|
|
||||||
mipmapLimitGroupName:
|
|
||||||
pSDRemoveMatte: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 395 B |
@ -1,179 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: bf73269e6fc57c34ab5b9fca901a99d7
|
|
||||||
TextureImporter:
|
|
||||||
internalIDToNameTable: []
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 12
|
|
||||||
mipmaps:
|
|
||||||
mipMapMode: 0
|
|
||||||
enableMipMap: 0
|
|
||||||
sRGBTexture: 1
|
|
||||||
linearTexture: 0
|
|
||||||
fadeOut: 0
|
|
||||||
borderMipMap: 0
|
|
||||||
mipMapsPreserveCoverage: 0
|
|
||||||
alphaTestReferenceValue: 0.5
|
|
||||||
mipMapFadeDistanceStart: 1
|
|
||||||
mipMapFadeDistanceEnd: 3
|
|
||||||
bumpmap:
|
|
||||||
convertToNormalMap: 0
|
|
||||||
externalNormalMap: 0
|
|
||||||
heightScale: 0.25
|
|
||||||
normalMapFilter: 0
|
|
||||||
flipGreenChannel: 0
|
|
||||||
isReadable: 0
|
|
||||||
streamingMipmaps: 0
|
|
||||||
streamingMipmapsPriority: 0
|
|
||||||
vTOnly: 0
|
|
||||||
ignoreMipmapLimit: 0
|
|
||||||
grayScaleToAlpha: 0
|
|
||||||
generateCubemap: 6
|
|
||||||
cubemapConvolution: 0
|
|
||||||
seamlessCubemap: 0
|
|
||||||
textureFormat: 1
|
|
||||||
maxTextureSize: 2048
|
|
||||||
textureSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
filterMode: 1
|
|
||||||
aniso: 2
|
|
||||||
mipBias: 0
|
|
||||||
wrapU: 1
|
|
||||||
wrapV: 1
|
|
||||||
wrapW: 0
|
|
||||||
nPOTScale: 0
|
|
||||||
lightmap: 0
|
|
||||||
compressionQuality: 50
|
|
||||||
spriteMode: 1
|
|
||||||
spriteExtrude: 1
|
|
||||||
spriteMeshType: 1
|
|
||||||
alignment: 0
|
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
|
||||||
spritePixelsToUnits: 100
|
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
|
||||||
alphaUsage: 1
|
|
||||||
alphaIsTransparency: 1
|
|
||||||
spriteTessellationDetail: -1
|
|
||||||
textureType: 8
|
|
||||||
textureShape: 1
|
|
||||||
singleChannelComponent: 0
|
|
||||||
flipbookRows: 1
|
|
||||||
flipbookColumns: 1
|
|
||||||
maxTextureSizeSet: 0
|
|
||||||
compressionQualitySet: 0
|
|
||||||
textureFormatSet: 0
|
|
||||||
ignorePngGamma: 0
|
|
||||||
applyGammaDecoding: 0
|
|
||||||
swizzle: 50462976
|
|
||||||
cookieLightType: 0
|
|
||||||
platformSettings:
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: DefaultTexturePlatform
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Standalone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: iPhone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Android
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Windows Store Apps
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: WebGL
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Server
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
spriteSheet:
|
|
||||||
serializedVersion: 2
|
|
||||||
sprites: []
|
|
||||||
outline: []
|
|
||||||
physicsShape: []
|
|
||||||
bones: []
|
|
||||||
spriteID: 5e97eb03825dee720800000000000000
|
|
||||||
internalID: 0
|
|
||||||
vertices: []
|
|
||||||
indices:
|
|
||||||
edges: []
|
|
||||||
weights: []
|
|
||||||
secondaryTextures: []
|
|
||||||
nameFileIdTable: {}
|
|
||||||
mipmapLimitGroupName:
|
|
||||||
pSDRemoveMatte: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 5.7 MiB |
@ -1,179 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: cc9edef0c7d8eb54a84077129a9351a8
|
|
||||||
TextureImporter:
|
|
||||||
internalIDToNameTable: []
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 12
|
|
||||||
mipmaps:
|
|
||||||
mipMapMode: 0
|
|
||||||
enableMipMap: 0
|
|
||||||
sRGBTexture: 1
|
|
||||||
linearTexture: 0
|
|
||||||
fadeOut: 0
|
|
||||||
borderMipMap: 0
|
|
||||||
mipMapsPreserveCoverage: 0
|
|
||||||
alphaTestReferenceValue: 0.5
|
|
||||||
mipMapFadeDistanceStart: 1
|
|
||||||
mipMapFadeDistanceEnd: 3
|
|
||||||
bumpmap:
|
|
||||||
convertToNormalMap: 0
|
|
||||||
externalNormalMap: 0
|
|
||||||
heightScale: 0.25
|
|
||||||
normalMapFilter: 0
|
|
||||||
flipGreenChannel: 0
|
|
||||||
isReadable: 0
|
|
||||||
streamingMipmaps: 0
|
|
||||||
streamingMipmapsPriority: 0
|
|
||||||
vTOnly: 0
|
|
||||||
ignoreMipmapLimit: 0
|
|
||||||
grayScaleToAlpha: 0
|
|
||||||
generateCubemap: 6
|
|
||||||
cubemapConvolution: 0
|
|
||||||
seamlessCubemap: 0
|
|
||||||
textureFormat: 1
|
|
||||||
maxTextureSize: 2048
|
|
||||||
textureSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
filterMode: 1
|
|
||||||
aniso: 2
|
|
||||||
mipBias: 0
|
|
||||||
wrapU: 1
|
|
||||||
wrapV: 1
|
|
||||||
wrapW: 0
|
|
||||||
nPOTScale: 0
|
|
||||||
lightmap: 0
|
|
||||||
compressionQuality: 50
|
|
||||||
spriteMode: 1
|
|
||||||
spriteExtrude: 1
|
|
||||||
spriteMeshType: 1
|
|
||||||
alignment: 0
|
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
|
||||||
spritePixelsToUnits: 100
|
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
|
||||||
alphaUsage: 1
|
|
||||||
alphaIsTransparency: 1
|
|
||||||
spriteTessellationDetail: -1
|
|
||||||
textureType: 8
|
|
||||||
textureShape: 1
|
|
||||||
singleChannelComponent: 0
|
|
||||||
flipbookRows: 1
|
|
||||||
flipbookColumns: 1
|
|
||||||
maxTextureSizeSet: 0
|
|
||||||
compressionQualitySet: 0
|
|
||||||
textureFormatSet: 0
|
|
||||||
ignorePngGamma: 0
|
|
||||||
applyGammaDecoding: 0
|
|
||||||
swizzle: 50462976
|
|
||||||
cookieLightType: 0
|
|
||||||
platformSettings:
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: DefaultTexturePlatform
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Standalone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: iPhone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Android
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Windows Store Apps
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: WebGL
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Server
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
spriteSheet:
|
|
||||||
serializedVersion: 2
|
|
||||||
sprites: []
|
|
||||||
outline: []
|
|
||||||
physicsShape: []
|
|
||||||
bones: []
|
|
||||||
spriteID: 5e97eb03825dee720800000000000000
|
|
||||||
internalID: 0
|
|
||||||
vertices: []
|
|
||||||
indices:
|
|
||||||
edges: []
|
|
||||||
weights: []
|
|
||||||
secondaryTextures: []
|
|
||||||
nameFileIdTable: {}
|
|
||||||
mipmapLimitGroupName:
|
|
||||||
pSDRemoveMatte: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.3 KiB |
@ -1,179 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: bc9ac8fa376dbd140a9078d33158ba7d
|
|
||||||
TextureImporter:
|
|
||||||
internalIDToNameTable: []
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 12
|
|
||||||
mipmaps:
|
|
||||||
mipMapMode: 0
|
|
||||||
enableMipMap: 0
|
|
||||||
sRGBTexture: 1
|
|
||||||
linearTexture: 0
|
|
||||||
fadeOut: 0
|
|
||||||
borderMipMap: 0
|
|
||||||
mipMapsPreserveCoverage: 0
|
|
||||||
alphaTestReferenceValue: 0.5
|
|
||||||
mipMapFadeDistanceStart: 1
|
|
||||||
mipMapFadeDistanceEnd: 3
|
|
||||||
bumpmap:
|
|
||||||
convertToNormalMap: 0
|
|
||||||
externalNormalMap: 0
|
|
||||||
heightScale: 0.25
|
|
||||||
normalMapFilter: 0
|
|
||||||
flipGreenChannel: 0
|
|
||||||
isReadable: 0
|
|
||||||
streamingMipmaps: 0
|
|
||||||
streamingMipmapsPriority: 0
|
|
||||||
vTOnly: 0
|
|
||||||
ignoreMipmapLimit: 0
|
|
||||||
grayScaleToAlpha: 0
|
|
||||||
generateCubemap: 6
|
|
||||||
cubemapConvolution: 0
|
|
||||||
seamlessCubemap: 0
|
|
||||||
textureFormat: 1
|
|
||||||
maxTextureSize: 2048
|
|
||||||
textureSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
filterMode: 1
|
|
||||||
aniso: 2
|
|
||||||
mipBias: 0
|
|
||||||
wrapU: 1
|
|
||||||
wrapV: 1
|
|
||||||
wrapW: 0
|
|
||||||
nPOTScale: 0
|
|
||||||
lightmap: 0
|
|
||||||
compressionQuality: 50
|
|
||||||
spriteMode: 1
|
|
||||||
spriteExtrude: 1
|
|
||||||
spriteMeshType: 1
|
|
||||||
alignment: 0
|
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
|
||||||
spritePixelsToUnits: 100
|
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
|
||||||
alphaUsage: 1
|
|
||||||
alphaIsTransparency: 1
|
|
||||||
spriteTessellationDetail: -1
|
|
||||||
textureType: 8
|
|
||||||
textureShape: 1
|
|
||||||
singleChannelComponent: 0
|
|
||||||
flipbookRows: 1
|
|
||||||
flipbookColumns: 1
|
|
||||||
maxTextureSizeSet: 0
|
|
||||||
compressionQualitySet: 0
|
|
||||||
textureFormatSet: 0
|
|
||||||
ignorePngGamma: 0
|
|
||||||
applyGammaDecoding: 0
|
|
||||||
swizzle: 50462976
|
|
||||||
cookieLightType: 0
|
|
||||||
platformSettings:
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: DefaultTexturePlatform
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Standalone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: iPhone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Android
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Windows Store Apps
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: WebGL
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Server
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
spriteSheet:
|
|
||||||
serializedVersion: 2
|
|
||||||
sprites: []
|
|
||||||
outline: []
|
|
||||||
physicsShape: []
|
|
||||||
bones: []
|
|
||||||
spriteID: 5e97eb03825dee720800000000000000
|
|
||||||
internalID: 0
|
|
||||||
vertices: []
|
|
||||||
indices:
|
|
||||||
edges: []
|
|
||||||
weights: []
|
|
||||||
secondaryTextures: []
|
|
||||||
nameFileIdTable: {}
|
|
||||||
mipmapLimitGroupName:
|
|
||||||
pSDRemoveMatte: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
@ -1,179 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 3cfd5e6d694f37c44a22b765a3317dd5
|
|
||||||
TextureImporter:
|
|
||||||
internalIDToNameTable: []
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 12
|
|
||||||
mipmaps:
|
|
||||||
mipMapMode: 0
|
|
||||||
enableMipMap: 0
|
|
||||||
sRGBTexture: 1
|
|
||||||
linearTexture: 0
|
|
||||||
fadeOut: 0
|
|
||||||
borderMipMap: 0
|
|
||||||
mipMapsPreserveCoverage: 0
|
|
||||||
alphaTestReferenceValue: 0.5
|
|
||||||
mipMapFadeDistanceStart: 1
|
|
||||||
mipMapFadeDistanceEnd: 3
|
|
||||||
bumpmap:
|
|
||||||
convertToNormalMap: 0
|
|
||||||
externalNormalMap: 0
|
|
||||||
heightScale: 0.25
|
|
||||||
normalMapFilter: 0
|
|
||||||
flipGreenChannel: 0
|
|
||||||
isReadable: 0
|
|
||||||
streamingMipmaps: 0
|
|
||||||
streamingMipmapsPriority: 0
|
|
||||||
vTOnly: 0
|
|
||||||
ignoreMipmapLimit: 0
|
|
||||||
grayScaleToAlpha: 0
|
|
||||||
generateCubemap: 6
|
|
||||||
cubemapConvolution: 0
|
|
||||||
seamlessCubemap: 0
|
|
||||||
textureFormat: 1
|
|
||||||
maxTextureSize: 2048
|
|
||||||
textureSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
filterMode: 1
|
|
||||||
aniso: 2
|
|
||||||
mipBias: 0
|
|
||||||
wrapU: 1
|
|
||||||
wrapV: 1
|
|
||||||
wrapW: 0
|
|
||||||
nPOTScale: 0
|
|
||||||
lightmap: 0
|
|
||||||
compressionQuality: 50
|
|
||||||
spriteMode: 1
|
|
||||||
spriteExtrude: 1
|
|
||||||
spriteMeshType: 1
|
|
||||||
alignment: 0
|
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
|
||||||
spritePixelsToUnits: 100
|
|
||||||
spriteBorder: {x: 50, y: 5, z: 50, w: 50}
|
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
|
||||||
alphaUsage: 1
|
|
||||||
alphaIsTransparency: 1
|
|
||||||
spriteTessellationDetail: -1
|
|
||||||
textureType: 8
|
|
||||||
textureShape: 1
|
|
||||||
singleChannelComponent: 0
|
|
||||||
flipbookRows: 1
|
|
||||||
flipbookColumns: 1
|
|
||||||
maxTextureSizeSet: 0
|
|
||||||
compressionQualitySet: 0
|
|
||||||
textureFormatSet: 0
|
|
||||||
ignorePngGamma: 0
|
|
||||||
applyGammaDecoding: 0
|
|
||||||
swizzle: 50462976
|
|
||||||
cookieLightType: 0
|
|
||||||
platformSettings:
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: DefaultTexturePlatform
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Standalone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: iPhone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Android
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Windows Store Apps
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: WebGL
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Server
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
spriteSheet:
|
|
||||||
serializedVersion: 2
|
|
||||||
sprites: []
|
|
||||||
outline: []
|
|
||||||
physicsShape: []
|
|
||||||
bones: []
|
|
||||||
spriteID: 5e97eb03825dee720800000000000000
|
|
||||||
internalID: 1537655665
|
|
||||||
vertices: []
|
|
||||||
indices:
|
|
||||||
edges: []
|
|
||||||
weights: []
|
|
||||||
secondaryTextures: []
|
|
||||||
nameFileIdTable: {}
|
|
||||||
mipmapLimitGroupName:
|
|
||||||
pSDRemoveMatte: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@ -36,36 +36,7 @@ ModelImporter:
|
|||||||
animationWrapMode: 0
|
animationWrapMode: 0
|
||||||
extraExposedTransformPaths: []
|
extraExposedTransformPaths: []
|
||||||
extraUserProperties: []
|
extraUserProperties: []
|
||||||
clipAnimations:
|
clipAnimations: []
|
||||||
- serializedVersion: 16
|
|
||||||
name: Lengzhu
|
|
||||||
takeName: Take 001
|
|
||||||
internalID: 1827226128182048838
|
|
||||||
firstFrame: 1
|
|
||||||
lastFrame: 120
|
|
||||||
wrapMode: 0
|
|
||||||
orientationOffsetY: 0
|
|
||||||
level: 0
|
|
||||||
cycleOffset: 0
|
|
||||||
loop: 0
|
|
||||||
hasAdditiveReferencePose: 0
|
|
||||||
loopTime: 0
|
|
||||||
loopBlend: 0
|
|
||||||
loopBlendOrientation: 0
|
|
||||||
loopBlendPositionY: 0
|
|
||||||
loopBlendPositionXZ: 0
|
|
||||||
keepOriginalOrientation: 0
|
|
||||||
keepOriginalPositionY: 1
|
|
||||||
keepOriginalPositionXZ: 0
|
|
||||||
heightFromFeet: 0
|
|
||||||
mirror: 0
|
|
||||||
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
|
|
||||||
curves: []
|
|
||||||
events: []
|
|
||||||
transformMask: []
|
|
||||||
maskType: 3
|
|
||||||
maskSource: {instanceID: 0}
|
|
||||||
additiveReferencePoseFrame: 0
|
|
||||||
isReadable: 0
|
isReadable: 0
|
||||||
meshes:
|
meshes:
|
||||||
lODScreenPercentages: []
|
lODScreenPercentages: []
|
||||||
@ -131,7 +102,7 @@ ModelImporter:
|
|||||||
skeletonHasParents: 1
|
skeletonHasParents: 1
|
||||||
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||||
autoGenerateAvatarMappingIfUnspecified: 1
|
autoGenerateAvatarMappingIfUnspecified: 1
|
||||||
animationType: 1
|
animationType: 2
|
||||||
humanoidOversampling: 1
|
humanoidOversampling: 1
|
||||||
avatarSetup: 0
|
avatarSetup: 0
|
||||||
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||||
|
|||||||
@ -36,36 +36,7 @@ ModelImporter:
|
|||||||
animationWrapMode: 0
|
animationWrapMode: 0
|
||||||
extraExposedTransformPaths: []
|
extraExposedTransformPaths: []
|
||||||
extraUserProperties: []
|
extraUserProperties: []
|
||||||
clipAnimations:
|
clipAnimations: []
|
||||||
- serializedVersion: 16
|
|
||||||
name: Lengzhui
|
|
||||||
takeName: Take 001
|
|
||||||
internalID: 1827226128182048838
|
|
||||||
firstFrame: 1
|
|
||||||
lastFrame: 120
|
|
||||||
wrapMode: 0
|
|
||||||
orientationOffsetY: 0
|
|
||||||
level: 0
|
|
||||||
cycleOffset: 0
|
|
||||||
loop: 0
|
|
||||||
hasAdditiveReferencePose: 0
|
|
||||||
loopTime: 0
|
|
||||||
loopBlend: 0
|
|
||||||
loopBlendOrientation: 0
|
|
||||||
loopBlendPositionY: 0
|
|
||||||
loopBlendPositionXZ: 0
|
|
||||||
keepOriginalOrientation: 0
|
|
||||||
keepOriginalPositionY: 1
|
|
||||||
keepOriginalPositionXZ: 0
|
|
||||||
heightFromFeet: 0
|
|
||||||
mirror: 0
|
|
||||||
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
|
|
||||||
curves: []
|
|
||||||
events: []
|
|
||||||
transformMask: []
|
|
||||||
maskType: 3
|
|
||||||
maskSource: {instanceID: 0}
|
|
||||||
additiveReferencePoseFrame: 0
|
|
||||||
isReadable: 0
|
isReadable: 0
|
||||||
meshes:
|
meshes:
|
||||||
lODScreenPercentages: []
|
lODScreenPercentages: []
|
||||||
|
|||||||
@ -41,36 +41,7 @@ ModelImporter:
|
|||||||
animationWrapMode: 0
|
animationWrapMode: 0
|
||||||
extraExposedTransformPaths: []
|
extraExposedTransformPaths: []
|
||||||
extraUserProperties: []
|
extraUserProperties: []
|
||||||
clipAnimations:
|
clipAnimations: []
|
||||||
- serializedVersion: 16
|
|
||||||
name: Qiuti
|
|
||||||
takeName: Take 001
|
|
||||||
internalID: 1827226128182048838
|
|
||||||
firstFrame: 1
|
|
||||||
lastFrame: 300
|
|
||||||
wrapMode: 0
|
|
||||||
orientationOffsetY: 0
|
|
||||||
level: 0
|
|
||||||
cycleOffset: 0
|
|
||||||
loop: 0
|
|
||||||
hasAdditiveReferencePose: 0
|
|
||||||
loopTime: 0
|
|
||||||
loopBlend: 0
|
|
||||||
loopBlendOrientation: 0
|
|
||||||
loopBlendPositionY: 0
|
|
||||||
loopBlendPositionXZ: 0
|
|
||||||
keepOriginalOrientation: 0
|
|
||||||
keepOriginalPositionY: 1
|
|
||||||
keepOriginalPositionXZ: 0
|
|
||||||
heightFromFeet: 0
|
|
||||||
mirror: 0
|
|
||||||
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
|
|
||||||
curves: []
|
|
||||||
events: []
|
|
||||||
transformMask: []
|
|
||||||
maskType: 3
|
|
||||||
maskSource: {instanceID: 0}
|
|
||||||
additiveReferencePoseFrame: 0
|
|
||||||
isReadable: 0
|
isReadable: 0
|
||||||
meshes:
|
meshes:
|
||||||
lODScreenPercentages: []
|
lODScreenPercentages: []
|
||||||
|
|||||||
@ -41,36 +41,7 @@ ModelImporter:
|
|||||||
animationWrapMode: 0
|
animationWrapMode: 0
|
||||||
extraExposedTransformPaths: []
|
extraExposedTransformPaths: []
|
||||||
extraUserProperties: []
|
extraUserProperties: []
|
||||||
clipAnimations:
|
clipAnimations: []
|
||||||
- serializedVersion: 16
|
|
||||||
name: Yuanzhu
|
|
||||||
takeName: Take 001
|
|
||||||
internalID: 1827226128182048838
|
|
||||||
firstFrame: 1
|
|
||||||
lastFrame: 300
|
|
||||||
wrapMode: 0
|
|
||||||
orientationOffsetY: 0
|
|
||||||
level: 0
|
|
||||||
cycleOffset: 0
|
|
||||||
loop: 0
|
|
||||||
hasAdditiveReferencePose: 0
|
|
||||||
loopTime: 0
|
|
||||||
loopBlend: 0
|
|
||||||
loopBlendOrientation: 0
|
|
||||||
loopBlendPositionY: 0
|
|
||||||
loopBlendPositionXZ: 0
|
|
||||||
keepOriginalOrientation: 0
|
|
||||||
keepOriginalPositionY: 1
|
|
||||||
keepOriginalPositionXZ: 0
|
|
||||||
heightFromFeet: 0
|
|
||||||
mirror: 0
|
|
||||||
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
|
|
||||||
curves: []
|
|
||||||
events: []
|
|
||||||
transformMask: []
|
|
||||||
maskType: 3
|
|
||||||
maskSource: {instanceID: 0}
|
|
||||||
additiveReferencePoseFrame: 0
|
|
||||||
isReadable: 0
|
isReadable: 0
|
||||||
meshes:
|
meshes:
|
||||||
lODScreenPercentages: []
|
lODScreenPercentages: []
|
||||||
|
|||||||
@ -41,36 +41,7 @@ ModelImporter:
|
|||||||
animationWrapMode: 0
|
animationWrapMode: 0
|
||||||
extraExposedTransformPaths: []
|
extraExposedTransformPaths: []
|
||||||
extraUserProperties: []
|
extraUserProperties: []
|
||||||
clipAnimations:
|
clipAnimations: []
|
||||||
- serializedVersion: 16
|
|
||||||
name: Yuanzhui
|
|
||||||
takeName: Take 001
|
|
||||||
internalID: 1827226128182048838
|
|
||||||
firstFrame: 1
|
|
||||||
lastFrame: 300
|
|
||||||
wrapMode: 0
|
|
||||||
orientationOffsetY: 0
|
|
||||||
level: 0
|
|
||||||
cycleOffset: 0
|
|
||||||
loop: 0
|
|
||||||
hasAdditiveReferencePose: 0
|
|
||||||
loopTime: 0
|
|
||||||
loopBlend: 0
|
|
||||||
loopBlendOrientation: 0
|
|
||||||
loopBlendPositionY: 0
|
|
||||||
loopBlendPositionXZ: 0
|
|
||||||
keepOriginalOrientation: 0
|
|
||||||
keepOriginalPositionY: 1
|
|
||||||
keepOriginalPositionXZ: 0
|
|
||||||
heightFromFeet: 0
|
|
||||||
mirror: 0
|
|
||||||
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
|
|
||||||
curves: []
|
|
||||||
events: []
|
|
||||||
transformMask: []
|
|
||||||
maskType: 3
|
|
||||||
maskSource: {instanceID: 0}
|
|
||||||
additiveReferencePoseFrame: 0
|
|
||||||
isReadable: 0
|
isReadable: 0
|
||||||
meshes:
|
meshes:
|
||||||
lODScreenPercentages: []
|
lODScreenPercentages: []
|
||||||
|
|||||||
@ -28,7 +28,7 @@ Material:
|
|||||||
m_InvalidKeywords: []
|
m_InvalidKeywords: []
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 1
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: -1
|
m_CustomRenderQueue: -1
|
||||||
stringTagMap:
|
stringTagMap:
|
||||||
RenderType: Opaque
|
RenderType: Opaque
|
||||||
@ -102,7 +102,7 @@ Material:
|
|||||||
- _BumpScale: 1
|
- _BumpScale: 1
|
||||||
- _ClearCoatMask: 0
|
- _ClearCoatMask: 0
|
||||||
- _ClearCoatSmoothness: 0
|
- _ClearCoatSmoothness: 0
|
||||||
- _Cull: 0
|
- _Cull: 2
|
||||||
- _Cutoff: 0.5
|
- _Cutoff: 0.5
|
||||||
- _DetailAlbedoMapScale: 1
|
- _DetailAlbedoMapScale: 1
|
||||||
- _DetailNormalMapScale: 1
|
- _DetailNormalMapScale: 1
|
||||||
|
|||||||
@ -28,7 +28,7 @@ Material:
|
|||||||
m_InvalidKeywords: []
|
m_InvalidKeywords: []
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 1
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: -1
|
m_CustomRenderQueue: -1
|
||||||
stringTagMap:
|
stringTagMap:
|
||||||
RenderType: Opaque
|
RenderType: Opaque
|
||||||
@ -102,7 +102,7 @@ Material:
|
|||||||
- _BumpScale: 1
|
- _BumpScale: 1
|
||||||
- _ClearCoatMask: 0
|
- _ClearCoatMask: 0
|
||||||
- _ClearCoatSmoothness: 0
|
- _ClearCoatSmoothness: 0
|
||||||
- _Cull: 0
|
- _Cull: 2
|
||||||
- _Cutoff: 0.5
|
- _Cutoff: 0.5
|
||||||
- _DetailAlbedoMapScale: 1
|
- _DetailAlbedoMapScale: 1
|
||||||
- _DetailNormalMapScale: 1
|
- _DetailNormalMapScale: 1
|
||||||
|
|||||||
@ -15,7 +15,7 @@ Material:
|
|||||||
m_InvalidKeywords: []
|
m_InvalidKeywords: []
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 1
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: -1
|
m_CustomRenderQueue: -1
|
||||||
stringTagMap:
|
stringTagMap:
|
||||||
RenderType: Opaque
|
RenderType: Opaque
|
||||||
@ -89,7 +89,7 @@ Material:
|
|||||||
- _BumpScale: 1
|
- _BumpScale: 1
|
||||||
- _ClearCoatMask: 0
|
- _ClearCoatMask: 0
|
||||||
- _ClearCoatSmoothness: 0
|
- _ClearCoatSmoothness: 0
|
||||||
- _Cull: 0
|
- _Cull: 2
|
||||||
- _Cutoff: 0.5
|
- _Cutoff: 0.5
|
||||||
- _DetailAlbedoMapScale: 1
|
- _DetailAlbedoMapScale: 1
|
||||||
- _DetailNormalMapScale: 1
|
- _DetailNormalMapScale: 1
|
||||||
|
|||||||
@ -28,7 +28,7 @@ Material:
|
|||||||
m_InvalidKeywords: []
|
m_InvalidKeywords: []
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 1
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: -1
|
m_CustomRenderQueue: -1
|
||||||
stringTagMap:
|
stringTagMap:
|
||||||
RenderType: Opaque
|
RenderType: Opaque
|
||||||
@ -102,7 +102,7 @@ Material:
|
|||||||
- _BumpScale: 1
|
- _BumpScale: 1
|
||||||
- _ClearCoatMask: 0
|
- _ClearCoatMask: 0
|
||||||
- _ClearCoatSmoothness: 0
|
- _ClearCoatSmoothness: 0
|
||||||
- _Cull: 0
|
- _Cull: 2
|
||||||
- _Cutoff: 0.5
|
- _Cutoff: 0.5
|
||||||
- _DetailAlbedoMapScale: 1
|
- _DetailAlbedoMapScale: 1
|
||||||
- _DetailNormalMapScale: 1
|
- _DetailNormalMapScale: 1
|
||||||
|
|||||||
@ -28,7 +28,7 @@ Material:
|
|||||||
m_InvalidKeywords: []
|
m_InvalidKeywords: []
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 1
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: -1
|
m_CustomRenderQueue: -1
|
||||||
stringTagMap:
|
stringTagMap:
|
||||||
RenderType: Opaque
|
RenderType: Opaque
|
||||||
@ -102,7 +102,7 @@ Material:
|
|||||||
- _BumpScale: 1
|
- _BumpScale: 1
|
||||||
- _ClearCoatMask: 0
|
- _ClearCoatMask: 0
|
||||||
- _ClearCoatSmoothness: 0
|
- _ClearCoatSmoothness: 0
|
||||||
- _Cull: 0
|
- _Cull: 2
|
||||||
- _Cutoff: 0.5
|
- _Cutoff: 0.5
|
||||||
- _DetailAlbedoMapScale: 1
|
- _DetailAlbedoMapScale: 1
|
||||||
- _DetailNormalMapScale: 1
|
- _DetailNormalMapScale: 1
|
||||||
|
|||||||
@ -28,7 +28,7 @@ Material:
|
|||||||
m_InvalidKeywords: []
|
m_InvalidKeywords: []
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 1
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: -1
|
m_CustomRenderQueue: -1
|
||||||
stringTagMap:
|
stringTagMap:
|
||||||
RenderType: Opaque
|
RenderType: Opaque
|
||||||
@ -102,7 +102,7 @@ Material:
|
|||||||
- _BumpScale: 1
|
- _BumpScale: 1
|
||||||
- _ClearCoatMask: 0
|
- _ClearCoatMask: 0
|
||||||
- _ClearCoatSmoothness: 0
|
- _ClearCoatSmoothness: 0
|
||||||
- _Cull: 0
|
- _Cull: 2
|
||||||
- _Cutoff: 0.5
|
- _Cutoff: 0.5
|
||||||
- _DetailAlbedoMapScale: 1
|
- _DetailAlbedoMapScale: 1
|
||||||
- _DetailNormalMapScale: 1
|
- _DetailNormalMapScale: 1
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -38,7 +38,7 @@ RenderSettings:
|
|||||||
m_ReflectionIntensity: 1
|
m_ReflectionIntensity: 1
|
||||||
m_CustomReflection: {fileID: 0}
|
m_CustomReflection: {fileID: 0}
|
||||||
m_Sun: {fileID: 0}
|
m_Sun: {fileID: 0}
|
||||||
m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
|
m_IndirectSpecularColor: {r: 0.12731749, g: 0.13414757, b: 0.1210787, a: 1}
|
||||||
m_UseRadianceAmbientProbe: 0
|
m_UseRadianceAmbientProbe: 0
|
||||||
--- !u!157 &3
|
--- !u!157 &3
|
||||||
LightmapSettings:
|
LightmapSettings:
|
||||||
@ -419,7 +419,6 @@ MonoBehaviour:
|
|||||||
Bg: {fileID: 1183338701}
|
Bg: {fileID: 1183338701}
|
||||||
Common: {fileID: 1449885628}
|
Common: {fileID: 1449885628}
|
||||||
PopUI: {fileID: 2054827731}
|
PopUI: {fileID: 2054827731}
|
||||||
RightBottom: {fileID: 0}
|
|
||||||
CanvasPanel: {fileID: 1167171815}
|
CanvasPanel: {fileID: 1167171815}
|
||||||
--- !u!114 &893691646
|
--- !u!114 &893691646
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -706,26 +705,6 @@ PrefabInstance:
|
|||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
m_TransformParent: {fileID: 744551311}
|
m_TransformParent: {fileID: 744551311}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 1063180806212692488, guid: 7cdfaf99908d99b4698101d27f4ca55b, type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1063180806212692488, guid: 7cdfaf99908d99b4698101d27f4ca55b, type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1063180806212692488, guid: 7cdfaf99908d99b4698101d27f4ca55b, type: 3}
|
|
||||||
propertyPath: m_SizeDelta.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1063180806212692488, guid: 7cdfaf99908d99b4698101d27f4ca55b, type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1063180806212692488, guid: 7cdfaf99908d99b4698101d27f4ca55b, type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2387034669159657042, guid: 7cdfaf99908d99b4698101d27f4ca55b, type: 3}
|
- target: {fileID: 2387034669159657042, guid: 7cdfaf99908d99b4698101d27f4ca55b, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
|
|||||||
@ -25,24 +25,18 @@ namespace XMLTool
|
|||||||
|
|
||||||
public class ImageSelectMapAction : Action
|
public class ImageSelectMapAction : Action
|
||||||
{
|
{
|
||||||
public class Row
|
|
||||||
{
|
|
||||||
public string name = "";
|
|
||||||
public List<Item> items = new List<Item>();
|
|
||||||
|
|
||||||
}
|
|
||||||
public class Item
|
public class Item
|
||||||
{
|
{
|
||||||
public string pic;
|
public string pic;
|
||||||
public string name;
|
public string pos;
|
||||||
|
public string size;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Dictionary<string, string> args = new Dictionary<string, string>();
|
public Dictionary<string, string> args = new Dictionary<string, string>();
|
||||||
public List<Row> rows = new List<Row>();
|
public List<Item> items = new List<Item>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public class DictionaryCondition : Condition
|
public class DictionaryCondition : Condition
|
||||||
{
|
{
|
||||||
public Dictionary<string, string> args = new Dictionary<string, string>();
|
public Dictionary<string, string> args = new Dictionary<string, string>();
|
||||||
|
|||||||
@ -28,10 +28,9 @@ public class ActionHelper
|
|||||||
{ "UITextTip", typeof(QFramework.Example.UITextTip) },
|
{ "UITextTip", typeof(QFramework.Example.UITextTip) },
|
||||||
{ "UITextWindow", typeof(QFramework.Example.UITextWindow) },
|
{ "UITextWindow", typeof(QFramework.Example.UITextWindow) },
|
||||||
{ "UIKnowledge", typeof(QFramework.Example.UIKnowledge) },
|
{ "UIKnowledge", typeof(QFramework.Example.UIKnowledge) },
|
||||||
{ "UIBackPack", typeof(QFramework.Example.UIBackPack) },
|
{ "UIBackPack", typeof(QFramework.Example.UIBackPack) },
|
||||||
{ "UIGuideTip", typeof(QFramework.Example.UIGuideTip) },
|
{ "UIGuideTip", typeof(QFramework.Example.UIGuideTip) },
|
||||||
{ "UISliderAnim", typeof(QFramework.Example.UISliderAnim) },
|
{ "UISliderAnim", typeof(QFramework.Example.UISliderAnim) },
|
||||||
{ "UIBtnAnim", typeof(QFramework.Example.UIBtnAnim) },
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@ -159,7 +158,7 @@ public class ActionHelper
|
|||||||
case "TextTip":
|
case "TextTip":
|
||||||
{
|
{
|
||||||
var strAction = (XMLTool.DictionaryAction)act;
|
var strAction = (XMLTool.DictionaryAction)act;
|
||||||
return TextTipAction.Allocate(act.Value, strAction.args);
|
return TextTipAction.Allocate(act.Value, strAction.args);
|
||||||
}
|
}
|
||||||
case "TextWindow":
|
case "TextWindow":
|
||||||
{
|
{
|
||||||
@ -289,7 +288,7 @@ public class ActionHelper
|
|||||||
case "ImageSelectMap":
|
case "ImageSelectMap":
|
||||||
{
|
{
|
||||||
var dictAction = (XMLTool.ImageSelectMapAction)act;
|
var dictAction = (XMLTool.ImageSelectMapAction)act;
|
||||||
return QFramework.ImageSelectMapAction.Allocate(dictAction.args, dictAction.rows);
|
return QFramework.ImageSelectMapAction.Allocate(dictAction.args, dictAction.items);
|
||||||
}
|
}
|
||||||
case "UIGuideTip":
|
case "UIGuideTip":
|
||||||
{
|
{
|
||||||
@ -312,13 +311,6 @@ public class ActionHelper
|
|||||||
var dictAction = (XMLTool.DictionaryAction)act;
|
var dictAction = (XMLTool.DictionaryAction)act;
|
||||||
return QFramework.BtnsAction.Allocate(dictAction.args);
|
return QFramework.BtnsAction.Allocate(dictAction.args);
|
||||||
|
|
||||||
}
|
|
||||||
case "UIBtnAnim":
|
|
||||||
{
|
|
||||||
|
|
||||||
var dictAction = (XMLTool.DictionaryAction)act;
|
|
||||||
return QFramework.BtnAnimAction.Allocate(dictAction.args);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
Debug.LogError($"ûÓÐÕÒµ½´ËActionµÄÀàÐÍ{act.Type}");
|
Debug.LogError($"ûÓÐÕÒµ½´ËActionµÄÀàÐÍ{act.Type}");
|
||||||
|
|||||||
@ -1,99 +1,91 @@
|
|||||||
|
using DG.Tweening;
|
||||||
using DG.Tweening.Core;
|
using DG.Tweening.Core;
|
||||||
using DG.Tweening.Plugins.Options;
|
using DG.Tweening.Plugins.Options;
|
||||||
using DG.Tweening;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using QFramework;
|
using UnityEngine.Rendering.Universal;
|
||||||
|
using static OperationController;
|
||||||
|
|
||||||
namespace QFramework
|
namespace QFramework
|
||||||
{
|
{
|
||||||
|
internal class AnimationAction : IAction
|
||||||
internal class AnimationAction : IAction
|
|
||||||
{
|
|
||||||
public System.Action OnFinished
|
|
||||||
{
|
{
|
||||||
get; set;
|
|
||||||
}
|
|
||||||
|
|
||||||
private AnimationAction()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
private static readonly SimpleObjectPool<AnimationAction> mPool =
|
public System.Action OnFinished { get; set; }
|
||||||
new SimpleObjectPool<AnimationAction>(() => new AnimationAction(), null, 10);
|
|
||||||
|
|
||||||
string path;
|
|
||||||
string animName;
|
|
||||||
Animation anim;
|
|
||||||
string frame;
|
|
||||||
string speed;
|
|
||||||
string deviceName;
|
|
||||||
|
|
||||||
float totalTime;
|
private AnimationAction()
|
||||||
GameObject obj;
|
|
||||||
|
|
||||||
public static AnimationAction Allocate(string path, Dictionary<string, string> datas, System.Action OnFinished = null)
|
|
||||||
{
|
|
||||||
var retNode = mPool.Allocate();
|
|
||||||
retNode.ActionID = ActionKit.ID_GENERATOR++;
|
|
||||||
retNode.Deinited = false;
|
|
||||||
retNode.Reset();
|
|
||||||
retNode.path = path;
|
|
||||||
retNode.animName = datas.ContainsKey("animName") ? datas["animName"] : "";
|
|
||||||
retNode.frame = datas.ContainsKey("frame") ? datas["frame"] : "";
|
|
||||||
retNode.speed = datas.ContainsKey("speed") ? datas["speed"] : "";
|
|
||||||
retNode.deviceName = datas.ContainsKey("deviceName") ? datas["deviceName"] : "";
|
|
||||||
retNode.OnFinished = OnFinished;
|
|
||||||
return retNode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ulong ActionID
|
|
||||||
{
|
|
||||||
get; set;
|
|
||||||
}
|
|
||||||
public ActionStatus Status
|
|
||||||
{
|
|
||||||
get; set;
|
|
||||||
}
|
|
||||||
TweenerCore<float, float, FloatOptions> animDot;
|
|
||||||
|
|
||||||
public void OnStart()
|
|
||||||
{
|
|
||||||
if (string.IsNullOrEmpty(deviceName))
|
|
||||||
{
|
{
|
||||||
obj = Utility.FindObj(path);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
obj = DeviceController.Instance.GetDeviceObj(deviceName);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (obj != null)
|
private static readonly SimpleObjectPool<AnimationAction> mPool =
|
||||||
|
new SimpleObjectPool<AnimationAction>(() => new AnimationAction(), null, 10);
|
||||||
|
|
||||||
|
|
||||||
|
string path;
|
||||||
|
string animName;
|
||||||
|
Animation anim;
|
||||||
|
string frame;
|
||||||
|
string speed;
|
||||||
|
string deviceName;
|
||||||
|
|
||||||
|
float totalTime;
|
||||||
|
GameObject obj;
|
||||||
|
public static AnimationAction Allocate(string path, Dictionary<string, string> datas, System.Action OnFinished = null)
|
||||||
{
|
{
|
||||||
if (obj.activeSelf == false)
|
var retNode = mPool.Allocate();
|
||||||
|
retNode.ActionID = ActionKit.ID_GENERATOR++;
|
||||||
|
retNode.Deinited = false;
|
||||||
|
retNode.Reset();
|
||||||
|
retNode.path = path;
|
||||||
|
retNode.animName = datas.ContainsKey("animName") ? datas["animName"] : "";
|
||||||
|
retNode.frame = datas.ContainsKey("frame") ? datas["frame"] : "";
|
||||||
|
retNode.speed = datas.ContainsKey("speed") ? datas["speed"] : "";
|
||||||
|
retNode.deviceName = datas.ContainsKey("deviceName") ? datas["deviceName"] : "";
|
||||||
|
retNode.OnFinished = OnFinished;
|
||||||
|
return retNode;
|
||||||
|
}
|
||||||
|
public ulong ActionID { get; set; }
|
||||||
|
public ActionStatus Status { get; set; }
|
||||||
|
TweenerCore<float, float, FloatOptions> animDot;
|
||||||
|
public void OnStart()
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(deviceName))
|
||||||
{
|
{
|
||||||
Debug.LogError(obj.name + "当前是隐藏状态");
|
obj = Utility.FindObj(path);
|
||||||
this.Finish();
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
try
|
obj = DeviceController.Instance.GetDeviceObj(deviceName);
|
||||||
|
}
|
||||||
|
if (obj != null)
|
||||||
|
{
|
||||||
|
if (obj.activeSelf == false)
|
||||||
{
|
{
|
||||||
anim = obj.GetComponent<Animation>();
|
Debug.LogError(obj.name + "当前是隐藏状态");
|
||||||
|
this.Finish();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
anim = obj.GetComponent<Animation>();
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(frame) == false && frame != "-1")
|
if (string.IsNullOrEmpty(frame) == false && frame != "-1")
|
||||||
{
|
{
|
||||||
int curFrame = 0;
|
int curFrame = 0;
|
||||||
int.TryParse(frame, out curFrame);
|
int.TryParse(frame, out curFrame);
|
||||||
anim.clip = anim[animName].clip;
|
anim.clip = anim[animName].clip;
|
||||||
anim[animName].time = curFrame / anim.clip.frameRate;
|
anim[animName].time = curFrame / anim.clip.frameRate;
|
||||||
anim.Play(animName);
|
anim.Play(animName);
|
||||||
anim[animName].speed = 0;
|
anim[animName].speed = 0;
|
||||||
anim.Sample();
|
anim.Sample();
|
||||||
this.Finish();
|
this.Finish();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
float curSpeed = 1;
|
float curSpeed = 1;
|
||||||
if (string.IsNullOrEmpty(speed) == false)
|
if (string.IsNullOrEmpty(speed) == false)
|
||||||
{
|
{
|
||||||
@ -103,135 +95,84 @@ internal class AnimationAction : IAction
|
|||||||
if (curSpeed < 0)
|
if (curSpeed < 0)
|
||||||
{
|
{
|
||||||
anim.Play(animName);
|
anim.Play(animName);
|
||||||
anim[animName].normalizedTime = 1; // 从动画末尾开始
|
anim[animName].normalizedTime = 1;
|
||||||
|
animDot = DOTween.To(() => anim[animName].normalizedTime, v => anim[animName].normalizedTime = v, 0, anim[animName].length / Math.Abs(curSpeed));
|
||||||
// 计算倒播所需时间
|
|
||||||
float duration = anim[animName].length / Math.Abs(curSpeed);
|
|
||||||
|
|
||||||
animDot = DOTween.To(
|
|
||||||
() => anim[animName].normalizedTime,
|
|
||||||
v => anim[animName].normalizedTime = v,
|
|
||||||
0, // 倒播到动画开始
|
|
||||||
duration
|
|
||||||
);
|
|
||||||
|
|
||||||
animDot.onComplete = () =>
|
animDot.onComplete = () =>
|
||||||
{
|
{
|
||||||
anim.Stop();
|
anim.Stop();
|
||||||
this.Finish(); // 关键修改：添加完成调用
|
|
||||||
};
|
};
|
||||||
|
|
||||||
totalTime = duration; // 设置总时间为动画播放时长
|
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
|
||||||
anim[animName].speed = curSpeed;
|
|
||||||
anim.Play(animName);
|
|
||||||
|
|
||||||
totalTime = Math.Abs(anim[animName].length / curSpeed);
|
|
||||||
|
|
||||||
// 处理循环动画
|
|
||||||
if (anim[animName].wrapMode == WrapMode.Loop)
|
|
||||||
{
|
{
|
||||||
// 示例：循环播放10秒后结束
|
anim[animName].speed = curSpeed;
|
||||||
totalTime = 10f;
|
anim.Play(animName);
|
||||||
|
if (anim[animName].wrapMode == WrapMode.Loop)
|
||||||
|
{
|
||||||
|
this.Finish();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
totalTime = Math.Abs(anim[animName].length / curSpeed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
anim = obj.GetComponent<Animation>();
|
||||||
|
Debug.LogError($"{path} 播放动画 {animName} 出错");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (Exception)
|
|
||||||
{
|
|
||||||
anim = obj.GetComponent<Animation>();
|
|
||||||
Debug.LogError($"{path} 播放动画 {animName} 出错");
|
|
||||||
this.Finish();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Debug.LogError("未找到路径：" + path);
|
|
||||||
this.Finish();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public void OnExecute(float dt)
|
|
||||||
{
|
|
||||||
//if (Status != ActionStatus.NotStart) return;
|
|
||||||
|
|
||||||
totalTime -= dt;
|
|
||||||
// 新增：处理倒播动画的完成检测
|
|
||||||
if (anim != null && animDot != null && !animDot.IsPlaying())
|
|
||||||
{
|
|
||||||
this.Finish();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (anim != null)
|
|
||||||
{
|
|
||||||
// 非循环动画判断
|
|
||||||
if (anim[animName].wrapMode != WrapMode.Loop)
|
|
||||||
{
|
|
||||||
if (!anim.isPlaying || totalTime <= 0)
|
|
||||||
{
|
|
||||||
this.Finish();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 循环动画判断（基于总时间）
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (totalTime <= 0)
|
Debug.LogError("未找到路径：" + path);
|
||||||
{
|
this.Finish();
|
||||||
anim.Stop(animName);
|
|
||||||
this.Finish();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
|
|
||||||
|
public void OnExecute(float dt)
|
||||||
{
|
{
|
||||||
this.Finish();
|
totalTime -= Time.deltaTime;
|
||||||
}
|
if (anim != null && (anim.isPlaying == false || totalTime <= 0))
|
||||||
}
|
|
||||||
|
|
||||||
public void OnFinish()
|
|
||||||
{
|
|
||||||
// Debug.Log("调用这个AnimActionfinish");
|
|
||||||
OnFinished?.Invoke(); // 触发外部回调
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Reset()
|
|
||||||
{
|
|
||||||
Status = ActionStatus.NotStart;
|
|
||||||
Paused = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool Paused
|
|
||||||
{
|
|
||||||
get; set;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Deinit()
|
|
||||||
{
|
|
||||||
if (!Deinited)
|
|
||||||
{
|
|
||||||
if (obj != null && anim != null)
|
|
||||||
{
|
{
|
||||||
anim.Stop();
|
this.Finish();
|
||||||
}
|
}
|
||||||
animDot?.Kill();
|
|
||||||
OnFinished = null;
|
|
||||||
Deinited = true;
|
|
||||||
obj = null;
|
|
||||||
mPool.Recycle(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void OnFinish()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Reset()
|
||||||
|
{
|
||||||
|
Status = ActionStatus.NotStart;
|
||||||
|
Paused = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool Paused { get; set; }
|
||||||
|
|
||||||
|
public void Deinit()
|
||||||
|
{
|
||||||
|
if (!Deinited)
|
||||||
|
{
|
||||||
|
if (obj != null)
|
||||||
|
{
|
||||||
|
if (anim!=null)
|
||||||
|
{
|
||||||
|
anim.Stop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
animDot?.Kill();
|
||||||
|
OnFinished = null;
|
||||||
|
Deinited = true;
|
||||||
|
obj = null;
|
||||||
|
mPool.Recycle(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool Deinited { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool Deinited
|
|
||||||
{
|
|
||||||
get; set;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@ -1,95 +0,0 @@
|
|||||||
using QFramework;
|
|
||||||
using QFramework.Example;
|
|
||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using UnityEngine;
|
|
||||||
namespace QFramework
|
|
||||||
{
|
|
||||||
|
|
||||||
public class BtnAnimAction: IAction
|
|
||||||
{
|
|
||||||
public System.Action OnFinished
|
|
||||||
{
|
|
||||||
get; set;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ulong ActionID
|
|
||||||
{
|
|
||||||
get; set;
|
|
||||||
}
|
|
||||||
public ActionStatus Status
|
|
||||||
{
|
|
||||||
get; set;
|
|
||||||
}
|
|
||||||
public bool Deinited
|
|
||||||
{
|
|
||||||
get; set;
|
|
||||||
}
|
|
||||||
public bool Paused
|
|
||||||
{
|
|
||||||
get; set;
|
|
||||||
}
|
|
||||||
|
|
||||||
private BtnAnimAction()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
private static readonly SimpleObjectPool<BtnAnimAction> mPool =
|
|
||||||
new SimpleObjectPool<BtnAnimAction>(() => new(), null, 10);
|
|
||||||
Dictionary<string, string> datas;
|
|
||||||
|
|
||||||
public static BtnAnimAction Allocate(Dictionary<string, string> datas, System.Action onDelayFinish = null)
|
|
||||||
{
|
|
||||||
var retNode = mPool.Allocate();
|
|
||||||
retNode.ActionID = ActionKit.ID_GENERATOR++;
|
|
||||||
retNode.Deinited = false;
|
|
||||||
retNode.Reset();
|
|
||||||
retNode.datas = datas;
|
|
||||||
return retNode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Deinit()
|
|
||||||
{
|
|
||||||
if (!Deinited)
|
|
||||||
{
|
|
||||||
Deinited = true;
|
|
||||||
mPool.Recycle(this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OnExecute(float dt)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OnFinish()
|
|
||||||
{
|
|
||||||
// Debug.Log("Action OnFinish???");
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OnStart()
|
|
||||||
{
|
|
||||||
UIBtnAnimData data = new UIBtnAnimData();
|
|
||||||
|
|
||||||
data.title = datas.ContainsKey("title") ? datas["title"] : string.Empty;
|
|
||||||
|
|
||||||
data.Obj = datas.ContainsKey("Obj") ? datas["Obj"] : string.Empty;
|
|
||||||
data.AnimObj = datas.ContainsKey("AnimObj") ? datas["AnimObj"] : string.Empty;
|
|
||||||
|
|
||||||
data.size = datas.ContainsKey("size") ? datas["size"] : string.Empty;
|
|
||||||
data.pos = datas.ContainsKey("pos") ? datas["pos"] : string.Empty;
|
|
||||||
data.animName = datas.ContainsKey("animName") ? datas["animName"] : string.Empty;
|
|
||||||
|
|
||||||
UIKit.OpenPanelAsync<UIBtnAnim>(uiData: data, canvasLevel: UILevel.Common).ToAction().StartGlobal(() =>
|
|
||||||
{
|
|
||||||
this.Finish();
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Reset()
|
|
||||||
{
|
|
||||||
Status = ActionStatus.NotStart;
|
|
||||||
Paused = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 333f1ad89a77c0b41aabd4f7a8e16630
|
|
||||||
MonoImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 2
|
|
||||||
defaultReferences: []
|
|
||||||
executionOrder: 0
|
|
||||||
icon: {instanceID: 0}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@ -21,14 +21,14 @@ namespace QFramework
|
|||||||
private static readonly SimpleObjectPool<ImageSelectMapAction> mPool =
|
private static readonly SimpleObjectPool<ImageSelectMapAction> mPool =
|
||||||
new SimpleObjectPool<ImageSelectMapAction>(() => new ImageSelectMapAction(), null, 10);
|
new SimpleObjectPool<ImageSelectMapAction>(() => new ImageSelectMapAction(), null, 10);
|
||||||
Dictionary<string, string> datas;
|
Dictionary<string, string> datas;
|
||||||
List<XMLTool.ImageSelectMapAction.Row> rows;
|
List<XMLTool.ImageSelectMapAction.Item> items;
|
||||||
public static ImageSelectMapAction Allocate(Dictionary<string, string> datas, List<XMLTool.ImageSelectMapAction.Row> rows, System.Action OnFinished = null)
|
public static ImageSelectMapAction Allocate(Dictionary<string, string> datas, List<XMLTool.ImageSelectMapAction.Item> items, System.Action OnFinished = null)
|
||||||
{
|
{
|
||||||
var retNode = mPool.Allocate();
|
var retNode = mPool.Allocate();
|
||||||
retNode.ActionID = ActionKit.ID_GENERATOR++;
|
retNode.ActionID = ActionKit.ID_GENERATOR++;
|
||||||
retNode.Deinited = false;
|
retNode.Deinited = false;
|
||||||
retNode.datas = datas;
|
retNode.datas = datas;
|
||||||
retNode.rows = rows;
|
retNode.items = items;
|
||||||
retNode.Reset();
|
retNode.Reset();
|
||||||
retNode.OnFinished = OnFinished;
|
retNode.OnFinished = OnFinished;
|
||||||
return retNode;
|
return retNode;
|
||||||
@ -61,31 +61,19 @@ namespace QFramework
|
|||||||
data.rightLabel = datas.ContainsKey("rightLabel") ? datas["rightLabel"] : "";
|
data.rightLabel = datas.ContainsKey("rightLabel") ? datas["rightLabel"] : "";
|
||||||
data.wrongLabel = datas.ContainsKey("wrongLabel") ? datas["wrongLabel"] : "";
|
data.wrongLabel = datas.ContainsKey("wrongLabel") ? datas["wrongLabel"] : "";
|
||||||
data.finishedEvent = datas.ContainsKey("finishedEvent") ? datas["finishedEvent"] : "";
|
data.finishedEvent = datas.ContainsKey("finishedEvent") ? datas["finishedEvent"] : "";
|
||||||
if (datas.ContainsKey("random"))
|
data.rightBg = datas.ContainsKey("rightBg") ? datas["rightBg"] : "";
|
||||||
{
|
|
||||||
bool.TryParse(datas["random"], out data.random);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
data.random = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var rowItem in rows)
|
foreach (var item in items)
|
||||||
{
|
{
|
||||||
var row = new UIImageSelectMapData.Row();
|
data.items.Add(new UIImageSelectMapData.OptionItem()
|
||||||
row.name = rowItem.name;
|
|
||||||
data.rows.Add(row);
|
|
||||||
foreach (var item in rowItem.items)
|
|
||||||
{
|
{
|
||||||
row.items.Add(new UIImageSelectMapData.OptionItem()
|
pic = item.pic,
|
||||||
{
|
pos = Utility.GetVector2FromStrArray(item.pos),
|
||||||
pic = item.pic,
|
size = Utility.GetVector2FromStrArray(item.size)
|
||||||
name = item.name
|
});
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
UIKit.OpenPanelAsync<UIImageSelectMap>(uiData: data).ToAction().StartGlobal(() =>
|
UIKit.OpenPanelAsync<UIImageSelectMap>(uiData: data, canvasLevel: UILevel.PopUI).ToAction().StartGlobal(() =>
|
||||||
{
|
{
|
||||||
|
|
||||||
this.Finish();
|
this.Finish();
|
||||||
|
|||||||
@ -50,7 +50,7 @@ namespace QFramework.Example
|
|||||||
Vector2 sizeData = Utility.GetVector2FromStrArray(size[j]);
|
Vector2 sizeData = Utility.GetVector2FromStrArray(size[j]);
|
||||||
obj.transform.Find("Label").GetComponent<TextMeshProUGUI>().text= btnnames[j];
|
obj.transform.Find("Label").GetComponent<TextMeshProUGUI>().text= btnnames[j];
|
||||||
obj.GetComponent<RectTransform>().sizeDelta = sizeData;
|
obj.GetComponent<RectTransform>().sizeDelta = sizeData;
|
||||||
obj.GetComponent<RectTransform>().localPosition = positem;
|
obj.GetComponent<RectTransform>().position = positem;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
9
Assets/Scripts/UI/UIImageSelectMap.Designer.cs
generated
9
Assets/Scripts/UI/UIImageSelectMap.Designer.cs
generated
@ -5,7 +5,7 @@ using QFramework;
|
|||||||
|
|
||||||
namespace QFramework.Example
|
namespace QFramework.Example
|
||||||
{
|
{
|
||||||
// Generate Id:ee191ed8-359d-4628-aa2b-d1711157540d
|
// Generate Id:b499f0f9-a71b-40ff-a499-a5e4defad39f
|
||||||
public partial class UIImageSelectMap
|
public partial class UIImageSelectMap
|
||||||
{
|
{
|
||||||
public const string Name = "UIImageSelectMap";
|
public const string Name = "UIImageSelectMap";
|
||||||
@ -13,23 +13,20 @@ namespace QFramework.Example
|
|||||||
[SerializeField]
|
[SerializeField]
|
||||||
public RectTransform LeftContent;
|
public RectTransform LeftContent;
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
public RectTransform RightContent;
|
|
||||||
[SerializeField]
|
|
||||||
public UnityEngine.UI.Image LeftItem;
|
public UnityEngine.UI.Image LeftItem;
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
public UnityEngine.UI.Image RightItem;
|
public UnityEngine.UI.Image RightItem;
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
public RectTransform RightRowItem;
|
public RectTransform RightContent;
|
||||||
|
|
||||||
private UIImageSelectMapData mPrivateData = null;
|
private UIImageSelectMapData mPrivateData = null;
|
||||||
|
|
||||||
protected override void ClearUIComponents()
|
protected override void ClearUIComponents()
|
||||||
{
|
{
|
||||||
LeftContent = null;
|
LeftContent = null;
|
||||||
RightContent = null;
|
|
||||||
LeftItem = null;
|
LeftItem = null;
|
||||||
RightItem = null;
|
RightItem = null;
|
||||||
RightRowItem = null;
|
RightContent = null;
|
||||||
|
|
||||||
mData = null;
|
mData = null;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,8 +4,6 @@ using QFramework;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using UnityEngine.EventSystems;
|
using UnityEngine.EventSystems;
|
||||||
using System;
|
using System;
|
||||||
using TMPro;
|
|
||||||
using System.Xml;
|
|
||||||
|
|
||||||
namespace QFramework.Example
|
namespace QFramework.Example
|
||||||
{
|
{
|
||||||
@ -14,12 +12,8 @@ namespace QFramework.Example
|
|||||||
public class OptionItem
|
public class OptionItem
|
||||||
{
|
{
|
||||||
public string pic;
|
public string pic;
|
||||||
public string name;
|
public Vector2 pos;
|
||||||
}
|
public Vector2 size;
|
||||||
public class Row
|
|
||||||
{
|
|
||||||
public string name;
|
|
||||||
public List<OptionItem> items = new List<OptionItem>();
|
|
||||||
}
|
}
|
||||||
public string scoreName;
|
public string scoreName;
|
||||||
public float totalScore;
|
public float totalScore;
|
||||||
@ -28,30 +22,22 @@ namespace QFramework.Example
|
|||||||
public string rightLabel;
|
public string rightLabel;
|
||||||
public string wrongLabel;
|
public string wrongLabel;
|
||||||
public string finishedEvent;
|
public string finishedEvent;
|
||||||
public bool random = false;
|
public string rightBg;
|
||||||
public List<Row> rows = new List<Row>();
|
public List<OptionItem> items = new List<OptionItem>();
|
||||||
|
|
||||||
}
|
}
|
||||||
public partial class UIImageSelectMap : UIPanel
|
public partial class UIImageSelectMap : UIPanel
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// ÓÒ²àÊý¾Ý½á¹¹
|
|
||||||
/// </summary>
|
|
||||||
class RightDataItem
|
|
||||||
{
|
|
||||||
public GameObject rightObj;
|
|
||||||
public bool isRight = false;
|
|
||||||
}
|
|
||||||
ResLoader loader;
|
ResLoader loader;
|
||||||
GameObject moveObj;
|
GameObject moveObj;
|
||||||
GameObject enterRight;
|
GameObject enterRight;
|
||||||
GameObject leftDragObj;
|
GameObject leftDragObj;
|
||||||
Dictionary<GameObject, UIImageSelectMapData.OptionItem> itemDatas = new Dictionary<GameObject, UIImageSelectMapData.OptionItem>();
|
Dictionary<GameObject, UIImageSelectMapData.OptionItem> itemDatas = new Dictionary<GameObject, UIImageSelectMapData.OptionItem>();
|
||||||
Dictionary<GameObject, RightDataItem> leftAndRightMap = new Dictionary<GameObject, RightDataItem>();
|
|
||||||
|
Dictionary<GameObject, GameObject> leftObjAndRightObj = new Dictionary<GameObject, GameObject>();
|
||||||
protected override void OnInit(IUIData uiData = null)
|
protected override void OnInit(IUIData uiData = null)
|
||||||
{
|
{
|
||||||
mData = uiData as UIImageSelectMapData ?? new UIImageSelectMapData();
|
mData = uiData as UIImageSelectMapData ?? new UIImageSelectMapData();
|
||||||
TypeEventSystem.Global.Register<OnModuleQuit>(OnModuleQuitHandler);
|
|
||||||
// please add init code here
|
// please add init code here
|
||||||
loader = ResLoader.Allocate();
|
loader = ResLoader.Allocate();
|
||||||
}
|
}
|
||||||
@ -59,50 +45,49 @@ namespace QFramework.Example
|
|||||||
protected override void OnOpen(IUIData uiData = null)
|
protected override void OnOpen(IUIData uiData = null)
|
||||||
{
|
{
|
||||||
mData = uiData as UIImageSelectMapData ?? new UIImageSelectMapData();
|
mData = uiData as UIImageSelectMapData ?? new UIImageSelectMapData();
|
||||||
|
|
||||||
LeftContent.RemoveAllChildren();
|
LeftContent.RemoveAllChildren();
|
||||||
RightContent.RemoveAllChildren();
|
RightContent.RemoveAllChildren();
|
||||||
itemDatas.Clear();
|
itemDatas.Clear();
|
||||||
leftAndRightMap.Clear();
|
leftObjAndRightObj.Clear();
|
||||||
|
foreach (var item in mData.items)
|
||||||
foreach (var row in mData.rows)
|
|
||||||
{
|
{
|
||||||
GameObject rowObj = GameObject.Instantiate(RightRowItem.gameObject, RightContent);
|
var leftObj = GameObject.Instantiate(LeftItem, LeftContent);
|
||||||
rowObj.transform.Find("Type").GetComponent<TextMeshProUGUI>().text = row.name.Replace("\\n", "\n");
|
leftObj.name = item.pic;
|
||||||
Transform itemContent = rowObj.transform.Find("Items");
|
var path = Global.imagePath + item.pic;
|
||||||
foreach (var item in row.items)
|
loader.Add2Load(path.ToNetImageResName(), (success, res) =>
|
||||||
{
|
{
|
||||||
var rightObj = GameObject.Instantiate(RightItem, itemContent);
|
if (success)
|
||||||
var nameText = rightObj.transform.Find("Name").GetComponent<TextMeshProUGUI>();
|
|
||||||
nameText.text = item.name;
|
|
||||||
nameText.color = Color.white;
|
|
||||||
rightObj.name = item.pic;
|
|
||||||
rightObj.transform.Find("PicBg/Pic").GetComponent<Image>().color = new Color(1, 1, 1, 0);
|
|
||||||
rightObj.OnPointerEnterEvent(RightOnEnter);
|
|
||||||
rightObj.OnPointerExitEvent(RightOnExit);
|
|
||||||
rightObj.OnPointerClickEvent(RightOnClick);
|
|
||||||
|
|
||||||
var leftObj = GameObject.Instantiate(LeftItem, LeftContent);
|
|
||||||
leftObj.name = item.pic;
|
|
||||||
var path = Global.deviceIconsPath + item.pic;
|
|
||||||
loader.Add2Load(path.ToNetImageResName(), (success, res) =>
|
|
||||||
{
|
{
|
||||||
if (success)
|
leftObj.transform.Find("Pic").GetComponent<Image>().sprite = Utility.GetSprite(res.Asset as Texture2D);
|
||||||
{
|
}
|
||||||
leftObj.GetComponent<Image>().sprite = Utility.GetSprite(res.Asset as Texture2D);
|
});
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
leftObj.OnBeginDragEvent(LeftOnBeginDrag);
|
leftObj.OnBeginDragEvent(LeftOnBeginDrag);
|
||||||
leftObj.OnDragEvent(LeftOnDrag);
|
leftObj.OnDragEvent(LeftOnDrag);
|
||||||
leftObj.OnEndDragEvent(LeftOnEndDrag);
|
leftObj.OnEndDragEvent(LeftOnEndDrag);
|
||||||
itemDatas.Add(leftObj.gameObject, item);
|
itemDatas.Add(leftObj.gameObject, item);
|
||||||
}
|
|
||||||
|
var rightObj = GameObject.Instantiate(RightItem, RightContent);
|
||||||
|
rightObj.name = item.pic;
|
||||||
|
rightObj.rectTransform.anchoredPosition = item.pos;
|
||||||
|
rightObj.rectTransform.sizeDelta = item.size;
|
||||||
|
rightObj.OnPointerEnterEvent(RightOnEnter);
|
||||||
|
rightObj.OnPointerExitEvent(RightOnExit);
|
||||||
|
rightObj.OnPointerClickEvent(RightOnClick);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mData.random)
|
|
||||||
|
|
||||||
|
var rightBgPath = Global.imagePath + mData.rightBg;
|
||||||
|
loader.Add2Load(rightBgPath.ToNetImageResName(), (success, res) =>
|
||||||
{
|
{
|
||||||
Utility.ShuffleChildObjects(LeftContent);
|
if (success)
|
||||||
}
|
{
|
||||||
|
RightContent.GetComponent<Image>().sprite = Utility.GetSprite(res.Asset as Texture2D);
|
||||||
|
RightContent.GetComponent<Image>().SetNativeSize();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
loader.LoadAsync();
|
loader.LoadAsync();
|
||||||
|
|
||||||
@ -110,29 +95,27 @@ namespace QFramework.Example
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnModuleQuitHandler(OnModuleQuit quit)
|
|
||||||
{
|
|
||||||
Hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void RightOnClick(PointerEventData data)
|
private void RightOnClick(PointerEventData data)
|
||||||
{
|
{
|
||||||
Transform trans = data.pointerClick.transform;
|
Transform trans = data.pointerClick.transform;
|
||||||
if (leftAndRightMap.ContainsKey(trans.gameObject))
|
if (trans.childCount > 0)
|
||||||
{
|
{
|
||||||
leftAndRightMap[trans.gameObject].rightObj.SetActive(true);
|
var child = trans.GetChild(0).gameObject;
|
||||||
trans.GetComponent<Image>().color = Color.white;
|
if (leftObjAndRightObj.ContainsKey(child))
|
||||||
trans.Find("PicBg/Pic").GetComponent<Image>().color = new Color(1, 1, 1, 0);
|
{
|
||||||
|
leftObjAndRightObj[child].SetActive(true);
|
||||||
|
leftObjAndRightObj.Remove(child);
|
||||||
|
GameObject.Destroy(child);
|
||||||
|
trans.GetComponent<Image>().color = new Color(1, 1, 1, 0);
|
||||||
|
|
||||||
enterRight.transform.Find("Name").GetComponent<TextMeshProUGUI>().color = Color.white;
|
}
|
||||||
leftAndRightMap.Remove(trans.gameObject);
|
else
|
||||||
|
{
|
||||||
|
Debug.LogError("没有找到对应的左边物体");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private void RightOnExit(PointerEventData data)
|
private void RightOnExit(PointerEventData data)
|
||||||
{
|
{
|
||||||
enterRight = null;
|
enterRight = null;
|
||||||
@ -155,52 +138,29 @@ namespace QFramework.Example
|
|||||||
|
|
||||||
private void LeftOnEndDrag(PointerEventData data)
|
private void LeftOnEndDrag(PointerEventData data)
|
||||||
{
|
{
|
||||||
if (enterRight && leftAndRightMap.ContainsKey(enterRight) == false)
|
if (enterRight)
|
||||||
{
|
{
|
||||||
TextMeshProUGUI nameText = enterRight.transform.Find("Name").GetComponent<TextMeshProUGUI>();
|
|
||||||
bool isRight = false;
|
|
||||||
if (enterRight.name == itemDatas[leftDragObj].pic)
|
if (enterRight.name == itemDatas[leftDragObj].pic)
|
||||||
{
|
{
|
||||||
nameText.color = Color.green;
|
Debug.LogError("正确");
|
||||||
isRight = true;
|
enterRight.GetComponent<Image>().color = Color.green;
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
nameText.color = Color.red;
|
Debug.LogError("错误");
|
||||||
|
enterRight.GetComponent<Image>().color = Color.red;
|
||||||
}
|
}
|
||||||
Image img = enterRight.transform.Find("PicBg/Pic").GetComponent<Image>();
|
moveObj.transform.parent = enterRight.transform;
|
||||||
img.sprite = moveObj.GetComponent<Image>().sprite;
|
moveObj.transform.localPosition = Vector3.zero;
|
||||||
img.color = Color.white;
|
leftObjAndRightObj.Add(moveObj, leftDragObj);
|
||||||
//nameText.text = itemDatas[leftDragObj].name;
|
|
||||||
leftAndRightMap.Add(enterRight, new RightDataItem() { rightObj = leftDragObj, isRight = isRight });
|
|
||||||
leftDragObj.SetActive(false);
|
leftDragObj.SetActive(false);
|
||||||
|
|
||||||
if (isRight && Check())
|
|
||||||
{
|
|
||||||
if (string.IsNullOrEmpty(mData.finishedEvent) == false)
|
|
||||||
{
|
|
||||||
StringEventSystem.Global.Send(mData.finishedEvent);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
GameObject.Destroy(moveObj);
|
else
|
||||||
moveObj = null;
|
|
||||||
leftDragObj = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool Check()
|
|
||||||
{
|
|
||||||
foreach (var item in leftAndRightMap)
|
|
||||||
{
|
{
|
||||||
if (item.Value.isRight == false)
|
GameObject.Destroy(moveObj);
|
||||||
{
|
moveObj = null;
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return leftAndRightMap.Count == itemDatas.Count;
|
leftDragObj = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void LeftOnDrag(PointerEventData data)
|
private void LeftOnDrag(PointerEventData data)
|
||||||
@ -223,7 +183,6 @@ namespace QFramework.Example
|
|||||||
|
|
||||||
protected override void OnClose()
|
protected override void OnClose()
|
||||||
{
|
{
|
||||||
TypeEventSystem.Global.UnRegister<OnModuleQuit>(OnModuleQuitHandler);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -68,7 +68,7 @@ namespace QFramework.Example
|
|||||||
Content.rectTransform.anchorMax = new Vector2(0, 0.5f); // 右上锚点（右侧）
|
Content.rectTransform.anchorMax = new Vector2(0, 0.5f); // 右上锚点（右侧）
|
||||||
|
|
||||||
// 将位置偏移归零（相对于锚点）
|
// 将位置偏移归零（相对于锚点）
|
||||||
//Content.rectTransform.anchoredPosition = Vector2.zero;
|
Content.rectTransform.anchoredPosition = Vector2.zero;
|
||||||
|
|
||||||
// 可选：设置轴心点为右侧中点（影响缩放/旋转中心）
|
// 可选：设置轴心点为右侧中点（影响缩放/旋转中心）
|
||||||
Content.rectTransform.pivot = new Vector2(0, 0.5f);
|
Content.rectTransform.pivot = new Vector2(0, 0.5f);
|
||||||
@ -80,7 +80,7 @@ namespace QFramework.Example
|
|||||||
Content.rectTransform.anchorMax = new Vector2(1, 0.5f); // 右上锚点（右侧）
|
Content.rectTransform.anchorMax = new Vector2(1, 0.5f); // 右上锚点（右侧）
|
||||||
|
|
||||||
// 将位置偏移归零（相对于锚点）
|
// 将位置偏移归零（相对于锚点）
|
||||||
//Content.rectTransform.anchoredPosition = Vector2.zero;
|
Content.rectTransform.anchoredPosition = Vector2.zero;
|
||||||
|
|
||||||
// 可选：设置轴心点为右侧中点（影响缩放/旋转中心）
|
// 可选：设置轴心点为右侧中点（影响缩放/旋转中心）
|
||||||
Content.rectTransform.pivot = new Vector2(1, 0.5f);
|
Content.rectTransform.pivot = new Vector2(1, 0.5f);
|
||||||
@ -94,9 +94,7 @@ namespace QFramework.Example
|
|||||||
|
|
||||||
protected override void OnHide()
|
protected override void OnHide()
|
||||||
{
|
{
|
||||||
|
}
|
||||||
AudioKit.StopMusic();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnClose()
|
protected override void OnClose()
|
||||||
{
|
{
|
||||||
|
|||||||
49
Assets/Scripts/UIGuidTip/UIBtnAnim.Designer.cs
generated
49
Assets/Scripts/UIGuidTip/UIBtnAnim.Designer.cs
generated
@ -1,49 +0,0 @@
|
|||||||
using System;
|
|
||||||
using UnityEngine;
|
|
||||||
using UnityEngine.UI;
|
|
||||||
using QFramework;
|
|
||||||
|
|
||||||
namespace QFramework.Example
|
|
||||||
{
|
|
||||||
// Generate Id:fe326530-5d83-4f69-9f45-dd5b7e7e8ab0
|
|
||||||
public partial class UIBtnAnim
|
|
||||||
{
|
|
||||||
public const string Name = "UIBtnAnim";
|
|
||||||
|
|
||||||
[SerializeField]
|
|
||||||
public RectTransform Connet;
|
|
||||||
[SerializeField]
|
|
||||||
public UnityEngine.UI.Button Button;
|
|
||||||
|
|
||||||
private UIBtnAnimData mPrivateData = null;
|
|
||||||
|
|
||||||
protected override void ClearUIComponents()
|
|
||||||
{
|
|
||||||
Connet = null;
|
|
||||||
Button = null;
|
|
||||||
|
|
||||||
mData = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public UIBtnAnimData Data
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return mData;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
UIBtnAnimData mData
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return mPrivateData ?? (mPrivateData = new UIBtnAnimData());
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
mUIData = value;
|
|
||||||
mPrivateData = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: f2a3ee86444171243a69fd6d52f2924f
|
|
||||||
MonoImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 2
|
|
||||||
defaultReferences: []
|
|
||||||
executionOrder: 0
|
|
||||||
icon: {instanceID: 0}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@ -1,133 +0,0 @@
|
|||||||
using UnityEngine;
|
|
||||||
using UnityEngine.UI;
|
|
||||||
using QFramework;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using static OperationController;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Xml.Linq;
|
|
||||||
|
|
||||||
namespace QFramework.Example
|
|
||||||
{
|
|
||||||
public class UIBtnAnimData : UIPanelData
|
|
||||||
{
|
|
||||||
public String title;
|
|
||||||
|
|
||||||
public String Obj;
|
|
||||||
public String AnimObj;
|
|
||||||
public String size;
|
|
||||||
|
|
||||||
public String pos;
|
|
||||||
|
|
||||||
public String animName;
|
|
||||||
|
|
||||||
}
|
|
||||||
public partial class UIBtnAnim : UIPanel
|
|
||||||
{
|
|
||||||
protected override void OnInit(IUIData uiData = null)
|
|
||||||
{
|
|
||||||
mData = uiData as UIBtnAnimData ?? new UIBtnAnimData();
|
|
||||||
// please add init code here
|
|
||||||
TypeEventSystem.Global.Register<OnModuleQuit>((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
|
|
||||||
}
|
|
||||||
private void OnStepChanged(StepStatusOnChange change)
|
|
||||||
{
|
|
||||||
Hide();
|
|
||||||
}
|
|
||||||
protected override void OnOpen(IUIData uiData = null)
|
|
||||||
{
|
|
||||||
TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged).UnRegisterWhenDisabled(gameObject);
|
|
||||||
|
|
||||||
|
|
||||||
mData = uiData as UIBtnAnimData ?? new UIBtnAnimData();
|
|
||||||
|
|
||||||
|
|
||||||
List<String> title = mData.title.Split('|')?.ToList();
|
|
||||||
List<String> Obj = mData.Obj.Split('|')?.ToList();
|
|
||||||
List<String> targetObj = mData.AnimObj.Split('|')?.ToList();
|
|
||||||
List<String> size = mData.size.Split('|')?.ToList();
|
|
||||||
List<String> pos = mData.pos.Split('|')?.ToList();
|
|
||||||
|
|
||||||
for (int i = 0; i < title.Count; i++)
|
|
||||||
{
|
|
||||||
|
|
||||||
int j = i;
|
|
||||||
|
|
||||||
GameObject ButtonItemObj = GameObject.Instantiate(Button.gameObject, Connet);
|
|
||||||
ButtonItemObj.name = title[i];
|
|
||||||
|
|
||||||
Vector2 positem = Utility.GetVector2FromStrArray(pos[j]);
|
|
||||||
Vector2 sizeData = Utility.GetVector2FromStrArray(size[j]);
|
|
||||||
|
|
||||||
ButtonItemObj.GetComponent<RectTransform>().sizeDelta = sizeData;
|
|
||||||
ButtonItemObj.GetComponent<RectTransform>().localPosition = positem;
|
|
||||||
GameObject obj = Utility.FindObj(Obj[j]);
|
|
||||||
|
|
||||||
GameObject AnimObj = Utility.FindObj(targetObj[j]);
|
|
||||||
|
|
||||||
AnimObj.GetComponent<Animation>();
|
|
||||||
|
|
||||||
ButtonItemObj.transform.Find("TitleText").GetComponent<Text>().text = title[j];
|
|
||||||
ButtonItemObj.transform.GetComponent<Button>().onClick.RemoveAllListeners();
|
|
||||||
ButtonItemObj.transform.GetComponent<Button>().onClick.AddListener(() => {
|
|
||||||
|
|
||||||
UIGuideTipData data = new UIGuideTipData();
|
|
||||||
data = UIKit.GetPanel<UIGuideTip>().Data;
|
|
||||||
|
|
||||||
|
|
||||||
UIKit.HidePanel<UIGuideTip>();
|
|
||||||
UIKit.HidePanel<UITextWindow>();
|
|
||||||
obj.gameObject.SetActive(false);
|
|
||||||
AnimObj.gameObject.SetActive(true);
|
|
||||||
PlayReverseAnimation(targetObj[j], mData.animName, () => {
|
|
||||||
|
|
||||||
|
|
||||||
AnimObj.gameObject.SetActive(false);
|
|
||||||
obj.gameObject.SetActive(true);
|
|
||||||
UIKit.OpenPanelAsync<UIGuideTip>(uiData: data, canvasLevel: UILevel.Common).ToAction().StartGlobal();
|
|
||||||
|
|
||||||
|
|
||||||
// Debug.Log("在事件结束添加这些方法");
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public void PlayReverseAnimation(string path, string animName, Action OnFinishAction)
|
|
||||||
{
|
|
||||||
var data = new Dictionary<string, string>
|
|
||||||
{
|
|
||||||
{ "animName", animName },
|
|
||||||
{ "speed", "-1" } // 传递-1实现倒播
|
|
||||||
};
|
|
||||||
|
|
||||||
var action = AnimationAction.Allocate(path, data);
|
|
||||||
|
|
||||||
// 设置回调
|
|
||||||
action.OnFinished += () =>
|
|
||||||
{
|
|
||||||
// Debug.Log("倒播动画完成回调触发");
|
|
||||||
OnFinishAction?.Invoke();
|
|
||||||
action.Deinit();
|
|
||||||
};
|
|
||||||
|
|
||||||
// 启动动作
|
|
||||||
action.OnStart();
|
|
||||||
ActionKit.Sequence().Append(action).StartGlobal();
|
|
||||||
}
|
|
||||||
protected override void OnShow()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnHide()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnClose()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 5126b39382a736d409f3198a28eb8528
|
|
||||||
MonoImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 2
|
|
||||||
defaultReferences: []
|
|
||||||
executionOrder: 0
|
|
||||||
icon: {instanceID: 0}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@ -151,8 +151,8 @@ namespace QFramework.Example
|
|||||||
|
|
||||||
if (safeIndex >= 0 && safeIndex < Tip.Count && safeIndex < audio.Count)
|
if (safeIndex >= 0 && safeIndex < Tip.Count && safeIndex < audio.Count)
|
||||||
{
|
{
|
||||||
//Debug.Log(Tip[safeIndex] + "Tip");
|
Debug.Log(Tip[safeIndex] + "Tip");
|
||||||
//Debug.Log(audio[safeIndex] + "audio");
|
Debug.Log(audio[safeIndex] + "audio");
|
||||||
|
|
||||||
|
|
||||||
// 处理提示文本，保留内部空格但移除空行
|
// 处理提示文本，保留内部空格但移除空行
|
||||||
|
|||||||
@ -18,10 +18,8 @@ namespace QFramework.Example
|
|||||||
protected override void OnInit(IUIData uiData = null)
|
protected override void OnInit(IUIData uiData = null)
|
||||||
{
|
{
|
||||||
mData = uiData as UISliderAnimData ?? new UISliderAnimData();
|
mData = uiData as UISliderAnimData ?? new UISliderAnimData();
|
||||||
// please add init code here
|
// please add init code here
|
||||||
TypeEventSystem.Global.Register<OnModuleQuit>((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
|
}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnOpen(IUIData uiData = null)
|
protected override void OnOpen(IUIData uiData = null)
|
||||||
{
|
{
|
||||||
@ -65,7 +63,7 @@ namespace QFramework.Example
|
|||||||
|
|
||||||
// ʵÀý»¯SliderÔ¤ÖÆÌå
|
// ʵÀý»¯SliderÔ¤ÖÆÌå
|
||||||
GameObject sliderItemObj = GameObject.Instantiate(Slider.gameObject, Connet);
|
GameObject sliderItemObj = GameObject.Instantiate(Slider.gameObject, Connet);
|
||||||
sliderItemObj.name = Objs[i];
|
sliderItemObj.name = blendShapeName;
|
||||||
|
|
||||||
// ÉèÖÃSlider±êÌâ
|
// ÉèÖÃSlider±êÌâ
|
||||||
sliderItemObj.transform.Find("TitleText").GetComponent<Text>().text = Objs[i];
|
sliderItemObj.transform.Find("TitleText").GetComponent<Text>().text = Objs[i];
|
||||||
@ -105,8 +103,6 @@ namespace QFramework.Example
|
|||||||
|
|
||||||
protected override void OnHide()
|
protected override void OnHide()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnClose()
|
protected override void OnClose()
|
||||||
|
|||||||
@ -1878,25 +1878,14 @@ namespace XMLTool
|
|||||||
{
|
{
|
||||||
act.args.Add("rightBg", rightBg.Value);
|
act.args.Add("rightBg", rightBg.Value);
|
||||||
}
|
}
|
||||||
XAttribute random = action.Attribute("random");
|
foreach (var itemData in action.Elements("Item"))
|
||||||
if (random != null)
|
|
||||||
{
|
{
|
||||||
act.args.Add("random", random.Value);
|
act.items.Add(new ImageSelectMapAction.Item()
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var rowData in action.Elements("Row"))
|
|
||||||
{
|
|
||||||
var row = new ImageSelectMapAction.Row();
|
|
||||||
row.name = rowData.Attribute("name")?.Value;
|
|
||||||
act.rows.Add(row);
|
|
||||||
foreach (var itemData in rowData.Elements("Item"))
|
|
||||||
{
|
{
|
||||||
row.items.Add(new ImageSelectMapAction.Item()
|
pic = itemData.Attribute("pic")?.Value,
|
||||||
{
|
size = itemData.Attribute("rightSize")?.Value,
|
||||||
pic = itemData.Attribute("pic")?.Value,
|
pos = itemData.Attribute("rightPos")?.Value
|
||||||
name = itemData.Attribute("name")?.Value
|
});
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
newAction = act;
|
newAction = act;
|
||||||
}
|
}
|
||||||
@ -1999,45 +1988,11 @@ namespace XMLTool
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "UIBtnAnim": {
|
case "UISliderAnimReSet": {
|
||||||
|
|
||||||
var act = new DictionaryAction();
|
|
||||||
XAttribute title = action.Attribute("title");
|
|
||||||
if (title != null)
|
}break;
|
||||||
{
|
|
||||||
act.args.Add("title", title.Value);
|
|
||||||
}
|
|
||||||
XAttribute Obj = action.Attribute("Obj");
|
|
||||||
if (Obj != null)
|
|
||||||
{
|
|
||||||
act.args.Add("Obj", Obj.Value);
|
|
||||||
}
|
|
||||||
|
|
||||||
XAttribute AnimObj = action.Attribute("AnimObj");
|
|
||||||
if (AnimObj != null)
|
|
||||||
{
|
|
||||||
act.args.Add("AnimObj", AnimObj.Value);
|
|
||||||
}
|
|
||||||
XAttribute size = action.Attribute("size");
|
|
||||||
if (size != null)
|
|
||||||
{
|
|
||||||
act.args.Add("size", size.Value);
|
|
||||||
}
|
|
||||||
XAttribute pos = action.Attribute("pos");
|
|
||||||
if (pos != null)
|
|
||||||
{
|
|
||||||
act.args.Add("pos", pos.Value);
|
|
||||||
}
|
|
||||||
|
|
||||||
XAttribute animName = action.Attribute("animName");
|
|
||||||
if (animName != null)
|
|
||||||
{
|
|
||||||
act.args.Add("animName", animName.Value);
|
|
||||||
}
|
|
||||||
newAction = act;
|
|
||||||
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
newAction = new Action();
|
newAction = new Action();
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 9.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 98 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user