From a3a4a858a80724140e36648e9d75f16366cf5ae0 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期二, 07 一月 2025 11:05:00 +0800
Subject: [PATCH] Merge branch 'lang_en' of http://192.168.1.20:10010/r/snxxz_resourcesout into lang_en
---
UI/Window/CycleHallWin.prefab | 257 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 257 insertions(+), 0 deletions(-)
diff --git a/UI/Window/CycleHallWin.prefab b/UI/Window/CycleHallWin.prefab
index c2ce362..cd4bf67 100644
--- a/UI/Window/CycleHallWin.prefab
+++ b/UI/Window/CycleHallWin.prefab
@@ -176,6 +176,7 @@
m_IsKey: 1
m_KeyName: OSA_4
m_ColorType: 7
+ m_BGColorType: 0
--- !u!1 &118069115914316283
GameObject:
m_ObjectHideFlags: 0
@@ -335,6 +336,7 @@
m_IsKey: 1
m_KeyName: CycleHall03
m_ColorType: 7
+ m_BGColorType: 0
--- !u!1 &243031827490579027
GameObject:
m_ObjectHideFlags: 0
@@ -596,6 +598,7 @@
- {fileID: 548776336911360112}
- {fileID: 6223319723119436908}
- {fileID: 775811691013469269}
+ - {fileID: 4649066519879729898}
m_Father: {fileID: 6068375339903592642}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
@@ -652,6 +655,7 @@
- {fileID: 6873191709244845564}
buyCountGiftSlider: {fileID: 7938133971144095950}
buyCountGiftSliderText: {fileID: 7162351924846060652}
+ skeletonGraphic: {fileID: 9170495914791151842}
--- !u!114 &1623166013994173330
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -769,6 +773,71 @@
m_Quantity: {fileID: 8915015829635563268}
m_FullRedpoint: {fileID: 8463474997393666096}
m_GetRewardRedpoint: {fileID: 7772638340342533692}
+--- !u!1 &1204205753236940297
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4131380004196102015}
+ - component: {fileID: 3441783956521720986}
+ - component: {fileID: 9168310370977054843}
+ m_Layer: 0
+ m_Name: Renderer1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4131380004196102015
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1204205753236940297}
+ 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: 4649066519879729898}
+ 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 &3441783956521720986
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1204205753236940297}
+ m_CullTransparentMesh: 0
+--- !u!114 &9168310370977054843
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1204205753236940297}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: deeb12332c062954093c24a3fab10b83, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ 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: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1 &1322509306019596857
GameObject:
m_ObjectHideFlags: 0
@@ -1117,6 +1186,7 @@
m_IsKey: 0
m_KeyName:
m_ColorType: 7
+ m_BGColorType: 0
--- !u!1 &1435457765650186272
GameObject:
m_ObjectHideFlags: 0
@@ -1199,6 +1269,7 @@
m_IsKey: 0
m_KeyName:
m_ColorType: 7
+ m_BGColorType: 0
--- !u!1 &1512439726840822626
GameObject:
m_ObjectHideFlags: 0
@@ -1281,6 +1352,7 @@
m_IsKey: 0
m_KeyName:
m_ColorType: 7
+ m_BGColorType: 0
--- !u!1 &1578510326222068357
GameObject:
m_ObjectHideFlags: 0
@@ -1685,6 +1757,7 @@
m_IsKey: 1
m_KeyName: CycleHall02
m_ColorType: 15
+ m_BGColorType: 0
--- !u!1 &2133558955171861849
GameObject:
m_ObjectHideFlags: 0
@@ -1767,6 +1840,7 @@
m_IsKey: 0
m_KeyName:
m_ColorType: 15
+ m_BGColorType: 0
--- !u!1 &2185263694518129477
GameObject:
m_ObjectHideFlags: 0
@@ -2617,6 +2691,7 @@
m_IsKey: 1
m_KeyName: CycleHall04
m_ColorType: 7
+ m_BGColorType: 0
--- !u!1 &3937064659228857212
GameObject:
m_ObjectHideFlags: 0
@@ -2776,6 +2851,7 @@
m_IsKey: 0
m_KeyName:
m_ColorType: 7
+ m_BGColorType: 0
--- !u!1 &4092316149096141659
GameObject:
m_ObjectHideFlags: 0
@@ -3339,6 +3415,7 @@
m_IsKey: 0
m_KeyName:
m_ColorType: 1
+ m_BGColorType: 0
--- !u!1 &4963620629421263441
GameObject:
m_ObjectHideFlags: 0
@@ -3562,6 +3639,7 @@
m_IsKey: 0
m_KeyName:
m_ColorType: 7
+ m_BGColorType: 0
--- !u!1 &5854779373496097189
GameObject:
m_ObjectHideFlags: 0
@@ -3644,6 +3722,7 @@
m_IsKey: 1
m_KeyName: RealmPractice109
m_ColorType: 7
+ m_BGColorType: 0
--- !u!1 &5865894898225318810
GameObject:
m_ObjectHideFlags: 0
@@ -4278,6 +4357,118 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6443456208253582786}
m_CullTransparentMesh: 0
+--- !u!1 &6741637619496911881
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4649066519879729898}
+ - component: {fileID: 1432176572060464440}
+ - component: {fileID: 9170495914791151842}
+ m_Layer: 5
+ m_Name: haveSkeletonGraphic
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4649066519879729898
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6741637619496911881}
+ 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: 4935168965688169811}
+ - {fileID: 4131380004196102015}
+ m_Father: {fileID: 228052801776397591}
+ 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: 688, y: 152}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1432176572060464440
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6741637619496911881}
+ m_CullTransparentMesh: 0
+--- !u!114 &9170495914791151842
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6741637619496911881}
+ 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: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ skeletonDataAsset: {fileID: 11400000, guid: c64c97850c8bcec46bd6b2a495d01446, type: 2}
+ additiveMaterial: {fileID: 2100000, guid: 2e8245019faeb8c43b75f9ca3ac8ee34, type: 2}
+ multiplyMaterial: {fileID: 2100000, guid: e74a1f8978a7da348a721508d0d58834, type: 2}
+ screenMaterial: {fileID: 2100000, guid: bab24c479f34eec45be6ea8595891569, type: 2}
+ m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1}
+ initialSkinName:
+ initialFlipX: 0
+ initialFlipY: 0
+ startingAnimation: animation
+ startingLoop: 1
+ timeScale: 1
+ freeze: 0
+ layoutScaleMode: 0
+ referenceSize: {x: 688, y: 152}
+ pivotOffset: {x: 0, y: 0}
+ referenceScale: 1
+ layoutScale: 1
+ rectTransformSize: {x: 100, y: 100}
+ editReferenceRect: 0
+ updateWhenInvisible: 3
+ allowMultipleCanvasRenderers: 1
+ canvasRenderers:
+ - {fileID: 1095012166127293850}
+ - {fileID: 3441783956521720986}
+ 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!1 &6761416204106264700
GameObject:
m_ObjectHideFlags: 0
@@ -4550,6 +4741,71 @@
imgBg: {fileID: 336859990256001842}
btnTab: {fileID: 8506389698441037202}
redPoint: {fileID: 5355515529469784509}
+--- !u!1 &7230312731546281880
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4935168965688169811}
+ - component: {fileID: 1095012166127293850}
+ - component: {fileID: 6854224394634876152}
+ m_Layer: 0
+ m_Name: Renderer0
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4935168965688169811
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7230312731546281880}
+ 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: 4649066519879729898}
+ 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 &1095012166127293850
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7230312731546281880}
+ m_CullTransparentMesh: 0
+--- !u!114 &6854224394634876152
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7230312731546281880}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: deeb12332c062954093c24a3fab10b83, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ 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: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1 &7234894905981374425
GameObject:
m_ObjectHideFlags: 0
@@ -5766,6 +6022,7 @@
m_IsKey: 0
m_KeyName:
m_ColorType: 7
+ m_BGColorType: 0
--- !u!1 &9015200615235594756
GameObject:
m_ObjectHideFlags: 0
--
Gitblit v1.8.0