Merge branch 'YKing'
# Conflicts: # EintooAR/Assets/AssetArt/Toon Fantasy Nature 1.meta resolved by main version # EintooAR/Assets/AssetRaw/Fonts/优设标题黑 SDF.asset resolved by main version # EintooAR/UserSettings/Layouts/default-6000.dwlt resolved by main version
This commit is contained in:
commit
468ba2b392
@ -779,7 +779,7 @@ GameObject:
|
||||
- component: {fileID: 4853268286959849949}
|
||||
- component: {fileID: 6916402733411198462}
|
||||
m_Layer: 5
|
||||
m_Name: Text (TMP)
|
||||
m_Name: m_tmptextType
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -1621,7 +1621,7 @@ GameObject:
|
||||
- component: {fileID: 9183367180334268013}
|
||||
- component: {fileID: 1720263634294993270}
|
||||
m_Layer: 5
|
||||
m_Name: m_tmptextInputPetInfo
|
||||
m_Name: m_tmpinputPetName
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -1897,7 +1897,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -35.1975}
|
||||
m_AnchoredPosition: {x: 0, y: -35.197495}
|
||||
m_SizeDelta: {x: 0, y: 70.395}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1215904795819423813
|
||||
@ -2166,7 +2166,7 @@ GameObject:
|
||||
- component: {fileID: 8953951817421178849}
|
||||
- component: {fileID: 7489380025945791724}
|
||||
m_Layer: 5
|
||||
m_Name: m_tmptextInputOwnName
|
||||
m_Name: m_tmpinputOwnName
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -3138,7 +3138,7 @@ GameObject:
|
||||
- component: {fileID: 1732612476213501899}
|
||||
- component: {fileID: 7235939312655346027}
|
||||
m_Layer: 5
|
||||
m_Name: UIARPetInfoRec
|
||||
m_Name: UIARPetInfoRecWindow
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -3525,7 +3525,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 28.20001, y: 0}
|
||||
m_AnchoredPosition: {x: 28.200012, y: 0}
|
||||
m_SizeDelta: {x: 6, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2686308835399051508
|
||||
@ -3967,7 +3967,7 @@ GameObject:
|
||||
- component: {fileID: 5458150654693241415}
|
||||
- component: {fileID: 6725047198361592775}
|
||||
m_Layer: 5
|
||||
m_Name: Text (TMP)
|
||||
m_Name: m_tmptextZone
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -5099,7 +5099,7 @@ GameObject:
|
||||
- component: {fileID: 1445136541080073219}
|
||||
- component: {fileID: 6760995739060460445}
|
||||
m_Layer: 5
|
||||
m_Name: m_tmptextInputNumber
|
||||
m_Name: m_tmpinputNumber
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -149,7 +149,7 @@ GameObject:
|
||||
- component: {fileID: 6600081991818796871}
|
||||
- component: {fileID: 5692120870677579763}
|
||||
m_Layer: 5
|
||||
m_Name: Type
|
||||
m_Name: m_tmptextType
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -1206,7 +1206,7 @@ GameObject:
|
||||
- component: {fileID: 5001991808430061394}
|
||||
- component: {fileID: 5056802328997227042}
|
||||
m_Layer: 5
|
||||
m_Name: Zone
|
||||
m_Name: m_tmptextZone
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
||||
@ -378,8 +378,7 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 1858543574900965356}
|
||||
- component: {fileID: 3063678936640964785}
|
||||
- component: {fileID: 805433139158714042}
|
||||
- component: {fileID: 4436104505685402568}
|
||||
- component: {fileID: 1312536014301764254}
|
||||
m_Layer: 5
|
||||
m_Name: m_goTips
|
||||
m_TagString: Untagged
|
||||
@ -399,14 +398,13 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 2780340779995634444}
|
||||
- {fileID: 1536469712628444800}
|
||||
- {fileID: 4841298228547277831}
|
||||
m_Father: {fileID: 3631003828425781646}
|
||||
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: -8.52, y: 0}
|
||||
m_SizeDelta: {x: 600, y: 280}
|
||||
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 &3063678936640964785
|
||||
CanvasRenderer:
|
||||
@ -416,7 +414,7 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1985960215393784975}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &805433139158714042
|
||||
--- !u!114 &1312536014301764254
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -425,11 +423,11 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1985960215393784975}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 141109fb25f0083469e71ce8cb3e75c8, type: 3}
|
||||
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_Color: {r: 0, g: 0, b: 0, a: 0.23529412}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
@ -446,95 +444,6 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_DrawShape: 3
|
||||
m_ImageType: 0
|
||||
m_MaterialMode: 0
|
||||
m_StrokeWidth: 0
|
||||
m_OutlineWidth: 0
|
||||
m_OutlineColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_FalloffDistance: 0.5
|
||||
m_ConstrainRotation: 1
|
||||
m_ShapeRotation: 0
|
||||
m_FlipHorizontal: 0
|
||||
m_FlipVertical: 0
|
||||
m_Triangle:
|
||||
m_CornerRadius: {x: 0, y: 0, z: 0}
|
||||
m_UniformCornerRadius: 0
|
||||
m_Rectangle:
|
||||
m_CornerRadius: {x: 60, y: 60, z: 60, w: 60}
|
||||
m_UniformCornerRadius: 1
|
||||
m_Circle:
|
||||
m_Radius: 0
|
||||
m_FitRadius: 0
|
||||
m_Pentagon:
|
||||
m_CornerRadius: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_UniformCornerRadius: 0
|
||||
m_TipRadius: 0.001
|
||||
m_TipSize: 1
|
||||
m_Hexagon:
|
||||
m_CornerRadius: {x: 1, y: 1, z: 1, w: 1}
|
||||
m_UniformCornerRadius: 0
|
||||
m_TipSize: {x: 1, y: 1}
|
||||
m_UniformTipSize: 0
|
||||
m_TipRadius: {x: 1, y: 1}
|
||||
m_UniformTipRadius: 0
|
||||
m_NStarPolygon:
|
||||
m_SideCount: 3
|
||||
m_Inset: 2
|
||||
m_CornerRadius: 0
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_GradientEffect:
|
||||
m_Enabled: 0
|
||||
m_GradientType: 0
|
||||
m_Gradient:
|
||||
serializedVersion: 2
|
||||
key0: {r: 1, g: 1, b: 1, a: 1}
|
||||
key1: {r: 1, g: 1, b: 1, a: 1}
|
||||
key2: {r: 0, g: 0, b: 0, a: 0}
|
||||
key3: {r: 0, g: 0, b: 0, a: 0}
|
||||
key4: {r: 0, g: 0, b: 0, a: 0}
|
||||
key5: {r: 0, g: 0, b: 0, a: 0}
|
||||
key6: {r: 0, g: 0, b: 0, a: 0}
|
||||
key7: {r: 0, g: 0, b: 0, a: 0}
|
||||
ctime0: 0
|
||||
ctime1: 65535
|
||||
ctime2: 0
|
||||
ctime3: 0
|
||||
ctime4: 0
|
||||
ctime5: 0
|
||||
ctime6: 0
|
||||
ctime7: 0
|
||||
atime0: 0
|
||||
atime1: 65535
|
||||
atime2: 0
|
||||
atime3: 0
|
||||
atime4: 0
|
||||
atime5: 0
|
||||
atime6: 0
|
||||
atime7: 0
|
||||
m_Mode: 0
|
||||
m_ColorSpace: -1
|
||||
m_NumColorKeys: 2
|
||||
m_NumAlphaKeys: 2
|
||||
m_CornerGradientColors:
|
||||
- {r: 0, g: 0, b: 0, a: 0}
|
||||
- {r: 0, g: 0, b: 0, a: 0}
|
||||
- {r: 0, g: 0, b: 0, a: 0}
|
||||
- {r: 0, g: 0, b: 0, a: 0}
|
||||
m_Rotation: 0
|
||||
--- !u!114 &4436104505685402568
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1985960215393784975}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_ShowMaskGraphic: 1
|
||||
--- !u!1 &1995186072504682808
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1303,10 +1212,10 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7386397652882480380}
|
||||
- {fileID: 1038749970051304505}
|
||||
- {fileID: 5444677223103793555}
|
||||
- {fileID: 3704015329131500542}
|
||||
m_Father: {fileID: 1858543574900965356}
|
||||
m_Father: {fileID: 4841298228547277831}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@ -1444,7 +1353,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1858543574900965356}
|
||||
m_Father: {fileID: 4841298228547277831}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
@ -1597,6 +1506,173 @@ MonoBehaviour:
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &6373814638923377093
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4841298228547277831}
|
||||
- component: {fileID: 6265200171497313542}
|
||||
- component: {fileID: 3619095871958978345}
|
||||
- component: {fileID: 1528782841985453088}
|
||||
m_Layer: 5
|
||||
m_Name: MaskLayout
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4841298228547277831
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6373814638923377093}
|
||||
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: 2780340779995634444}
|
||||
- {fileID: 1536469712628444800}
|
||||
m_Father: {fileID: 1858543574900965356}
|
||||
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: -8.52, y: 0}
|
||||
m_SizeDelta: {x: 600, y: 280}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6265200171497313542
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6373814638923377093}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &3619095871958978345
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6373814638923377093}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 141109fb25f0083469e71ce8cb3e75c8, 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: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_DrawShape: 3
|
||||
m_ImageType: 0
|
||||
m_MaterialMode: 0
|
||||
m_StrokeWidth: 0
|
||||
m_OutlineWidth: 0
|
||||
m_OutlineColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_FalloffDistance: 0.5
|
||||
m_ConstrainRotation: 1
|
||||
m_ShapeRotation: 0
|
||||
m_FlipHorizontal: 0
|
||||
m_FlipVertical: 0
|
||||
m_Triangle:
|
||||
m_CornerRadius: {x: 0, y: 0, z: 0}
|
||||
m_UniformCornerRadius: 0
|
||||
m_Rectangle:
|
||||
m_CornerRadius: {x: 60, y: 60, z: 60, w: 60}
|
||||
m_UniformCornerRadius: 1
|
||||
m_Circle:
|
||||
m_Radius: 0
|
||||
m_FitRadius: 0
|
||||
m_Pentagon:
|
||||
m_CornerRadius: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_UniformCornerRadius: 0
|
||||
m_TipRadius: 0.001
|
||||
m_TipSize: 1
|
||||
m_Hexagon:
|
||||
m_CornerRadius: {x: 1, y: 1, z: 1, w: 1}
|
||||
m_UniformCornerRadius: 0
|
||||
m_TipSize: {x: 1, y: 1}
|
||||
m_UniformTipSize: 0
|
||||
m_TipRadius: {x: 1, y: 1}
|
||||
m_UniformTipRadius: 0
|
||||
m_NStarPolygon:
|
||||
m_SideCount: 3
|
||||
m_Inset: 2
|
||||
m_CornerRadius: 0
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_GradientEffect:
|
||||
m_Enabled: 0
|
||||
m_GradientType: 0
|
||||
m_Gradient:
|
||||
serializedVersion: 2
|
||||
key0: {r: 1, g: 1, b: 1, a: 1}
|
||||
key1: {r: 1, g: 1, b: 1, a: 1}
|
||||
key2: {r: 0, g: 0, b: 0, a: 0}
|
||||
key3: {r: 0, g: 0, b: 0, a: 0}
|
||||
key4: {r: 0, g: 0, b: 0, a: 0}
|
||||
key5: {r: 0, g: 0, b: 0, a: 0}
|
||||
key6: {r: 0, g: 0, b: 0, a: 0}
|
||||
key7: {r: 0, g: 0, b: 0, a: 0}
|
||||
ctime0: 0
|
||||
ctime1: 65535
|
||||
ctime2: 0
|
||||
ctime3: 0
|
||||
ctime4: 0
|
||||
ctime5: 0
|
||||
ctime6: 0
|
||||
ctime7: 0
|
||||
atime0: 0
|
||||
atime1: 65535
|
||||
atime2: 0
|
||||
atime3: 0
|
||||
atime4: 0
|
||||
atime5: 0
|
||||
atime6: 0
|
||||
atime7: 0
|
||||
m_Mode: 0
|
||||
m_ColorSpace: -1
|
||||
m_NumColorKeys: 2
|
||||
m_NumAlphaKeys: 2
|
||||
m_CornerGradientColors:
|
||||
- {r: 0, g: 0, b: 0, a: 0}
|
||||
- {r: 0, g: 0, b: 0, a: 0}
|
||||
- {r: 0, g: 0, b: 0, a: 0}
|
||||
- {r: 0, g: 0, b: 0, a: 0}
|
||||
m_Rotation: 0
|
||||
--- !u!114 &1528782841985453088
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6373814638923377093}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_ShowMaskGraphic: 1
|
||||
--- !u!1 &6621546445676089363
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2242,7 +2318,7 @@ MonoBehaviour:
|
||||
mGUI_ShowCallback: 0
|
||||
mLocalizeTarget: {fileID: 0}
|
||||
mLocalizeTargetName: TEngine.Localization.LocalizeTarget_TextMeshPro_UGUI
|
||||
--- !u!1 &7353328628115307757
|
||||
--- !u!1 &7341472646408545835
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -2250,10 +2326,10 @@ GameObject:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7386397652882480380}
|
||||
- component: {fileID: 5293364562211582033}
|
||||
- component: {fileID: 8441513199088194787}
|
||||
- component: {fileID: 7603967156740670222}
|
||||
- component: {fileID: 1038749970051304505}
|
||||
- component: {fileID: 7781710281862717423}
|
||||
- component: {fileID: 8815035662968860044}
|
||||
- component: {fileID: 2832428146501659781}
|
||||
m_Layer: 5
|
||||
m_Name: Title
|
||||
m_TagString: Untagged
|
||||
@ -2261,13 +2337,13 @@ GameObject:
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7386397652882480380
|
||||
--- !u!224 &1038749970051304505
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7353328628115307757}
|
||||
m_GameObject: {fileID: 7341472646408545835}
|
||||
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}
|
||||
@ -2277,24 +2353,24 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 300, y: -38.33333}
|
||||
m_AnchoredPosition: {x: 300, y: -38.333332}
|
||||
m_SizeDelta: {x: 600, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5293364562211582033
|
||||
--- !u!222 &7781710281862717423
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7353328628115307757}
|
||||
m_GameObject: {fileID: 7341472646408545835}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &8441513199088194787
|
||||
--- !u!114 &8815035662968860044
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7353328628115307757}
|
||||
m_GameObject: {fileID: 7341472646408545835}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
@ -2379,13 +2455,13 @@ MonoBehaviour:
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!114 &7603967156740670222
|
||||
--- !u!114 &2832428146501659781
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7353328628115307757}
|
||||
m_GameObject: {fileID: 7341472646408545835}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3}
|
||||
@ -2418,7 +2494,7 @@ MonoBehaviour:
|
||||
mGUI_ShowCallback: 0
|
||||
mLocalizeTarget: {fileID: 0}
|
||||
mLocalizeTargetName: TEngine.Localization.LocalizeTarget_TextMeshPro_UGUI
|
||||
--- !u!1 &7420356098938187199
|
||||
--- !u!1 &7353328628115307757
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -2426,9 +2502,9 @@ GameObject:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1971934105336562885}
|
||||
- component: {fileID: 5218409724635656088}
|
||||
- component: {fileID: 9173138007019277610}
|
||||
- component: {fileID: 7386397652882480380}
|
||||
- component: {fileID: 5293364562211582033}
|
||||
- component: {fileID: 8441513199088194787}
|
||||
m_Layer: 5
|
||||
m_Name: Title
|
||||
m_TagString: Untagged
|
||||
@ -2436,13 +2512,13 @@ GameObject:
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1971934105336562885
|
||||
--- !u!224 &7386397652882480380
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7420356098938187199}
|
||||
m_GameObject: {fileID: 7353328628115307757}
|
||||
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}
|
||||
@ -2455,21 +2531,21 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 366.5, y: -40}
|
||||
m_SizeDelta: {x: 733, y: 80}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5218409724635656088
|
||||
--- !u!222 &5293364562211582033
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7420356098938187199}
|
||||
m_GameObject: {fileID: 7353328628115307757}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &9173138007019277610
|
||||
--- !u!114 &8441513199088194787
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7420356098938187199}
|
||||
m_GameObject: {fileID: 7353328628115307757}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
@ -2584,7 +2660,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1971934105336562885}
|
||||
- {fileID: 7386397652882480380}
|
||||
- {fileID: 9164996300742651407}
|
||||
- {fileID: 1989893004251603919}
|
||||
- {fileID: 1686117929436006730}
|
||||
|
||||
@ -3,6 +3,8 @@ using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using TEngine;
|
||||
using TMPro;
|
||||
using System.Security.Policy;
|
||||
using Lightbug.Utilities;
|
||||
|
||||
namespace GameLogic
|
||||
{
|
||||
@ -11,20 +13,24 @@ namespace GameLogic
|
||||
{
|
||||
#region 脚本工具生成的代码
|
||||
private Button m_btnPetImg;
|
||||
private TextMeshProUGUI m_tmptextInputPetInfo;
|
||||
private TMP_InputField m_tmpinputPetName;
|
||||
private Button m_btnSelectType;
|
||||
private TextMeshProUGUI m_tmptextInputOwnName;
|
||||
private TextMeshProUGUI m_tmptextType;
|
||||
private TMP_InputField m_tmpinputOwnName;
|
||||
private Button m_btnSelectZone;
|
||||
private TextMeshProUGUI m_tmptextInputNumber;
|
||||
private TextMeshProUGUI m_tmptextZone;
|
||||
private TMP_InputField m_tmpinputNumber;
|
||||
private Button m_btnARPre;
|
||||
protected override void ScriptGenerator()
|
||||
{
|
||||
m_btnPetImg = FindChildComponent<Button>("BackGround/Group/Pet/Background/CenterPhoto/Background/ImageGroup/m_btnPetImg");
|
||||
m_tmptextInputPetInfo = FindChildComponent<TextMeshProUGUI>("BackGround/Group/Pet/Background/PetInput/m_tmptextInputPetInfo");
|
||||
m_tmpinputPetName = FindChildComponent<TMP_InputField>("BackGround/Group/Pet/Background/PetInput/m_tmpinputPetName");
|
||||
m_btnSelectType = FindChildComponent<Button>("BackGround/Group/Pet/Background/PetInput/m_btnSelectType");
|
||||
m_tmptextInputOwnName = FindChildComponent<TextMeshProUGUI>("BackGround/Group/PetInfo/Group/BackGround/SelectGroup/m_tmptextInputOwnName");
|
||||
m_tmptextType = FindChildComponent<TextMeshProUGUI>("BackGround/Group/Pet/Background/PetInput/m_btnSelectType/m_tmptextType");
|
||||
m_tmpinputOwnName = FindChildComponent<TMP_InputField>("BackGround/Group/PetInfo/Group/BackGround/SelectGroup/m_tmpinputOwnName");
|
||||
m_btnSelectZone = FindChildComponent<Button>("BackGround/Group/PetInfo/Group/BackGround/SelectGroup/m_btnSelectZone");
|
||||
m_tmptextInputNumber = FindChildComponent<TextMeshProUGUI>("BackGround/Group/PetInfo/Group/BackGround/SelectGroup/m_tmptextInputNumber");
|
||||
m_tmptextZone = FindChildComponent<TextMeshProUGUI>("BackGround/Group/PetInfo/Group/BackGround/SelectGroup/m_btnSelectZone/m_tmptextZone");
|
||||
m_tmpinputNumber = FindChildComponent<TMP_InputField>("BackGround/Group/PetInfo/Group/BackGround/SelectGroup/m_tmpinputNumber");
|
||||
m_btnARPre = FindChildComponent<Button>("BackGround/Group/PetInfo/Group/m_btnARPre");
|
||||
m_btnPetImg.onClick.AddListener(UniTask.UnityAction(OnClickPetImgBtn));
|
||||
m_btnSelectType.onClick.AddListener(UniTask.UnityAction(OnClickSelectTypeBtn));
|
||||
@ -34,23 +40,85 @@ namespace GameLogic
|
||||
#endregion
|
||||
|
||||
#region 事件
|
||||
private async UniTaskVoid OnClickPetImgBtn()
|
||||
private async UniTaskVoid OnClickPetImgBtn() // 开启摄像头拍照,给宠物拍照
|
||||
{
|
||||
await UniTask.Yield();
|
||||
}
|
||||
private async UniTaskVoid OnClickSelectTypeBtn()
|
||||
{
|
||||
await UniTask.Yield();
|
||||
SelectTypeFunc("波斯猫");
|
||||
}
|
||||
private async UniTaskVoid OnClickSelectZoneBtn()
|
||||
{
|
||||
await UniTask.Yield();
|
||||
SelectZoneFunc("ShangHai->徐汇区");
|
||||
}
|
||||
private async UniTaskVoid OnClickARPreBtn()
|
||||
{
|
||||
await UniTask.Yield();
|
||||
CheckPetInfoInputFunc();
|
||||
}
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
/// 选择宠物得品种
|
||||
/// </summary>
|
||||
/// <param name="PetType">品种</param>
|
||||
private void SelectTypeFunc(string PetType)
|
||||
{
|
||||
this.m_tmptextType.text = PetType;
|
||||
this.m_tmptextType.color = Color.black;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 选择地区
|
||||
/// </summary>
|
||||
/// <param name="Zone">地区</param>
|
||||
private void SelectZoneFunc(string Zone)
|
||||
{
|
||||
this.m_tmptextZone.text = Zone;
|
||||
this.m_tmptextZone.color = Color.black;
|
||||
}
|
||||
|
||||
// 打开宠物预览UI
|
||||
private void OpenPetPreviewUI()
|
||||
{
|
||||
GameModule.UI.ShowUI<UIARPreviewWindow>();
|
||||
GameModule.UI.CloseUI<UIARPetInfoRecWindow>();
|
||||
}
|
||||
|
||||
// 检查宠物信息填入
|
||||
private void CheckPetInfoInputFunc()
|
||||
{
|
||||
if(string.IsNullOrEmpty(m_tmpinputPetName.text))
|
||||
{
|
||||
Debug.LogError("请填入宠物名字");
|
||||
return;
|
||||
}
|
||||
else if(m_tmptextType.text == "请选择品种")
|
||||
{
|
||||
Debug.LogError("请选择品种");
|
||||
return;
|
||||
}
|
||||
else if(string.IsNullOrEmpty(m_tmpinputOwnName.text))
|
||||
{
|
||||
Debug.LogError("请填入宠物主人名字");
|
||||
return;
|
||||
}
|
||||
else if(m_tmptextZone.text == "请选择地区地址")
|
||||
{
|
||||
Debug.LogError("请选择地区地址");
|
||||
return;
|
||||
}else if(string.IsNullOrEmpty(m_tmpinputNumber.text))
|
||||
{
|
||||
Debug.LogError("请输入宠物主人号码");
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
OpenPetPreviewUI();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,6 +2,8 @@ using Cysharp.Threading.Tasks;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using TEngine;
|
||||
using TMPro;
|
||||
using System.Security.Policy;
|
||||
|
||||
namespace GameLogic
|
||||
{
|
||||
@ -10,12 +12,16 @@ namespace GameLogic
|
||||
{
|
||||
#region 脚本工具生成的代码
|
||||
private Button m_btnSelectType;
|
||||
private TextMeshProUGUI m_tmptextType;
|
||||
private Button m_btnSelectZone;
|
||||
private TextMeshProUGUI m_tmptextZone;
|
||||
private Button m_btnSure;
|
||||
protected override void ScriptGenerator()
|
||||
{
|
||||
m_btnSelectType = FindChildComponent<Button>("MainGroup/SelectUI/SelectTypeBack/Center_01/m_btnSelectType");
|
||||
m_tmptextType = FindChildComponent<TextMeshProUGUI>("MainGroup/SelectUI/SelectTypeBack/Center_01/m_btnSelectType/m_tmptextType");
|
||||
m_btnSelectZone = FindChildComponent<Button>("MainGroup/SelectUI/SelectZoneBack /Center_01/m_btnSelectZone");
|
||||
m_tmptextZone = FindChildComponent<TextMeshProUGUI>("MainGroup/SelectUI/SelectZoneBack /Center_01/m_btnSelectZone/m_tmptextZone");
|
||||
m_btnSure = FindChildComponent<Button>("MainGroup/Bottom/m_btnSure");
|
||||
m_btnSelectType.onClick.AddListener(UniTask.UnityAction(OnClickSelectTypeBtn));
|
||||
m_btnSelectZone.onClick.AddListener(UniTask.UnityAction(OnClickSelectZoneBtn));
|
||||
@ -27,16 +33,56 @@ namespace GameLogic
|
||||
private async UniTaskVoid OnClickSelectTypeBtn() // 选择品种
|
||||
{
|
||||
await UniTask.Yield();
|
||||
SelectTypeFunc("波斯猫");
|
||||
}
|
||||
private async UniTaskVoid OnClickSelectZoneBtn() // 选择地区
|
||||
{
|
||||
await UniTask.Yield();
|
||||
SelectZoneFunc("上海");
|
||||
}
|
||||
private async UniTaskVoid OnClickSureBtn() // 确认
|
||||
{
|
||||
await UniTask.Yield();
|
||||
CheckPetRecognitionSelectFunc();
|
||||
}
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
/// 选择宠物得品种
|
||||
/// </summary>
|
||||
/// <param name="PetType">品种</param>
|
||||
private void SelectTypeFunc(string PetType)
|
||||
{
|
||||
this.m_tmptextType.text = PetType;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 选择地区
|
||||
/// </summary>
|
||||
/// <param name="Zone">地区</param>
|
||||
private void SelectZoneFunc(string Zone)
|
||||
{
|
||||
this.m_tmptextZone.text = Zone;
|
||||
}
|
||||
|
||||
// 检查宠物识别信息选择
|
||||
private void CheckPetRecognitionSelectFunc()
|
||||
{
|
||||
if(m_tmptextType.text == "请选择品种")
|
||||
{
|
||||
Debug.LogError("请选择品种");
|
||||
return;
|
||||
}
|
||||
else if(m_tmptextZone.text == "请选择地区")
|
||||
{
|
||||
Debug.LogError("请选择地区");
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
//GameModule.UI.CloseUI<UIARPetRecognitionWindow>();
|
||||
// 打开摄像机进行识别
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -32,6 +32,8 @@ namespace GameLogic
|
||||
private async UniTaskVoid OnClickSureBtn() // 确认
|
||||
{
|
||||
await UniTask.Yield();
|
||||
GameModule.UI.CloseUI<UIARPreviewWindow>();
|
||||
await ARBrochureHomeSystem.Instance.CoroShowAllMainUI();
|
||||
}
|
||||
#endregion
|
||||
|
||||
@ -44,7 +46,7 @@ namespace GameLogic
|
||||
/// <param name="PetOwnName">宠物主人名字</param>
|
||||
/// <param name="PetOwnOri">宠物主人地址</param>
|
||||
/// <param name="PetOwnNumber">宠物主人号码</param>
|
||||
private void PetInfoPreviewSetFunc(string PetName, string PetType, string PetOwnName, string PetOwnOri, string PetOwnNumber)
|
||||
public void PetInfoPreviewSetFunc(string PetName, string PetType, string PetOwnName, string PetOwnOri, string PetOwnNumber)
|
||||
{
|
||||
this.m_tmptextPetName.text = PetName;
|
||||
this.m_tmptextPetType.text = PetType;
|
||||
|
||||
@ -8,6 +8,7 @@ namespace GameLogic
|
||||
[Window(UILayer.UI)]
|
||||
class UIPetInfoWindow : UIWindow
|
||||
{
|
||||
private UIPetinfoWidget m_PetinfoWidget;
|
||||
#region 脚本工具生成的代码
|
||||
private Button m_btnAddtionPet;
|
||||
private GameObject m_goParent;
|
||||
@ -19,8 +20,8 @@ namespace GameLogic
|
||||
m_btnAddtionPet = FindChildComponent<Button>("ScrollView/Viewport/Content/AddtionPetGroup/AddtionPetBackImage/AddPetBottom/m_btnAddtionPet");
|
||||
m_goParent = FindChild("ScrollView/Viewport/Content/m_goParent").gameObject;
|
||||
m_goTips = FindChild("m_goTips").gameObject;
|
||||
m_btnCancle = FindChildComponent<Button>("m_goTips/Parent/Bottom/m_btnCancle");
|
||||
m_btnSure = FindChildComponent<Button>("m_goTips/Parent/Bottom/m_btnSure");
|
||||
m_btnCancle = FindChildComponent<Button>("m_goTips/MaskLayout/Parent/Bottom/m_btnCancle");
|
||||
m_btnSure = FindChildComponent<Button>("m_goTips/MaskLayout/Parent/Bottom/m_btnSure");
|
||||
m_btnAddtionPet.onClick.AddListener(UniTask.UnityAction(OnClickAddtionPetBtn));
|
||||
m_btnCancle.onClick.AddListener(UniTask.UnityAction(OnClickCancleBtn));
|
||||
m_btnSure.onClick.AddListener(UniTask.UnityAction(OnClickSureBtn));
|
||||
@ -47,10 +48,7 @@ namespace GameLogic
|
||||
// 创建宠物信息
|
||||
private void CreatePetInfoPrefab()
|
||||
{
|
||||
GameObject PetInfoPrefab = GameModule.Resource.LoadGameObject("UIPetinfoWidget");
|
||||
PetInfoPrefab.transform.SetParent(m_goParent.transform);
|
||||
PetInfoPrefab.transform.localPosition = Vector3.zero;
|
||||
PetInfoPrefab.transform.localScale = Vector3.one;
|
||||
m_PetinfoWidget = CreateWidgetByPath<UIPetinfoWidget>(m_goParent.transform, "UIPetinfoWidget");
|
||||
}
|
||||
|
||||
// 显示tip面板
|
||||
|
||||
@ -34,9 +34,9 @@ namespace GameLogic
|
||||
/// </summary>
|
||||
/// <param name="image">宠物头像</param>
|
||||
/// <param name="PetName">宠物名</param>
|
||||
private void SetPetBanData(Image image,string PetName)
|
||||
public void SetPetBanData(Sprite Sp,string PetName)
|
||||
{
|
||||
this.m_imgPetImage.sprite = image.sprite;
|
||||
this.m_imgPetImage.sprite = Sp;
|
||||
this.m_tmptextPetName.text = PetName;
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@ guid: 4500fcbdf9ac27349a9c61c6bfd44ab7
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 12
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
@ -20,10 +20,12 @@ TextureImporter:
|
||||
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
|
||||
@ -62,9 +64,10 @@ TextureImporter:
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
- serializedVersion: 4
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
@ -74,9 +77,10 @@ TextureImporter:
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
@ -86,12 +90,53 @@ TextureImporter:
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WindowsStoreApps
|
||||
maxTextureSize: 2048
|
||||
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: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
@ -101,9 +146,11 @@ TextureImporter:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spritePackingTag:
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -3,7 +3,7 @@ guid: 4dced26454ba437409e9dae9ac404b54
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 12
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
@ -20,10 +20,12 @@ TextureImporter:
|
||||
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
|
||||
@ -62,9 +64,10 @@ TextureImporter:
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
- serializedVersion: 4
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
@ -74,9 +77,10 @@ TextureImporter:
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
@ -86,12 +90,53 @@ TextureImporter:
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WindowsStoreApps
|
||||
maxTextureSize: 2048
|
||||
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: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
@ -101,9 +146,11 @@ TextureImporter:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spritePackingTag:
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user