From 54bf8368f9cac804b816ad8e76b9bad667b8be28 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 04 六月 2025 18:23:28 +0800
Subject: [PATCH] 18 子 2D卡牌客户端搭建 / 2D卡牌客户端搭建 会添加两次UIRoot的bug修复
---
Assets/Resources/Scenes/Launch.unity | 489 ------------------------------------------------------
1 files changed, 0 insertions(+), 489 deletions(-)
diff --git a/Assets/Resources/Scenes/Launch.unity b/Assets/Resources/Scenes/Launch.unity
index 31654f3..84df467 100644
--- a/Assets/Resources/Scenes/Launch.unity
+++ b/Assets/Resources/Scenes/Launch.unity
@@ -122,114 +122,6 @@
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
---- !u!1 &82528803
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 82528804}
- - component: {fileID: 82528806}
- - component: {fileID: 82528805}
- m_Layer: 9
- m_Name: SkeletonGraphic
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &82528804
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 82528803}
- 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: 1874995518}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0}
- m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 200, y: 250}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &82528805
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 82528803}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 0
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- skeletonDataAsset: {fileID: 11400000, guid: 628db5d4db251b84ea4cd9da7d8eb361, type: 2}
- additiveMaterial: {fileID: 0}
- multiplyMaterial: {fileID: 0}
- screenMaterial: {fileID: 0}
- m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1}
- initialSkinName:
- initialFlipX: 0
- initialFlipY: 0
- startingAnimation: idle
- startingLoop: 1
- timeScale: 1
- freeze: 0
- layoutScaleMode: 0
- referenceSize: {x: 200, y: 250}
- pivotOffset: {x: 0, y: 0}
- referenceScale: 1
- layoutScale: 1
- rectTransformSize: {x: 200, y: 250}
- editReferenceRect: 0
- updateWhenInvisible: 3
- allowMultipleCanvasRenderers: 0
- canvasRenderers: []
- separatorSlotNames: []
- enableSeparatorSlots: 0
- separatorParts: []
- updateSeparatorPartLocation: 1
- updateSeparatorPartScale: 0
- disableMeshAssignmentOnOverride: 1
- physicsPositionInheritanceFactor: {x: 1, y: 1}
- physicsRotationInheritanceFactor: 1
- physicsMovementRelativeTo: {fileID: 0}
- meshGenerator:
- settings:
- useClipping: 1
- zSpacing: 0
- tintBlack: 0
- canvasGroupCompatible: 0
- pmaVertexColors: 1
- addNormals: 0
- calculateTangents: 0
- immutableTriangles: 0
- updateTiming: 1
- unscaledTime: 0
---- !u!222 &82528806
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 82528803}
- m_CullTransparentMesh: 1
--- !u!1 &421128700
GameObject:
m_ObjectHideFlags: 0
@@ -291,172 +183,6 @@
m_Script: {fileID: 11500000, guid: ebddc3e48e1baa844a56615981c5c152, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1001 &503479952
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 1580332508}
- m_Modifications:
- - target: {fileID: 2442043020950172525, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2442043020950172525, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2442043020950172525, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 675
- objectReference: {fileID: 0}
- - target: {fileID: 3259301857825940692, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3259301857825940692, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3259301857825940692, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 525
- objectReference: {fileID: 0}
- - target: {fileID: 5390375651503887536, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5390375651503887536, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5390375651503887536, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 225
- objectReference: {fileID: 0}
- - target: {fileID: 7003990255401320170, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_Name
- value: MainWin
- objectReference: {fileID: 0}
- - target: {fileID: 7003990255401320170, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_Pivot.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_Pivot.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchorMax.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchorMax.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchorMin.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchorMin.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_SizeDelta.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_SizeDelta.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7570652811458638894, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7570652811458638894, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7570652811458638894, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 75
- objectReference: {fileID: 0}
- - target: {fileID: 8643693561358745544, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8643693561358745544, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8643693561358745544, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 375
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
---- !u!224 &503479953 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 7112353317578617827, guid: 6e9da5f968f53f9479a8fc15762f3e53, type: 3}
- m_PrefabInstance: {fileID: 503479952}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &519420028
GameObject:
m_ObjectHideFlags: 0
@@ -553,224 +279,9 @@
m_Script: {fileID: 11500000, guid: ebddc3e48e1baa844a56615981c5c152, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &1386290556
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1386290560}
- - component: {fileID: 1386290559}
- - component: {fileID: 1386290558}
- - component: {fileID: 1386290557}
- - component: {fileID: 1386290561}
- m_Layer: 9
- m_Name: BattleWindow
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!114 &1386290557
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1386290556}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_UiScaleMode: 0
- m_ReferencePixelsPerUnit: 100
- m_ScaleFactor: 1
- m_ReferenceResolution: {x: 800, y: 600}
- m_ScreenMatchMode: 0
- m_MatchWidthOrHeight: 0
- m_PhysicalUnit: 3
- m_FallbackScreenDPI: 96
- m_DefaultSpriteDPI: 96
- m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 1
---- !u!225 &1386290558
-CanvasGroup:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1386290556}
- m_Enabled: 1
- m_Alpha: 1
- m_Interactable: 1
- m_BlocksRaycasts: 1
- m_IgnoreParentGroups: 0
---- !u!223 &1386290559
-Canvas:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1386290556}
- m_Enabled: 1
- serializedVersion: 3
- m_RenderMode: 2
- m_Camera: {fileID: 0}
- m_PlaneDistance: 0
- m_PixelPerfect: 0
- m_ReceivesEvents: 1
- m_OverrideSorting: 0
- m_OverridePixelPerfect: 0
- m_SortingBucketNormalizedSize: 0
- m_VertexColorAlwaysGammaSpace: 0
- m_AdditionalShaderChannelsFlag: 0
- m_UpdateRectTransformForStandalone: 1
- m_SortingLayerID: 0
- m_SortingOrder: 0
- m_TargetDisplay: 0
---- !u!224 &1386290560
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1386290556}
- 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: 1874995518}
- m_Father: {fileID: 1580332508}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 375, y: 667}
- m_SizeDelta: {x: 750, y: 1334}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1386290561
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1386290556}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: ebddc3e48e1baa844a56615981c5c152, type: 3}
- m_Name:
- m_EditorClassIdentifier:
---- !u!1001 &1494541948
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 1681207515715887439, guid: 861a0f8791bb1624da118c150ad63b2b, type: 3}
- propertyPath: m_Name
- value: UIRoot
- objectReference: {fileID: 0}
- - target: {fileID: 5320966938171549996, guid: 861a0f8791bb1624da118c150ad63b2b, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5320966938171549996, guid: 861a0f8791bb1624da118c150ad63b2b, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5320966938171549996, guid: 861a0f8791bb1624da118c150ad63b2b, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5320966938171549996, guid: 861a0f8791bb1624da118c150ad63b2b, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5320966938171549996, guid: 861a0f8791bb1624da118c150ad63b2b, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5320966938171549996, guid: 861a0f8791bb1624da118c150ad63b2b, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5320966938171549996, guid: 861a0f8791bb1624da118c150ad63b2b, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5320966938171549996, guid: 861a0f8791bb1624da118c150ad63b2b, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5320966938171549996, guid: 861a0f8791bb1624da118c150ad63b2b, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5320966938171549996, guid: 861a0f8791bb1624da118c150ad63b2b, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects:
- - targetCorrespondingSourceObject: {fileID: 1807634080894636761, guid: 861a0f8791bb1624da118c150ad63b2b, type: 3}
- insertIndex: -1
- addedObject: {fileID: 1386290560}
- - targetCorrespondingSourceObject: {fileID: 1807634080894636761, guid: 861a0f8791bb1624da118c150ad63b2b, type: 3}
- insertIndex: -1
- addedObject: {fileID: 503479953}
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 861a0f8791bb1624da118c150ad63b2b, type: 3}
---- !u!224 &1580332508 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 1807634080894636761, guid: 861a0f8791bb1624da118c150ad63b2b, type: 3}
- m_PrefabInstance: {fileID: 1494541948}
- m_PrefabAsset: {fileID: 0}
---- !u!1 &1874995517
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1874995518}
- m_Layer: 9
- m_Name: Character_0001
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1874995518
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1874995517}
- 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: 82528804}
- m_Father: {fileID: 1386290560}
- 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!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 519420032}
- {fileID: 421128702}
- - {fileID: 1494541948}
--
Gitblit v1.8.0