Compare commits

...

48 Commits

Author SHA1 Message Date
pgd
7de60c5343 Merge pull request 'DataRepository 오류 수정' (#229) from pgd/20250725_1 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/229
2025-07-30 15:47:52 +09:00
geondo55
57a5fb3b61 DataRepository 오류 수정 2025-07-30 15:38:52 +09:00
geondo55
60ce186a2e 백업 2025-07-29 14:55:04 +09:00
pgd
0ef6544776 Merge pull request '7/25 수정 사항' (#228) from pgd/20250725_1 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/228
2025-07-25 16:09:45 +09:00
geondo55
3ab3dbc10d API Setting 저장 오류 수정 2025-07-25 16:08:20 +09:00
geondo55
922a631e7c 씬 기즈모 현재 카메라 시점 표시(Persp/Iso) 2025-07-25 10:59:12 +09:00
pgd
88aa8b586c Merge pull request 'App Setting 패널 저장 및 취소 버튼 추가' (#227) from pgd/20250724_3 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/227
2025-07-24 16:10:26 +09:00
geondo55
564cc2d2a9 App Setting 패널 저장 및 취소 버튼 추가 2025-07-24 16:09:40 +09:00
pgd
de2b915f22 Merge pull request 'APi Setting 패널 저장 및 취소 버튼 추가' (#226) from pgd/20250724_2 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/226
2025-07-24 14:55:55 +09:00
geondo55
b1ec0344d3 APi Setting 패널 저장 및 취소 버튼 추가 2025-07-24 14:53:48 +09:00
준학 노
140bce5068 mqtt api 업데이트 2025-07-24 12:18:31 +09:00
준학 노
2da5c521cf Merge branch 'main' of http://xr.flexing.ai:3000/UVCXR/Studio 2025-07-24 11:43:42 +09:00
준학 노
baf55bcea6 mqtt 저장 취소 기능 추가 2025-07-24 11:43:39 +09:00
pgd
bc49b281c7 Merge pull request '프로젝트 메타 정보 불러오기' (#225) from pgd/20250723_4 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/225
2025-07-24 11:37:59 +09:00
geondo55
7c8010fee7 프로젝트 메타 정보 불러오기 2025-07-24 11:37:05 +09:00
pgd
526190b118 Merge pull request '툴팁 위치 수정' (#224) from pgd/20250723_3 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/224
2025-07-23 17:38:29 +09:00
geondo55
331156a592 툴팁 위치 수정 2025-07-23 17:37:59 +09:00
pgd
fbbaf20e4b Merge pull request '초기 화면 탑바 제거, 상단 로고 클릭 시 카메라 초기 위치로 이동' (#223) from pgd/20250723_1 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/223
2025-07-23 14:05:18 +09:00
geondo55
0a3c81fc78 상단 로고 클릭 시 카메라 초기 위치로 이동 2025-07-23 14:02:18 +09:00
geondo55
46d8da7621 초기 화면 탑바 제거 2025-07-23 11:49:25 +09:00
pgd
d295211d6d Merge pull request 'Quick Start 패널에서 최근 오픈 파일 목록 불러오기' (#222) from pgd/20250721_2 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/222
2025-07-23 11:19:05 +09:00
geondo55
89bee012b9 Quick Start 패널 디자인 수정 2025-07-23 11:17:49 +09:00
geondo55
df23956680 Merge branch 'main' into pgd/20250721_2 2025-07-23 11:02:42 +09:00
pgd
999e29c75b Merge pull request 'CopyObject Undo/Redo 오류' (#221) from pgd/20250721_1 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/221
2025-07-23 11:01:31 +09:00
geondo55
94501928c2 CopyObject Undo/Redo 오류 2025-07-23 10:58:51 +09:00
geondo55
2232142a1a Quick Start 패널에서 최근 오픈 파일 목록 불러오기 2025-07-22 16:04:03 +09:00
geondo55
fa84184e7b 백업 2025-07-21 15:03:41 +09:00
geondo55
b1723a4903 ToastMessage 패널 추가 2025-07-21 10:03:35 +09:00
893ba2b87e Merge pull request '선택된 객체 Undo 이후 대상이 없는 상태에서 복사 시 오류, Undo, Redo 연속 실행' (#219) from pgd/20250718_2 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/219
2025-07-21 09:20:36 +09:00
ab11573968 Merge pull request '하위 객체 호버링 시 상위 객체 호버링 되는 오류' (#218) from pgd/20250718_1 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/218
2025-07-21 09:20:23 +09:00
6b4c35fadc Merge pull request '객체 복사 시 토스트 알림 표기' (#217) from pgd/20250716_4 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/217
2025-07-21 09:20:10 +09:00
geondo55
c111cc55b9 선택된 객체 Undo 이후 대상이 없는 상태에서 복사 시 오류, Undo, Redo 연속 실행 2025-07-18 13:54:55 +09:00
geondo55
691f8725a2 하위 객체 호버링 시 상위 객체 호버링 되는 오류 2025-07-18 10:00:55 +09:00
geondo55
88baae2c13 객체 복사 시 토스트 알림 표기 2025-07-17 15:45:15 +09:00
pgd
d9a6c4102d Merge pull request 'Data Repository 연결 안되어 있을 때 UI 안보이는 오류' (#216) from pgd/20250716_4 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/216
2025-07-17 15:43:44 +09:00
geondo55
da6497048f 툴팁 신 수정 2025-07-17 11:44:00 +09:00
geondo55
1e7728c445 Data Repository 연결 안되어 있을 때 UI 안보이는 오류 2025-07-17 11:18:44 +09:00
e899c412b1 Merge pull request 'Hierarchy창 디폴트로 켜기' (#214) from jym/250716_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/214
2025-07-17 10:23:11 +09:00
c2902bb8bd Merge pull request 'Scene Gizmo Drag 기능' (#213) from pgd/20250716_4 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/213
2025-07-17 10:22:31 +09:00
b2fd4d4434 Merge pull request 'Undo, Redo 단축키 변경' (#212) from pgd/20250716_3 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/212
2025-07-17 10:22:18 +09:00
bab207aa37 Merge pull request '새 프로젝트 파일명 중복 시 팝업 또는 InputField 강조 효과' (#211) from pgd/20250716_2 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/211
2025-07-17 10:21:59 +09:00
276e419636 Merge pull request '툴박스 ToolTip 기능' (#210) from pgd/20250716_1 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/210
2025-07-17 10:21:49 +09:00
bba747dac8 Merge pull request 'Window 사용 제한 특수 기호 막기' (#209) from jym/250715_01 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/209
2025-07-17 10:21:35 +09:00
정영민
391c8edc10 Hierarchy창 디폴트로 켜기 2025-07-16 18:01:13 +09:00
geondo55
321a4bf9ff Scene Gizmo Drag 기능 2025-07-16 17:11:50 +09:00
geondo55
da62f00267 Undo, Redo 단축키 변경 2025-07-16 11:54:28 +09:00
geondo55
4ccfd951cd 새 프로젝트 파일명 중복 시 팝업 또는 InputField 강조 효과 2025-07-16 11:45:36 +09:00
정영민
fd0130eec3 Window 사용 제한 특수 기호 막기 2025-07-15 17:53:41 +09:00
50 changed files with 19790 additions and 9786 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 8e37d29fe98f60e4da71e03c86d7f5e7
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
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: 1
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: 4
buildTarget: DefaultTexturePlatform
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: Standalone
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: 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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -225,7 +225,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4154756950530451975}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
@@ -281,15 +281,17 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0

View File

@@ -452,6 +452,127 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &1708047505893064898
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5227809010745853711}
- component: {fileID: 7616921440469719509}
- component: {fileID: 767562255195204649}
- component: {fileID: 2845463321079916379}
m_Layer: 5
m_Name: Button_Cancel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5227809010745853711
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1708047505893064898}
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: 5789321366742326706}
m_Father: {fileID: 7996241376411540362}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7616921440469719509
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1708047505893064898}
m_CullTransparentMesh: 1
--- !u!114 &767562255195204649
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1708047505893064898}
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
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 &2845463321079916379
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1708047505893064898}
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: 767562255195204649}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &1985525179682604975
GameObject:
m_ObjectHideFlags: 0
@@ -701,6 +822,142 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3975125241663574192
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5789321366742326706}
- component: {fileID: 5176063385012978723}
- component: {fileID: 7515318936532855479}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5789321366742326706
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3975125241663574192}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5227809010745853711}
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 &5176063385012978723
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3975125241663574192}
m_CullTransparentMesh: 1
--- !u!114 &7515318936532855479
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3975125241663574192}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uCDE8\uC18C"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &3978760987251984510
GameObject:
m_ObjectHideFlags: 0
@@ -783,8 +1040,8 @@ RectTransform:
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: -35}
m_SizeDelta: {x: -10, y: -100}
m_AnchoredPosition: {x: 0, y: -17.5}
m_SizeDelta: {x: -10, y: -135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1740398254284962573
CanvasRenderer:
@@ -932,6 +1189,142 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &5064097304898789405
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1140056064147204023}
- component: {fileID: 5435909611875740166}
- component: {fileID: 6621529469533899436}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1140056064147204023
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5064097304898789405}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1567532136058716800}
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 &5435909611875740166
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5064097304898789405}
m_CullTransparentMesh: 1
--- !u!114 &6621529469533899436
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5064097304898789405}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uC800\uC7A5"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &5282445447455195121
GameObject:
m_ObjectHideFlags: 0
@@ -1143,6 +1536,200 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5825102549621900914
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1567532136058716800}
- component: {fileID: 5234411253522107965}
- component: {fileID: 6655660817758584649}
- component: {fileID: 5284974499738546366}
m_Layer: 5
m_Name: Button_OK
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1567532136058716800
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5825102549621900914}
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: 1140056064147204023}
m_Father: {fileID: 7996241376411540362}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5234411253522107965
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5825102549621900914}
m_CullTransparentMesh: 1
--- !u!114 &6655660817758584649
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5825102549621900914}
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
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 &5284974499738546366
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5825102549621900914}
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: 6655660817758584649}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &6576160348102263660
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7996241376411540362}
- component: {fileID: 4142298848317189371}
- component: {fileID: 2556222921098272474}
m_Layer: 5
m_Name: Panel_Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7996241376411540362
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6576160348102263660}
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: 1567532136058716800}
- {fileID: 5227809010745853711}
m_Father: {fileID: 6023788723247703297}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -0.000061035156, y: 24.999985}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4142298848317189371
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6576160348102263660}
m_CullTransparentMesh: 1
--- !u!114 &2556222921098272474
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6576160348102263660}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1 &6955641147959292203
GameObject:
m_ObjectHideFlags: 0
@@ -1315,6 +1902,7 @@ RectTransform:
m_Children:
- {fileID: 4463847530505855796}
- {fileID: 4536383871410992554}
- {fileID: 7996241376411540362}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}

View File

@@ -2864,6 +2864,142 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_AlphaFadeSpeed: 0.15
--- !u!1 &3278143578269741081
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3397253772135244216}
- component: {fileID: 3759051061050082722}
- component: {fileID: 1590307961024867377}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3397253772135244216
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3278143578269741081}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2822932183454238154}
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 &3759051061050082722
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3278143578269741081}
m_CullTransparentMesh: 1
--- !u!114 &1590307961024867377
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3278143578269741081}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uCDE8\uC18C"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &3514914355683807167
GameObject:
m_ObjectHideFlags: 0
@@ -3057,6 +3193,7 @@ RectTransform:
m_Children:
- {fileID: 8923382973838602538}
- {fileID: 5549653605187454136}
- {fileID: 6932256550977072977}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -3097,6 +3234,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f9c6f8c6f0c462a4ab09d615c0d0db6c, type: 3}
m_Name:
m_EditorClassIdentifier:
header: {fileID: 0}
Area: {fileID: 0}
state: 0
resizeDirection: 0
@@ -3477,6 +3615,142 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &4182133250177525811
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8350172386203928921}
- component: {fileID: 4173365034619657629}
- component: {fileID: 5420657585747034021}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8350172386203928921
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4182133250177525811}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 502418198806350079}
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 &4173365034619657629
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4182133250177525811}
m_CullTransparentMesh: 1
--- !u!114 &5420657585747034021
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4182133250177525811}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uC800\uC7A5"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &4306370737922808822
GameObject:
m_ObjectHideFlags: 0
@@ -3655,6 +3929,79 @@ MonoBehaviour:
isAlert: 0
m_InputValidator: {fileID: 0}
m_ShouldActivateOnSelect: 1
--- !u!1 &4462037694191518224
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6932256550977072977}
- component: {fileID: 7157026959907139745}
- component: {fileID: 8884060120552000451}
m_Layer: 5
m_Name: Panel_Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6932256550977072977
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4462037694191518224}
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: 502418198806350079}
- {fileID: 2822932183454238154}
m_Father: {fileID: 7610859217448332832}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 25}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7157026959907139745
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4462037694191518224}
m_CullTransparentMesh: 1
--- !u!114 &8884060120552000451
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4462037694191518224}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1 &4463797868952028876
GameObject:
m_ObjectHideFlags: 0
@@ -4825,6 +5172,127 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &6188222802428032127
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 502418198806350079}
- component: {fileID: 5649570706272508192}
- component: {fileID: 2990209802324746904}
- component: {fileID: 1950791325334555204}
m_Layer: 5
m_Name: Button_OK
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &502418198806350079
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6188222802428032127}
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: 8350172386203928921}
m_Father: {fileID: 6932256550977072977}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5649570706272508192
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6188222802428032127}
m_CullTransparentMesh: 1
--- !u!114 &2990209802324746904
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6188222802428032127}
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
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 &1950791325334555204
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6188222802428032127}
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: 2990209802324746904}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &6196895960737249398
GameObject:
m_ObjectHideFlags: 0
@@ -4955,6 +5423,127 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Padding: {x: -8, y: -5, z: -8, w: -5}
m_Softness: {x: 0, y: 0}
--- !u!1 &6400870664400977350
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2822932183454238154}
- component: {fileID: 4093318590881583552}
- component: {fileID: 9084760846345107270}
- component: {fileID: 26985725390061381}
m_Layer: 5
m_Name: Button_Cancel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2822932183454238154
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6400870664400977350}
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: 3397253772135244216}
m_Father: {fileID: 6932256550977072977}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4093318590881583552
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6400870664400977350}
m_CullTransparentMesh: 1
--- !u!114 &9084760846345107270
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6400870664400977350}
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
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 &26985725390061381
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6400870664400977350}
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: 9084760846345107270}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &6644631676649456795
GameObject:
m_ObjectHideFlags: 0

View File

@@ -249,8 +249,8 @@ RectTransform:
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: -35}
m_SizeDelta: {x: -10, y: -100}
m_AnchoredPosition: {x: 0, y: -17.5}
m_SizeDelta: {x: -10, y: -135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8657145168271822924
CanvasRenderer:
@@ -356,7 +356,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.0000076293945}
m_SizeDelta: {x: -10, y: 0}
m_SizeDelta: {x: -10, y: 45}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1695482358976848412
MonoBehaviour:
@@ -492,7 +492,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5526574206638406261
RectTransform:
m_ObjectHideFlags: 0
@@ -507,6 +507,7 @@ RectTransform:
m_Children:
- {fileID: 7632821073387535058}
- {fileID: 6065905194162777582}
- {fileID: 6102786499613693342}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -657,10 +658,10 @@ RectTransform:
- {fileID: 6015914731583279537}
m_Father: {fileID: 6170707829871908408}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 286.5, y: -12.5}
m_SizeDelta: {x: 573, y: 25}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2662598266185177957
CanvasRenderer:
@@ -700,6 +701,127 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &2999647659011121039
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3457560666205727924}
- component: {fileID: 5520646342889436258}
- component: {fileID: 1493694069090738040}
- component: {fileID: 2435858640409509944}
m_Layer: 5
m_Name: Button_Cancel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3457560666205727924
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2999647659011121039}
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: 463537598736727304}
m_Father: {fileID: 6102786499613693342}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5520646342889436258
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2999647659011121039}
m_CullTransparentMesh: 1
--- !u!114 &1493694069090738040
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2999647659011121039}
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
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 &2435858640409509944
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2999647659011121039}
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: 1493694069090738040}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &3821524449556618221
GameObject:
m_ObjectHideFlags: 0
@@ -1133,6 +1255,142 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6173017372495297907}
m_CullTransparentMesh: 1
--- !u!1 &6413475414352171183
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 463537598736727304}
- component: {fileID: 2883396172157526221}
- component: {fileID: 6679511755430041390}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &463537598736727304
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6413475414352171183}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3457560666205727924}
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 &2883396172157526221
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6413475414352171183}
m_CullTransparentMesh: 1
--- !u!114 &6679511755430041390
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6413475414352171183}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uCDE8\uC18C"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &6472751727652752307
GameObject:
m_ObjectHideFlags: 0
@@ -1253,6 +1511,200 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &6978174337547808242
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1417026541206240787}
- component: {fileID: 8236340988652898555}
- component: {fileID: 8980149262848137930}
- component: {fileID: 7114173669178339710}
m_Layer: 5
m_Name: Button_OK
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1417026541206240787
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6978174337547808242}
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: 6831990769631253965}
m_Father: {fileID: 6102786499613693342}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8236340988652898555
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6978174337547808242}
m_CullTransparentMesh: 1
--- !u!114 &8980149262848137930
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6978174337547808242}
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
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 &7114173669178339710
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6978174337547808242}
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: 8980149262848137930}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &7483474623970952469
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6102786499613693342}
- component: {fileID: 8884052470916437046}
- component: {fileID: 511402088849978217}
m_Layer: 5
m_Name: Panel_Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6102786499613693342
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7483474623970952469}
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: 1417026541206240787}
- {fileID: 3457560666205727924}
m_Father: {fileID: 5526574206638406261}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 25}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8884052470916437046
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7483474623970952469}
m_CullTransparentMesh: 1
--- !u!114 &511402088849978217
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7483474623970952469}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1 &7561748366802301766
GameObject:
m_ObjectHideFlags: 0
@@ -1345,7 +1797,7 @@ RectTransform:
m_Father: {fileID: 6764751412898966732}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 5, y: 0}
m_SizeDelta: {x: 10, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
@@ -1507,6 +1959,142 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 5
--- !u!1 &8566646306119276977
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6831990769631253965}
- component: {fileID: 3758176428937614824}
- component: {fileID: 3803246564434105329}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6831990769631253965
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8566646306119276977}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1417026541206240787}
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 &3758176428937614824
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8566646306119276977}
m_CullTransparentMesh: 1
--- !u!114 &3803246564434105329
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8566646306119276977}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uC800\uC7A5"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &8774170053375736082
GameObject:
m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@@ -2963,7 +2963,6 @@ GameObject:
- component: {fileID: 7017100227211141329}
- component: {fileID: 1684347328279880060}
- component: {fileID: 8716372905218989086}
- component: {fileID: 5627916286240764789}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
@@ -2985,10 +2984,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 6481722682416648472}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 5, y: 0}
m_SizeDelta: {x: -10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1684347328279880060
CanvasRenderer:
@@ -3053,7 +3052,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: -3
m_wordSpacing: 0
@@ -3089,20 +3088,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &5627916286240764789
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2560603364830347304}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &2721372243835513048
GameObject:
m_ObjectHideFlags: 0
@@ -6740,7 +6725,6 @@ GameObject:
- component: {fileID: 39081802091885578}
- component: {fileID: 7587368150757620990}
- component: {fileID: 8654835325965923314}
- component: {fileID: 2140752751788840653}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
@@ -6762,10 +6746,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3238963043025285338}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 5, y: 0}
m_SizeDelta: {x: -10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7587368150757620990
CanvasRenderer:
@@ -6830,7 +6814,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: -3
m_wordSpacing: 0
@@ -6866,20 +6850,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &2140752751788840653
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5139031459477456866}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &5145370541214012035
GameObject:
m_ObjectHideFlags: 0
@@ -7429,7 +7399,6 @@ GameObject:
- component: {fileID: 7224508148832233434}
- component: {fileID: 6254609085111468795}
- component: {fileID: 7488666436362542306}
- component: {fileID: 5518524607387498583}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
@@ -7451,10 +7420,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 507044200192960012}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 5, y: 0}
m_SizeDelta: {x: -10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6254609085111468795
CanvasRenderer:
@@ -7519,7 +7488,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: -3
m_wordSpacing: 0
@@ -7555,20 +7524,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &5518524607387498583
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5507712416580393121}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &5598713889840636921
GameObject:
m_ObjectHideFlags: 0
@@ -9655,7 +9610,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 262, y: 75}
m_SizeDelta: {x: 262, y: 4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &852701277637592919
CanvasRenderer:
@@ -12068,7 +12023,6 @@ GameObject:
- component: {fileID: 4411952328846038397}
- component: {fileID: 6539332332075531913}
- component: {fileID: 2303845988930171271}
- component: {fileID: 2521248643174618728}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
@@ -12090,10 +12044,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 8446467888244615418}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 5, y: 0}
m_SizeDelta: {x: -10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6539332332075531913
CanvasRenderer:
@@ -12158,7 +12112,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: -3
m_wordSpacing: 0
@@ -12194,20 +12148,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &2521248643174618728
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8077915878948747490}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &8078574712506140396
GameObject:
m_ObjectHideFlags: 0
@@ -12219,7 +12159,6 @@ GameObject:
- component: {fileID: 5308505043497054505}
- component: {fileID: 607957240391468196}
- component: {fileID: 999338138509537173}
- component: {fileID: 8353000831921415421}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
@@ -12241,10 +12180,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 514594182029569209}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 5, y: 0}
m_SizeDelta: {x: -10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &607957240391468196
CanvasRenderer:
@@ -12309,7 +12248,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: -3
m_wordSpacing: 0
@@ -12345,20 +12284,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &8353000831921415421
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8078574712506140396}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &8110366459860109492
GameObject:
m_ObjectHideFlags: 0

View File

@@ -0,0 +1,273 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &446023340544832848
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 131453539068456586}
- component: {fileID: 2209117580846228876}
- component: {fileID: 6377229603796770285}
m_Layer: 0
m_Name: Image_bg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &131453539068456586
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 446023340544832848}
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: 1985167945211234460}
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: 100}
m_SizeDelta: {x: 100, y: 25}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &2209117580846228876
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 446023340544832848}
m_CullTransparentMesh: 1
--- !u!114 &6377229603796770285
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 446023340544832848}
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: 0.48235294, g: 0.7254902, 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: []
m_Sprite: {fileID: 21300000, guid: 4986e28c0e91a7646bf3239c3fc6a4ce, type: 3}
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
--- !u!1 &2164931036245486078
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1985167945211234460}
- component: {fileID: 3750046009461159708}
- component: {fileID: 7197471718471839916}
m_Layer: 0
m_Name: Panel_ToastMessage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1985167945211234460
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2164931036245486078}
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: 131453539068456586}
- {fileID: 6963996282222852724}
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 &3750046009461159708
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2164931036245486078}
m_CullTransparentMesh: 1
--- !u!114 &7197471718471839916
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2164931036245486078}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 342dbf6aa759fab499828fbf940b0dd7, type: 3}
m_Name:
m_EditorClassIdentifier:
padding: {x: 20, y: 10}
--- !u!1 &4465495780181571190
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6963996282222852724}
- component: {fileID: 3715185425270121652}
- component: {fileID: 1382572807270572463}
m_Layer: 0
m_Name: Text_Message
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6963996282222852724
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4465495780181571190}
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: 1985167945211234460}
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: 100}
m_SizeDelta: {x: 200, y: 25}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &3715185425270121652
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4465495780181571190}
m_CullTransparentMesh: 1
--- !u!114 &1382572807270572463
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4465495780181571190}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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: []
m_text: New Text
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 16
m_fontSizeBase: 16
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 4
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e9508decb91c2994f92851c5c4315f57
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -270,4 +270,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ee8826b08a67ea84ba1b9d407b34f551, type: 3}
m_Name:
m_EditorClassIdentifier:
padding: {x: 20, y: 10}
padding: {x: 30, y: 10}

File diff suppressed because it is too large Load Diff

View File

@@ -32,11 +32,11 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1330096852879011290}
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}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 30, y: 0}
m_SizeDelta: {x: 150, y: 30}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &5947654069834548848
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -67,8 +67,8 @@ MonoBehaviour:
m_Calls: []
m_text: Button
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2}
m_sharedMaterial: {fileID: 6975767319296004534, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2}
m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@@ -92,14 +92,14 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24
m_fontSizeBase: 24
m_fontSize: 12
m_fontSizeBase: 12
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
@@ -136,6 +136,81 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &2430816310505986356
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2330185737949612005}
- component: {fileID: 5591993545921332990}
- component: {fileID: 716719838789989905}
m_Layer: 5
m_Name: Line
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2330185737949612005
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2430816310505986356}
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: 1330096852879011290}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5591993545921332990
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2430816310505986356}
m_CullTransparentMesh: 1
--- !u!114 &716719838789989905
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2430816310505986356}
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: 0.8509804, g: 0.8509804, b: 0.8509804, 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
--- !u!1 &6116218771329895052
GameObject:
m_ObjectHideFlags: 0
@@ -169,12 +244,13 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1966234658179463742}
- {fileID: 2330185737949612005}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 188, y: 30}
m_SizeDelta: {x: 200, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4462997933352392802
CanvasRenderer:
@@ -204,7 +280,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -270,3 +346,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7641a0e837d0bf94aa6ba62d3b59c0c6, type: 3}
m_Name:
m_EditorClassIdentifier:
panel_Repository: {fileID: 0}
bg: {fileID: 0}

View File

@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3405020781819431025
--- !u!1 &1213445600248512317
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8,24 +8,24 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8412137011264621783}
- component: {fileID: 8159438064414966758}
- component: {fileID: 9166822912208899419}
- component: {fileID: 5581021025715458833}
- component: {fileID: 75617499983841788}
- component: {fileID: 7088658627055302455}
m_Layer: 5
m_Name: Text (TMP)
m_Name: Line
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8412137011264621783
--- !u!224 &5581021025715458833
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3405020781819431025}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_GameObject: {fileID: 1213445600248512317}
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
@@ -33,25 +33,100 @@ RectTransform:
m_Father: {fileID: 492208786282724824}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8159438064414966758
--- !u!222 &75617499983841788
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3405020781819431025}
m_GameObject: {fileID: 1213445600248512317}
m_CullTransparentMesh: 1
--- !u!114 &9166822912208899419
--- !u!114 &7088658627055302455
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3405020781819431025}
m_GameObject: {fileID: 1213445600248512317}
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: 0.8509804, g: 0.8509804, b: 0.8509804, 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
--- !u!1 &3756551962978519060
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5358655531832547544}
- component: {fileID: 2536976841125526436}
- component: {fileID: 9111590623606980907}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5358655531832547544
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3756551962978519060}
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: 492208786282724824}
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: 30, y: 0}
m_SizeDelta: {x: 150, y: 30}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &2536976841125526436
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3756551962978519060}
m_CullTransparentMesh: 1
--- !u!114 &9111590623606980907
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3756551962978519060}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
@@ -67,8 +142,8 @@ MonoBehaviour:
m_Calls: []
m_text: Button
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2}
m_sharedMaterial: {fileID: 6975767319296004534, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2}
m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@@ -92,14 +167,14 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 26.05
m_fontSizeBase: 24
m_fontSize: 12
m_fontSizeBase: 12
m_fontWeight: 400
m_enableAutoSizing: 1
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
@@ -168,13 +243,14 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8412137011264621783}
- {fileID: 5358655531832547544}
- {fileID: 5581021025715458833}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 188, y: 30}
m_SizeDelta: {x: 200, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6921339540054383559
CanvasRenderer:
@@ -204,7 +280,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -271,3 +347,4 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
panel_Repository: {fileID: 0}
bg: {fileID: 0}

View File

@@ -34,8 +34,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 120, y: 0}
m_SizeDelta: {x: 200, y: 0}
m_AnchoredPosition: {x: 492.61075, y: 0}
m_SizeDelta: {x: 945.2216, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1704060959270833171
CanvasRenderer:
@@ -150,6 +150,8 @@ GameObject:
- component: {fileID: 1094340256984082610}
- component: {fileID: 8340526939583729682}
- component: {fileID: 7129880062156813569}
- component: {fileID: 713724719131404728}
- component: {fileID: 144084811267613343}
m_Layer: 5
m_Name: PRF_QuickStartItem
m_TagString: Untagged
@@ -228,3 +230,68 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
Text_Name: {fileID: 8232507227673836802}
toggle: {fileID: 0}
outline: {fileID: 0}
--- !u!114 &713724719131404728
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5094190157828326286}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.48235294, g: 0.7254902, b: 1, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!114 &144084811267613343
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5094190157828326286}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, 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: 8340526939583729682}
toggleTransition: 1
graphic: {fileID: 0}
m_Group: {fileID: 0}
onValueChanged:
m_PersistentCalls:
m_Calls: []
m_IsOn: 0

View File

@@ -1029,6 +1029,22 @@ PrefabInstance:
propertyPath: m_Name
value: Panel_StudioTopbar
objectReference: {fileID: 0}
- target: {fileID: 1736443127178567416, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1736443127178567416, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1736443127178567416, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1736443127178567416, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1955157107292011281, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@@ -1045,6 +1061,22 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2130947729137314072, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2130947729137314072, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2130947729137314072, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2130947729137314072, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@@ -1277,6 +1309,22 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5175156938614111087, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5175156938614111087, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5175156938614111087, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5175156938614111087, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5557641235373680755, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@@ -1317,6 +1365,14 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6105994354646297837, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6105994354646297837, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6151036698135753193, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_Pivot.x
value: 0
@@ -1465,6 +1521,22 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7349301724305492737, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7349301724305492737, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7349301724305492737, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7349301724305492737, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7617173237569620537, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@@ -1517,6 +1589,22 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8233937778985980108, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8233937778985980108, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8233937778985980108, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8233937778985980108, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8236132945779869188, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
propertyPath: m_SizeDelta.y
value: 0
@@ -2340,7 +2428,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 929951560}
- {fileID: 663673411}
- {fileID: 612829698}
- {fileID: 1241962839680651227}
- {fileID: 1137729077628816852}
- {fileID: 8941705694726826284}
@@ -2352,7 +2440,6 @@ RectTransform:
- {fileID: 5084660882068320435}
- {fileID: 297039008}
- {fileID: 2627550138014681917}
- {fileID: 1439596647}
- {fileID: 1085911555}
- {fileID: 1712022043}
- {fileID: 1833658609}
@@ -2371,6 +2458,7 @@ RectTransform:
- {fileID: 1639318484}
- {fileID: 2010909997}
- {fileID: 18479049}
- {fileID: 648889522}
m_Father: {fileID: 1981809316}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -2411,7 +2499,6 @@ MonoBehaviour:
panel_interferedobjectlist: {fileID: 0}
panel_predefinedtype: {fileID: 0}
panel_dynamicobjectinfo: {fileID: 0}
panel_tooltip: {fileID: 0}
panel_propertyviewer: {fileID: 0}
panel_apiconnectmodal: {fileID: 0}
panel_datafiltersetting: {fileID: 0}
@@ -2425,6 +2512,7 @@ MonoBehaviour:
panel_toolbar: {fileID: 0}
panel_dataconnectmodal: {fileID: 0}
panel_alarmconnectmodal: {fileID: 0}
panel_toastmessage: {fileID: 0}
--- !u!114 &545811783
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2650,152 +2738,7 @@ Canvas:
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!1 &617235294
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 617235297}
- component: {fileID: 617235296}
- component: {fileID: 617235295}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &617235295
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 617235294}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &617235296
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 617235294}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &617235297
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 617235294}
serializedVersion: 2
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: 1093055756}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &636283412
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 636283413}
- component: {fileID: 636283414}
m_Layer: 0
m_Name: CanvasManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &636283413
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 636283412}
serializedVersion: 2
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: 1093055756}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &636283414
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 636283412}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 68fe65091b9346d4d803044314a62d23, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &659421206
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 659421207}
m_Layer: 0
m_Name: Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &659421207
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 659421206}
serializedVersion: 2
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: 847498817}
- {fileID: 2013432595}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &663673410
--- !u!1001 &612829697
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@@ -2803,18 +2746,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 545811781}
m_Modifications:
- target: {fileID: 2277027821890051672, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
propertyPath: m_AnchoredPosition.x
value: 126.60156
objectReference: {fileID: 0}
- target: {fileID: 2686821592073054891, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2686821592073054891, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3137596492354244850, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@@ -2831,18 +2762,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3159005925573434593, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
propertyPath: m_AnchoredPosition.x
value: -144.63281
objectReference: {fileID: 0}
- target: {fileID: 3369443847942175767, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3369443847942175767, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3425713149264809870, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -2963,10 +2882,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4585162413516526451, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
propertyPath: m_AnchoredPosition.x
value: 162.20312
objectReference: {fileID: 0}
- target: {fileID: 5132087015678815764, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
propertyPath: m_SizeDelta.x
value: 0
@@ -2987,18 +2902,6 @@ PrefabInstance:
propertyPath: m_Name
value: Panel_Start
objectReference: {fileID: 0}
- target: {fileID: 6419739384633392332, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8097777418585433427, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
propertyPath: m_AnchoredPosition.x
value: -50.398438
objectReference: {fileID: 0}
- target: {fileID: 8097777418585433427, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
propertyPath: m_AnchoredPosition.y
value: 20.800781
objectReference: {fileID: 0}
- target: {fileID: 8920532780144259430, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@@ -3020,11 +2923,161 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
--- !u!224 &663673411 stripped
--- !u!224 &612829698 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3425713149264809870, guid: 7dc4728378d41514e97175c1e1256bba, type: 3}
m_PrefabInstance: {fileID: 663673410}
m_PrefabInstance: {fileID: 612829697}
m_PrefabAsset: {fileID: 0}
--- !u!1 &617235294
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 617235297}
- component: {fileID: 617235296}
- component: {fileID: 617235295}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &617235295
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 617235294}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &617235296
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 617235294}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &617235297
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 617235294}
serializedVersion: 2
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: 1093055756}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &636283412
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 636283413}
- component: {fileID: 636283414}
m_Layer: 0
m_Name: CanvasManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &636283413
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 636283412}
serializedVersion: 2
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: 1093055756}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &636283414
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 636283412}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 68fe65091b9346d4d803044314a62d23, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &648889522 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
m_PrefabInstance: {fileID: 1632293947}
m_PrefabAsset: {fileID: 0}
--- !u!1 &659421206
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 659421207}
m_Layer: 0
m_Name: Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &659421207
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 659421206}
serializedVersion: 2
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: 847498817}
- {fileID: 2013432595}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &671739450
GameObject:
m_ObjectHideFlags: 0
@@ -8088,7 +8141,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 545811781}
m_TransformParent: {fileID: 1585135840841040204}
m_Modifications:
- target: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3}
propertyPath: m_Pivot.x
@@ -8140,15 +8193,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3}
propertyPath: m_AnchoredPosition.x
@@ -8546,6 +8599,107 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7ba136ec400eea8498140d9abaa63da5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1632293947
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 545811781}
m_Modifications:
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1985167945211234460, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2164931036245486078, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_Name
value: Panel_ToastMessage
objectReference: {fileID: 0}
- target: {fileID: 2164931036245486078, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e9508decb91c2994f92851c5c4315f57, type: 3}
--- !u!1001 &1639318483
PrefabInstance:
m_ObjectHideFlags: 0
@@ -10665,6 +10819,7 @@ RectTransform:
- {fileID: 514470626}
- {fileID: 857466916}
- {fileID: 765392297}
- {fileID: 1439596647}
m_Father: {fileID: 1981809316}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -11061,7 +11216,7 @@ Canvas:
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 2
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!1 &3194360978488024824
GameObject:
@@ -12723,6 +12878,7 @@ MonoBehaviour:
panel_studiotopbar: {fileID: 0}
panel_scenetab: {fileID: 0}
panel_toolbox: {fileID: 0}
panel_tooltip: {fileID: 0}
--- !u!224 &8941705694726826284 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6023788723247703297, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3}

View File

@@ -1,5 +1,6 @@
using System;
using System.Collections;
using UnityEditor;
using UnityEngine;
namespace Studio.RuntimeGizmo
@@ -19,22 +20,7 @@ namespace Studio.RuntimeGizmo
private IEnumerator cameraRotateCoroutine, projectionChangeCoroutine;
public event Action<string> onGizmoComponentClickedEnd;
private enum GizomType
{
Persp,
Iso,
Left,
Right,
Bottom,
Top,
Front,
Back
}
private GizomType gizomType;
public event Action<bool> onChangedMode;
private void Awake()
{
@@ -49,45 +35,20 @@ namespace Studio.RuntimeGizmo
public void OnGizmoComponentClicked( GizmoComponent component )
{
if ( component == GizmoComponent.Center )
{
SwitchOrthographicMode();
if(!IsCameraRotationAligned())
{
gizomType = mainCamera.orthographic ? GizomType.Persp : GizomType.Iso;
}
}
else if( component == GizmoComponent.XNegative )
{
if (component == GizmoComponent.Center)
SwitchOrthographicMode();
else if (component == GizmoComponent.XNegative)
RotateCameraInDirection(Vector3.right);
gizomType = GizomType.Left;
}
else if( component == GizmoComponent.XPositive )
{
else if (component == GizmoComponent.XPositive)
RotateCameraInDirection(-Vector3.right);
gizomType = GizomType.Right;
}
else if( component == GizmoComponent.YNegative )
{
else if (component == GizmoComponent.YNegative)
RotateCameraInDirection(Vector3.up);
gizomType = GizomType.Bottom;
}
else if( component == GizmoComponent.YPositive )
{
else if (component == GizmoComponent.YPositive)
RotateCameraInDirection(-Vector3.up);
gizomType = GizomType.Top;
}
else if( component == GizmoComponent.ZNegative )
{
else if (component == GizmoComponent.ZNegative)
RotateCameraInDirection(Vector3.forward);
gizomType = GizomType.Back;
}
else
{
else
RotateCameraInDirection(-Vector3.forward);
gizomType = GizomType.Front;
}
onGizmoComponentClickedEnd?.Invoke(gizomType.ToString());
}
private bool IsCameraRotationAligned()
@@ -149,7 +110,8 @@ namespace Studio.RuntimeGizmo
}
mainCamera.orthographic = !isOrthographic;
mainCamera.ResetProjectionMatrix();
onChangedMode?.Invoke(mainCamera.orthographic);
mainCamera.ResetProjectionMatrix();
projectionChangeCoroutine = null;
}

View File

@@ -12,9 +12,9 @@ namespace Studio.RuntimeGizmo
{
}
public class SceneGizmoRenderer : MonoBehaviour, IPointerClickHandler, IDragHandler
public class SceneGizmoRenderer : MonoBehaviour, IPointerClickHandler, IDragHandler, IBeginDragHandler
#if UNITY_EDITOR || UNITY_STANDALONE || UNITY_WEBGL || UNITY_FACEBOOK || UNITY_WSA || UNITY_WSA_10_0
, IPointerEnterHandler, IPointerExitHandler
, IPointerEnterHandler, IPointerExitHandler
#else
, IPointerDownHandler, IPointerUpHandler
#endif
@@ -53,13 +53,16 @@ namespace Studio.RuntimeGizmo
public ComponentClickedEvent OnComponentClicked { get { return m_onComponentClicked; } }
#pragma warning restore 0649
private void Awake()
private Vector2 dragBeginPos;
private Vector2 curGizmoPos;
private void Awake()
{
imageHolderTR = (RectTransform) imageHolder.transform;
controller = (SceneGizmoController) Instantiate( controller );
imageHolder.texture = controller.TargetTexture;
GetComponent<CameraGizmoListener>().onGizmoComponentClickedEnd += OnGizmoComponentClickedEnd;
text_mode.text = "front";
GetComponent<CameraGizmoListener>().onChangedMode += OnChangedMode;
text_mode.text = "Persp";
}
private void Start()
@@ -96,9 +99,17 @@ namespace Studio.RuntimeGizmo
m_onComponentClicked.Invoke( hitComponent );
}
public void OnDrag( PointerEventData eventData )
public void OnBeginDrag(PointerEventData eventData)
{
dragBeginPos = eventData.position;
curGizmoPos = transform.position;
}
public void OnDrag( PointerEventData eventData)
{
}
Vector2 moveOffset = eventData.position - dragBeginPos;
transform.position = curGizmoPos + moveOffset;
}
private Vector3 GetNormalizedPointerPosition( PointerEventData eventData )
{
@@ -108,9 +119,9 @@ namespace Studio.RuntimeGizmo
return new Vector3( 1f + localPos.x / size.x, 1f + localPos.y / size.y, 0f );
}
private void OnGizmoComponentClickedEnd(string text)
private void OnChangedMode(bool isOrthographic)
{
text_mode.text = text;
text_mode.text = isOrthographic ? "Iso" : "Persp";
}
#if UNITY_EDITOR || UNITY_STANDALONE || UNITY_WEBGL || UNITY_FACEBOOK || UNITY_WSA || UNITY_WSA_10_0

View File

@@ -106,7 +106,8 @@ namespace Studio.AssetTool
public void OnPointerEnter(PointerEventData eventData)
{
//ResizeBoundary();
if (isSelected || isCollided)
if (isSelected || isCollided || eventData.pointerEnter != gameObject)
{
return;
}

View File

@@ -158,7 +158,6 @@ namespace Studio.AssetTool
ManagerHub.instance.Get<CustomAssetConnector>().OnDeselectAll();
}
public void AddSelection(CustomAssetRenderObject item)
{
if (selectedRenderObjects.Any(x => x == item))
@@ -192,6 +191,7 @@ namespace Studio.AssetTool
public void RemoveSelection(CustomAssetRenderObject item)
{
Debug.Log("RemoveSelection");
item.Deselect();
selectedRenderObjects.Remove(item);
selectedGameObjects.Remove(item.gameObject);
@@ -352,12 +352,24 @@ namespace Studio.AssetTool
shortcutTable.Add(KeyCode.LeftControl, new Dictionary<KeyCode, Action>());
//shortcutTable[KeyCode.LeftShift].Add(KeyCode.C, SaveItemsToCopy);
//shortcutTable[KeyCode.LeftShift].Add(KeyCode.V, () => CommandInvoker.instance.Invoke(new CopyObjectCommand()));
shortcutTable[KeyCode.LeftControl].Add(KeyCode.D, () => CommandInvoker.instance.Invoke(new CopyObjectCommand()));
shortcutTable[KeyCode.LeftControl].Add(KeyCode.D, () =>
{
if (ManagerHub.instance.Get<RenderObjectHandler>().selectedRenderObjects.Count == 0)
return;
CommandInvoker.instance.Invoke(new CopyObjectCommand());
// CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_toastmessage.ActivateMessage("Copy");
});
#else
shortcutTable.Add(KeyCode.LeftControl, new Dictionary<KeyCode, Action>());
//shortcutTable[KeyCode.LeftControl].Add(KeyCode.C, SaveItemsToCopy);
//shortcutTable[KeyCode.LeftControl].Add(KeyCode.V, () => CommandInvoker.instance.Invoke(new CopyObjectCommand()));
shortcutTable[KeyCode.LeftControl].Add(KeyCode.D, () => CommandInvoker.instance.Invoke(new CopyObjectCommand()));
shortcutTable[KeyCode.LeftControl].Add(KeyCode.D, () =>
{
if (ManagerHub.instance.Get<RenderObjectHandler>().selectedRenderObjects.Count == 0)
return;
CommandInvoker.instance.Invoke(new CopyObjectCommand());
// CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_toastmessage.ActivateMessage("Copy");
});
#endif
var handler = new InputHandler(getKeyActions, downKeyActions, upKeyActions, shortcutTable);

View File

@@ -44,8 +44,7 @@ namespace Studio.Command
connector.sceneDataContainer.sceneObjects.Remove(connectedAsset.renderObject);
var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
renderObjectHandler.rtgController.SetGizmoTargetObjects(new List<GameObject>());
renderObjectHandler.RemoveSelection(connectedAsset.renderObject);
}
}

View File

@@ -4,6 +4,8 @@ using Studio.AssetTool;
using Studio.HierarchyTree;
using Studio.Manage;
using Studio.Util;
using System.Drawing.Printing;
using Best.HTTP.SecureProtocol.Org.BouncyCastle.Asn1;
namespace Studio.Command
{
@@ -11,6 +13,7 @@ namespace Studio.Command
{
private List<ConnectedAsset> copyList;
private CustomAssetConnector connector;
List<ConnectedAsset> copySources = new List<ConnectedAsset>();
public CopyObjectCommand()
{
@@ -28,19 +31,31 @@ namespace Studio.Command
{
var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
connector = ManagerHub.instance.Get<CustomAssetConnector>();
//Debug.Log("cont " + renderObjectHandler.selectedRenderObjects.Count);
//if (renderObjectHandler.selectedRenderObjects.Count == 0)
// return;
if (renderObjectHandler.selectedRenderObjects.Count == 0)
return;
List<ConnectedAsset> copySources = new List<ConnectedAsset>();
copyList = new List<ConnectedAsset>();
for (int i = 0; i < renderObjectHandler.selectedRenderObjects.Count; i++)
if (copySources.Count == 0)
{
ConnectedAsset searchAsset = connector.connectedAssets.Find((x) => x.renderObject == renderObjectHandler.selectedRenderObjects[i]);
copySources.Add(searchAsset);
ConnectedAsset copyAsset = new ConnectedAsset();
copyList.Add(copyAsset);
connector.connectedAssets.Add(copyAsset);
for (int i = 0; i < renderObjectHandler.selectedRenderObjects.Count; i++)
{
ConnectedAsset searchAsset = connector.connectedAssets.Find((x) => x.renderObject == renderObjectHandler.selectedRenderObjects[i]);
copySources.Add(searchAsset);
ConnectedAsset copyAsset = new ConnectedAsset();
copyList.Add(copyAsset);
connector.connectedAssets.Add(copyAsset);
}
}
else
{
for (int i = 0; i < copySources.Count; i++)
{
ConnectedAsset copyAsset = new ConnectedAsset();
copyList.Add(copyAsset);
connector.connectedAssets.Add(copyAsset);
}
}
for (int i = 0; i < copyList.Count; i++)
@@ -64,7 +79,7 @@ namespace Studio.Command
//copyAsset.renderObject.OnOverlabBegin += connector.interferedObjectManager.AddInterferedPair;
//copyAsset.renderObject.OnOverlabEnd += connector.interferedObjectManager.RemoveInterferedPair;
List <Transform> lastParent = new List<Transform>();
List<Transform> lastParent = new List<Transform>();
for (int j = 0; j < copyAsset.hierarchyItem.layerNum + 1; j++)
{
lastParent.Add(copyAsset.renderObject.transform);
@@ -129,6 +144,7 @@ namespace Studio.Command
connector.componentScrollView.RemoveItem(connectedAsset.hierarchyItem);
connectedAsset.assetData.RemoveTransform(connectedAsset.renderObject.transform);
connectedAsset.renderObject.gameObject.SetActive(false);
ManagerHub.instance.Get<RenderObjectHandler>().RemoveSelection(connectedAsset.renderObject);
List<HierarchyItem> childItems = connectedAsset.hierarchyItem.GetAll(true);
for (int k = 0; k < childItems.Count; k++)
@@ -136,13 +152,14 @@ namespace Studio.Command
ConnectedAsset searchAsset = connector.connectedAssets.Find((x) => x.hierarchyItem == childItems[k]);
searchAsset.assetData.RemoveTransform(searchAsset.renderObject.transform);
searchAsset.renderObject.gameObject.SetActive(false);
ManagerHub.instance.Get<RenderObjectHandler>().RemoveSelection(connectedAsset.renderObject);
}
}
ManagerHub.instance.Get<RenderObjectHandler>().DeselectAll();
//ManagerHub.instance.Get<RenderObjectHandler>().RemoveAllSelections();
var canvas = CanvasManager.instance.GetCanvas<Canvas_Popup>();
canvas.panel_dynamicobjectinfo.ResetObjectInfo();
//connector.onRemoveObjects?.Invoke();
connector.componentScrollView.DeselectAll();
////connector.onRemoveObjects?.Invoke();
//connector.componentScrollView.DeselectAll();
}
}

View File

@@ -88,7 +88,7 @@ namespace Studio
ResponseModel<object> response = await RestAPI.RequestPost<ResponseModel<object>>(url);
Debug.Log(response);
if (response.code == "SUCCESS")
return new StudioEntityWithState<object>(APIState.Loaded, response.data,response.requestsize);
return new StudioEntityWithState<object>(APIState.Loaded, response.data,response.requestsize,response.message);
return new StudioEntityWithState<object>(APIState.Error, null, 0,response.message);
});

View File

@@ -138,6 +138,7 @@ namespace Studio
{
mqttData[type] = (entities, elapsedTime);
}
onMQTTDataLoaded?.Invoke(type, entities, elapsedTime);
}
private void UpdateTopicData(string type, string id, Dictionary<string, string> entity)
@@ -280,6 +281,9 @@ namespace Studio
public APITotalBoardEntity GetAPIStatusBoarder()
{
if(apiData.Count == 0)
return null;
var boardEntity = new APITotalBoardEntity();
boardEntity.TotalRequestPacketSize = totalRequestPacket;
boardEntity.AverageRequestPacketSize = totalRequestPacket / apiData.Count;
@@ -305,7 +309,7 @@ namespace Studio
}
//TODO :리팩토링 필요함.
var datas = json["data"].ToString();
var datas = json.ToString();
JObject test = JObject.Parse(datas);
var list = new List<Dictionary<string, string>>();
foreach (JProperty te1 in test.Children())
@@ -313,10 +317,10 @@ namespace Studio
string key1 = te1.Name.ToString();
string value = te1.Value.ToString();
var split = value.ToString().Split('[');
var t = string.Empty;
if(split.Length >1)
t = $"[{split[split.Length - 1]}";
var t = string.Empty;
if (value.Contains("["))
t = value;
else if(!split[split.Length - 1].Contains("{"))
{
Dictionary<string, string> item = new();
@@ -325,7 +329,7 @@ namespace Studio
continue;
}
else
t= $"[{split[split.Length - 1]}]";
t= $"[{value}]";
JArray jarray = JArray.Parse(t);
foreach (JObject obj in jarray.Children())
@@ -375,6 +379,5 @@ namespace Studio
}
}
}
}
}

View File

@@ -72,7 +72,7 @@ namespace Studio.Command
var shortcutTable = new Dictionary<KeyCode, Dictionary<KeyCode, Action>>();
shortcutTable.Add(KeyCode.LeftControl, new Dictionary<KeyCode, Action>());
shortcutTable[KeyCode.LeftControl].Add(KeyCode.Z, Undo);
shortcutTable[KeyCode.LeftControl].Add(KeyCode.X, Redo);
shortcutTable[KeyCode.LeftControl].Add(KeyCode.Y, Redo);
var handler = new InputHandler(null, null, null, shortcutTable);
return handler;
}

View File

@@ -7,11 +7,21 @@ namespace Studio.Manage
{
private float cameraDistance;
private Vector3 viewAngle;
private Vector3 initPostion;
private Quaternion initRotation;
public override void Init()
{
cameraDistance = 25f;
viewAngle = new Vector3(45, 145, 0);
initPostion = Camera.main.transform.position;
initRotation = Camera.main.transform.rotation;
}
public void InitCameraTransform()
{
Camera.main.transform.position = initPostion;
Camera.main.transform.rotation = initRotation;
}
public void MoveToTwinObjectPos(GameObject target)

View File

@@ -11,25 +11,30 @@ namespace Studio.Manage
canvas_popup.panel_start.onClickNewProject += canvas_popup.panel_newprojectinfo.Open;
canvas_popup.panel_start.onClickNewProject += canvas_popup.panel_openprojectinfo.Close;
canvas_popup.panel_start.onClickOpenProject += canvas_popup.panel_newprojectinfo.Close;
canvas_popup.panel_start.onClickOpenProject += canvas_popup.panel_openprojectinfo.Open;
canvas_popup.panel_newprojectinfo.onClickCreate += canvas_static.panel_scenetab.Init;
canvas_popup.panel_newprojectinfo.onClickCreate += canvas_popup.panel_start.Close;
canvas_popup.panel_newprojectinfo.onClickCreate += canvas_popup.panel_newprojectinfo.Close;
canvas_popup.panel_newprojectinfo.onClickCreate += () => canvas_popup.panel_hierarchy.gameObject.SetActive(true);
canvas_popup.panel_openprojectinfo.onClickOpen += canvas_static.panel_scenetab.Init;
canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_start.Close;
canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_openprojectinfo.Close;
canvas_popup.panel_openprojectinfo.onClickOpen += () => canvas_popup.panel_hierarchy.gameObject.SetActive(true);
canvas_popup.panel_saveandnewchecker.onClickNew += canvas_popup.panel_topmenunewprojectinfo.Open;
canvas_popup.panel_saveandopenchecker.onClickOpen += canvas_popup.panel_topmenuopenprojectinfo.Open;
canvas_popup.panel_topmenunewprojectinfo.onClickCreate += canvas_static.panel_scenetab.Init;
canvas_popup.panel_topmenunewprojectinfo.onClickCreate += canvas_popup.panel_topmenunewprojectinfo.Close;
canvas_popup.panel_topmenunewprojectinfo.onClickCreate += () => canvas_popup.panel_hierarchy.gameObject.SetActive(true);
canvas_popup.panel_topmenuopenprojectinfo.onClickOpen += canvas_static.panel_scenetab.Init;
canvas_popup.panel_topmenuopenprojectinfo.onClickOpen += canvas_popup.panel_topmenuopenprojectinfo.Close;
canvas_popup.panel_topmenuopenprojectinfo.onClickOpen += () => canvas_popup.panel_hierarchy.gameObject.SetActive(true);
canvas_popup.panel_assethierarchy.onClickAssetItem += canvas_popup.panel_assetinfo.SetPosition;

View File

@@ -1,16 +1,17 @@
using Newtonsoft.Json;
using Studio.AssetLibraryTree;
using Studio.AssetTool;
using Studio.Command;
using Studio.HierarchyTree;
using Studio.Services;
using Studio.UI;
using Studio.Util;
using System;
using System.Collections.Generic;
using System.IO;
using TriLibCore.SFB;
using Studio.AssetTool;
using Studio.Util;
using UnityEngine;
using System.Linq;
using Studio.HierarchyTree;
using Studio.Command;
using Studio.AssetLibraryTree;
using Studio.Services;
using TriLibCore.SFB;
using UnityEngine;
namespace Studio.Manage
{
@@ -104,6 +105,7 @@ namespace Studio.Manage
ResetProjectSettingData();
var assetManager = ManagerHub.instance.Get<AssetManager>();
var canvas_static = CanvasManager.instance.GetCanvas<Canvas_Static>().GetComponent<Canvas>();
assetManager.ClearFolderPathList();
assetManager.InitRessourceAsset();
@@ -112,15 +114,17 @@ namespace Studio.Manage
curProjectTemplate = string.Empty;
List<AssetData> assetDatas = new List<AssetData>();
curProjectData = CreateProjectData(assetDatas);
string fullPath = Path.Combine(curProjectPath, curProjectName + ".ocs");
canvas_static.sortingOrder = 2;
}
public void OpenProejctSettingData(string filePath)
{
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
var assetManager = ManagerHub.instance.Get<AssetManager>();
var sceneSettingService = ManagerHub.instance.Get<SceneStartSettingManager>();
var canvas_static = CanvasManager.instance.GetCanvas<Canvas_Static>().GetComponent<Canvas>();
ResetProjectSettingData();
if (File.Exists(filePath))
{
string json = File.ReadAllText(filePath);
@@ -135,6 +139,9 @@ namespace Studio.Manage
assetManager.CombineAssetFolderPaths(curProjectData.assetManagerData.localAssetsPaths);
assetManager.SetAssetManager(curProjectData.assetManagerData);
canvas_Popup.panel_openprojectinfo.AddRecentProject(filePath);
canvas_static.sortingOrder = 2;
}
else
{
@@ -144,12 +151,15 @@ namespace Studio.Manage
public void SaveProjectSettingData()
{
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
bool isNewProject = string.IsNullOrEmpty(curProjectPath);
string path = isNewProject ? GetSaveFilePath() : Path.Combine(curProjectPath, curProjectName + ".ocs");
if (string.IsNullOrEmpty(path))
return;
else
canvas_Popup.panel_openprojectinfo.AddRecentProject(path);
List<AssetData> assetDatas = connector.connectedAssets
.Where(asset => asset.hierarchyItem.linkedObject.activeSelf)

View File

@@ -2,6 +2,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEditor.ShortcutManagement;
using UnityEngine;
using UnityEngine.EventSystems;
using XRLib;
@@ -13,10 +14,21 @@ namespace Studio.Manage
Dictionary<KeyCode, Action> getKeyActionTable = new Dictionary<KeyCode, Action>();
Dictionary<KeyCode, Action> upKeyActionTable = new Dictionary<KeyCode, Action>();
Dictionary<KeyCode, Action> downKeyActionTable = new Dictionary<KeyCode, Action>();
Dictionary<KeyCode, Dictionary<KeyCode, Action>> shortCutActionTable = new ();
Dictionary<KeyCode, Dictionary<KeyCode, Action>> shortCutActionTable = new();
Dictionary<string, ShortcutState> shortcutStateTable = new Dictionary<string, ShortcutState>();
float shortCutInitialDelay = 0.5f;
float shortCutRepeatDelay = 0.1f;
Stack<InputHandler> handlerStack = new();
Action updateLoop;
private class ShortcutState
{
public float pressStartTime = -1f;
public float lastActionTime = -1f;
}
public void SetHandler(InputHandler handler)
{
SetKeyboardPreset(handler);
@@ -34,11 +46,11 @@ namespace Studio.Manage
RemoveKeyActionPreset(currentHandler);
break;
}
tempStack.Push(currentHandler);
}
while(tempStack.Count > 0)
while (tempStack.Count > 0)
{
var tempHandler = tempStack.Pop();
SetKeyboardPreset(tempHandler);
@@ -47,24 +59,24 @@ namespace Studio.Manage
void RemoveKeyActionPreset(InputHandler handler)
{
foreach(var k in handler.getKeyActions)
foreach (var k in handler.getKeyActions)
{
getKeyActionTable.Remove(k.Key);
}
foreach(var k in handler.upKeyActions)
foreach (var k in handler.upKeyActions)
{
upKeyActionTable.Remove(k.Key);
}
foreach(var k in handler.downKeyActions)
foreach (var k in handler.downKeyActions)
{
downKeyActionTable.Remove(k.Key);
}
foreach(var k in handler.shortCutActions)
foreach (var k in handler.shortCutActions)
{
foreach(var kk in k.Value)
foreach (var kk in k.Value)
{
shortCutActionTable[k.Key].Remove(kk.Key);
}
@@ -79,14 +91,14 @@ namespace Studio.Manage
getKeyActionTable[k.Key] = k.Value;
}
foreach(var k in handler.upKeyActions)
foreach (var k in handler.upKeyActions)
{
upKeyActionTable[k.Key]= k.Value;
upKeyActionTable[k.Key] = k.Value;
}
foreach(var k in handler.downKeyActions)
foreach (var k in handler.downKeyActions)
{
downKeyActionTable[k.Key]= k.Value;
downKeyActionTable[k.Key] = k.Value;
}
foreach (var k in handler.shortCutActions)
@@ -143,18 +155,53 @@ namespace Studio.Manage
{
foreach (var k in kk)
{
if (Input.GetKeyDown(k.Key))
string inputKeystring = key + "+" + k.Key;
bool bothKeyPressed = Input.GetKey(k.Key);
if (!shortcutStateTable.TryGetValue(inputKeystring, out var state))
{
k.Value?.Invoke();
state = new ShortcutState();
shortcutStateTable[inputKeystring] = state;
}
if (bothKeyPressed)
{
float curTime = Time.time;
if (state.pressStartTime < 0f)
{
state.pressStartTime = curTime;
state.lastActionTime = -1f;
}
if (state.lastActionTime < 0f)
{
k.Value?.Invoke();
state.lastActionTime = curTime;
}
else
{
float holdTime = curTime - state.pressStartTime;
float sinceLastAction = curTime - state.lastActionTime;
if (holdTime >= shortCutInitialDelay && sinceLastAction >= shortCutRepeatDelay)
{
k.Value?.Invoke();
state.lastActionTime = curTime;
}
}
}
else
{
state.pressStartTime = -1f;
state.lastActionTime = -1f;
}
}
}
}
}
updateLoop?.Invoke();
}
bool IsEditInputField()
{
GameObject selectedObj = EventSystem.current.currentSelectedGameObject;
@@ -165,4 +212,5 @@ namespace Studio.Manage
return selectedObj.GetComponent<TMP_InputField>() != null;
}
}
}

View File

@@ -49,6 +49,7 @@ namespace Studio
public Panel_DataConnectModal panel_dataconnectmodal;
public Panel_AlarmConnectModal panel_alarmconnectmodal;
internal Panel_MQTTTestResult panel_mqtttestresult;
public Panel_ToastMessage panel_toastmessage;
private void Awake()
{

View File

@@ -122,6 +122,8 @@ namespace Studio.UI
}
return apiConnection;
}
private APIConnection prevAPIData;
public void SetAPIConnection(APIConnection apiConnection)
{
InputField_Domain.text = apiConnection.domain;
@@ -137,5 +139,80 @@ namespace Studio.UI
Button_AddURLItem.transform.SetAsLastSibling();
}
}
public void RevertInfo(APIConnection apiconnection)
{
prevAPIData = apiconnection;
InputField_Domain.text = prevAPIData.domain;
InputField_Port.text = prevAPIData.port;
ItemRemoveOrCreate();
RevertTopic();
ReSizeRect();
}
private void ReSizeRect()
{
var verticalLayoutGroup = URLItemContent.GetComponent<VerticalLayoutGroup>();
var itemHeight = 0f;
foreach (var item in inputURLItems)
{
itemHeight += item.rectTransform.rect.height;
}
var height = 180f + itemHeight + (verticalLayoutGroup.spacing * inputURLItems.Count);
rectTransform.sizeDelta = new Vector2(rectTransform.sizeDelta.x, height);
}
private void ItemRemoveOrCreate()
{
var gapCount = inputURLItems.Count - prevAPIData.urls.Count;
if (gapCount > 0)
{
for (int i = gapCount; i > 0; i--)
{
Destroy(inputURLItems[i].gameObject);
inputURLItems.Remove(inputURLItems[i]);
}
}
else if (gapCount < 0)
{
var count = MathF.Abs(gapCount);
for (int i = 0; i < count; i++)
{
OnClickAddURLItemButton();
}
}
}
private void RevertTopic()
{
int index = 0;
foreach (var item in inputURLItems)
{
//이전상태로 되돌리기 ;
item.SetURL(prevAPIData.urls[index]);
index++;
}
}
public void SaveItem()
{
if (prevAPIData == null)
{
prevAPIData = GetAPIConnection();
}
prevAPIData.domain = InputField_Domain.text;
prevAPIData.port = InputField_Port.text;
var urls = new List<URL>();
foreach (var item in inputURLItems)
{
urls.Add(item.GetURL());
}
prevAPIData.urls = urls;
}
}
}

View File

@@ -1,8 +1,10 @@
using TMPro;
using Studio.Setting.Connect;
using Studio.UI;
using System;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
using Studio.UI;
using Studio.Setting.Connect;
using XRLib.UI;
@@ -13,14 +15,16 @@ namespace Studio
public Panel_DataRepository panel_Repository;
Button button;
public Image bg;
TextMeshProUGUI buttonName;
string baseDataKey;
StudioEntityWithState<object> dataValue;
StudioEntityWithState<List<Dictionary<string, string>>> dataValue;
private void Awake()
{
button = GetComponent<Button>();
bg = GetComponent<Image>();
buttonName = GetComponentInChildren<TextMeshProUGUI>();
button.onClick.AddListener(OnClickButton);
@@ -28,15 +32,20 @@ namespace Studio
void OnClickButton()
{
panel_Repository.ShowInformation_APIData(dataValue);
panel_Repository.ShowInformation_APIData(baseDataKey, dataValue);
bg.color = new Color32(0xD2, 0x0A, 0x11, 0xFF);
}
public void SetButtonData<T>(string name, StudioEntityWithState<T> data)
{
baseDataKey = name;
dataValue = data as StudioEntityWithState<object>;
buttonName.text = name;
Debug.Log(data.GetType());
dataValue = data as StudioEntityWithState<List<Dictionary<string, string>>>;
buttonName.text = name?.Contains("/api/") == true
? name.Split(new[] { "/api/" }, StringSplitOptions.None)[1]
: name;
}
}
}

View File

@@ -1,4 +1,4 @@
using System;
using System;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
@@ -33,5 +33,6 @@ namespace Studio.UI
{
InputField_Topic.text = topic.topic;
}
}
}

View File

@@ -1,14 +1,12 @@
using UnityEngine;
using XRLib.UI;
using TMPro;
using UnityEngine.UI;
using System.Collections.Generic;
using System;
using Studio.Util;
using Studio.Conifg;
using Studio.Connection;
using System.Linq;
using Studio.Connection;
using Studio.Manage;
using Studio.Util;
using System;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
using XRLib.UI;
namespace Studio.UI
{
@@ -22,7 +20,7 @@ namespace Studio.UI
private RectTransform TopicItemContent;
private RectTransform AddTopic;
private Image Image_Check;
private Sprite defaultSprite,connectedSprite, errorSprite;
private Sprite defaultSprite, connectedSprite, errorSprite;
private UI_InputTopicItem prf_InputTopicItem;
private List<UI_InputTopicItem> inputTopicItems = new List<UI_InputTopicItem>();
@@ -45,13 +43,20 @@ namespace Studio.UI
panel_MQTTTestResult = CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_mqtttestresult;
inputTopicItems.Clear();
}
private void OnClickAddURLItemButton()
{
CreateTopicItem();
}
private UI_InputTopicItem CreateTopicItem()
{
var item = Instantiate(prf_InputTopicItem, TopicItemContent);
item.onRemoveItem += RemoveURLItem;
AddURLItem(item);
AddTopic.transform.SetAsLastSibling();
return item;
}
private void OnClickMQTTTest()
{
@@ -131,18 +136,20 @@ namespace Studio.UI
mqttConnection.port = InputField_Port.text;
foreach (var item in inputTopicItems)
{
{
var topic = item.GetTopic();
mqttConnection.topics.Add(topic);
}
return mqttConnection;
}
private MQTTConnection prevMQTTData;
public void SetMQTTConnection(MQTTConnection mqttConnection)
{
InputField_Domain.text = mqttConnection.domain;
InputField_Port.text = mqttConnection.port;
foreach(var topic in mqttConnection.topics)
foreach (var topic in mqttConnection.topics)
{
var item = Instantiate(prf_InputTopicItem, TopicItemContent);
item.onRemoveItem += RemoveURLItem;
@@ -152,5 +159,78 @@ namespace Studio.UI
AddTopic.transform.SetAsLastSibling();
}
}
public void RevertInfo(MQTTConnection mqttconnection)
{
prevMQTTData = mqttconnection;
InputField_Domain.text = prevMQTTData.domain;
InputField_Port.text = prevMQTTData.port;
ItemRemoveOrCreate();
RevertTopic();
ReSizeRect();
}
private void ReSizeRect()
{
var verticalLayoutGroup = TopicItemContent.GetComponent<VerticalLayoutGroup>();
var itemHeight = 0f;
foreach (var item in inputTopicItems)
{
itemHeight += item.rectTransform.rect.height;
}
var height = 180f + itemHeight + (verticalLayoutGroup.spacing * inputTopicItems.Count);
rectTransform.sizeDelta = new Vector2(rectTransform.sizeDelta.x, height);
}
private void ItemRemoveOrCreate()
{
var gapCount = inputTopicItems.Count - prevMQTTData.topics.Count;
if (gapCount > 0)
{
for (int i = gapCount; i > 0; i--)
{
Destroy(inputTopicItems[i].gameObject);
inputTopicItems.Remove(inputTopicItems[i]);
}
}
else if (gapCount < 0)
{
var count = MathF.Abs(gapCount);
for (int i = 0; i < count; i++)
{
CreateTopicItem();
}
}
}
private void RevertTopic()
{
int index = 0;
foreach (var item in inputTopicItems)
{
//이전상태로 되돌리기 ;
item.SetTopic(prevMQTTData.topics[index]);
index++;
}
}
public void SaveItem()
{
if (prevMQTTData == null)
{
prevMQTTData = GetMQTTConnection();
}
prevMQTTData.domain = InputField_Domain.text;
prevMQTTData.port = InputField_Port.text;
var topics = new List<Topic>();
foreach (var item in inputTopicItems)
{
topics.Add(item.GetTopic());
}
prevMQTTData.topics = topics;
}
}
}

View File

@@ -14,6 +14,7 @@ namespace Studio
public Panel_DataRepository panel_Repository;
Button button;
public Image bg;
TextMeshProUGUI buttonName;
string baseDataKey;
@@ -23,6 +24,7 @@ namespace Studio
private void Awake()
{
button = GetComponent<Button>();
bg = GetComponent<Image>();
buttonName = GetComponentInChildren<TextMeshProUGUI>();
button.onClick.AddListener(OnClickButton);
@@ -30,7 +32,8 @@ namespace Studio
void OnClickButton()
{
panel_Repository.ShowInformation_MQTTData(dataValue, elapsedTime);
panel_Repository.ShowInformation_MQTTData(baseDataKey, dataValue, elapsedTime);
bg.color = new Color32(0xD2, 0x0A, 0x11, 0xFF);
}
public void SetButtonData(string name, Dictionary<string, Dictionary<string, string>> data, TimeSpan elapsedTime)

View File

@@ -19,8 +19,10 @@ namespace Studio.UI
public Panel_DataRepository panel_Repository;
Button ClickButton;
public Button ClickButton;
Button FoldButton;
public Image bg;
TextMeshProUGUI buttonText;
UI_DataRepositoryButtonList dataList;
@@ -31,7 +33,7 @@ namespace Studio.UI
{
buttonText = ClickButton.GetComponentInChildren<TextMeshProUGUI>();
dataList = GetComponentInChildren<UI_DataRepositoryButtonList>();
bg = ClickButton.GetComponent<Image>();
ClickButton.onClick.AddListener(OnClickButton);
FoldButton.onClick.AddListener(OnClickFoldButton);
}
@@ -46,6 +48,8 @@ namespace Studio.UI
{
panel_Repository.ShowInformation_MQTT();
}
bg.color = new Color32(0xD2, 0x0A, 0x11, 0xFF);
}
void OnClickFoldButton()
@@ -53,13 +57,13 @@ namespace Studio.UI
if (isFold)
{
dataList.FoldButtons(true);
FoldButton.GetComponent<RectTransform>().localRotation = Quaternion.Euler(0f, 0f, 0f);
FoldButton.GetComponent<RectTransform>().localScale = Vector3.one;
isFold = false;
}
else
{
dataList.FoldButtons(false);
FoldButton.GetComponent<RectTransform>().localRotation = Quaternion.Euler(0f, 0f, 180f);
FoldButton.GetComponent<RectTransform>().localScale = new Vector3(1, -1, 1);
isFold = true;
}
panel_Repository.RebuildLayout();

View File

@@ -1,4 +1,5 @@
using System;
using System.Drawing.Drawing2D;
using TMPro;
using UnityEngine;
using UnityEngine.EventSystems;
@@ -7,21 +8,31 @@ using XRLib.UI;
namespace Studio.UI
{
public class UI_QuickStartItem : UIBase, IPointerDownHandler
public class UI_QuickStartItem : UIBase
{
public TextMeshProUGUI Text_Name;
public Toggle toggle;
public Action<string> onClickEvent;
public Outline outline;
public Action onClickButton;
private string path;
public void Init(string name, Action clickEvent)
{
Text_Name.text = name;
onClickButton = clickEvent;
public void Init(string path, Action<string> clickEvent)
{
this.path = path;
toggle = GetComponent<Toggle>();
toggle.group = transform.parent.GetComponent<ToggleGroup>();
outline = GetComponent<Outline>();
toggle.onValueChanged.AddListener(OnClickEvent);
Text_Name.text = path.Replace("\\", "/");
onClickEvent = clickEvent;
}
public void OnPointerDown(PointerEventData eventData)
public void OnClickEvent(bool isOn)
{
onClickButton?.Invoke();
outline.enabled = isOn;
if (isOn)
onClickEvent?.Invoke(path);
}
}
}

View File

@@ -1,6 +1,7 @@
using Best.HTTP.SecureProtocol.Org.BouncyCastle.Asn1.Pkcs;
using Newtonsoft.Json;
using Studio.Setting.Connect;
using System;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
@@ -11,6 +12,8 @@ namespace Studio.UI
{
public class Panel_APIDataInfo : PanelBase
{
TextMeshProUGUI TextTitle;
TextMeshProUGUI DataType;
TextMeshProUGUI RawData;
RectTransform rawDataRect;
float rawDataFoldHeight;
@@ -26,21 +29,24 @@ namespace Studio.UI
{
rawDataRect = RawData.GetComponent<RectTransform>();
rawDataFoldHeight = rawDataRect.sizeDelta.y;
RawDataFoldButton.GetComponent<Button>().onClick.AddListener(OnClickRawDataFoldButton);
//RawDataFoldButton.GetComponent<Button>().onClick.AddListener(OnClickRawDataFoldButton);
}
public void ShowData<T>(StudioEntityWithState<T> data)
public void ShowData<T>(string name, StudioEntityWithState<T> data)
{
RawData.text = JsonConvert.SerializeObject(data.Entity, Formatting.Indented);
rawDataOriginHeight = RawData.preferredHeight;
rawDataOriginHeight = Mathf.Max(rawDataFoldHeight, rawDataOriginHeight);
rawDataRect = RawData.GetComponent<RectTransform>();
Vector2 sizeDelta = rawDataRect.sizeDelta;
sizeDelta.y = rawDataOriginHeight;
rawDataRect.sizeDelta = sizeDelta;
//rawDataOriginHeight = RawData.preferredHeight;
//rawDataOriginHeight = Mathf.Max(rawDataFoldHeight, rawDataOriginHeight);
//rawDataRect = RawData.GetComponent<RectTransform>();
//Vector2 sizeDelta = rawDataRect.sizeDelta;
//sizeDelta.y = rawDataOriginHeight;
//rawDataRect.sizeDelta = sizeDelta;
TextTitle.text = name?.Contains("/api/") == true
? name.Split(new[] { "/api/" }, StringSplitOptions.None)[1]
: name;
DataType.text = "Json";
var byteSize = System.Text.Encoding.Default.GetBytes(data.Entity.ToString()).Length;
PacketSize.text = byteSize.ToString();
LastRequestTime.text = data.lastRequestTime.ToString();

View File

@@ -1,9 +1,10 @@
using Studio.Util;
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using UnityEngine.UI;
using XRLib.UI;
using System;
using Studio.Util;
namespace Studio.UI
{
@@ -16,10 +17,15 @@ namespace Studio.UI
private UI_APIConnection prf_APIConnectionItem;
private List<UI_APIConnection> apiConnectionItems = new List<UI_APIConnection>();
public Action onClose;
public Button Button_Close;
private Button Button_OK;
private Button Button_Cancel;
private APISetting prevAPISetting;
private List<UI_APIConnection> prevAPIConnectionItems = new List<UI_APIConnection>();
public void Active(bool isActive)
{
SetActive(isActive);
@@ -35,7 +41,83 @@ namespace Studio.UI
Button_AddAPIConnectionItem.onClick.AddListener(OnClickAddAPIConnectionItemButton);
apiConnectionItems.Clear();
Button_Close.onClick.AddListener(() => Active(false));
var btns = GetComponentsInChildren<Button>();
Button_OK = btns.FirstOrDefault(x => x.name.Equals(nameof(Button_OK)));
Button_Cancel = btns.FirstOrDefault(x => x.name.Equals(nameof(Button_Cancel)));
Button_OK.onClick.AddListener(Save);
Button_Cancel.onClick.AddListener(Close);
Button_Close.onClick.AddListener(Close);
}
public void Open()
{
Active(true);
prevAPIConnectionItems.Clear();
foreach (var mqttitem in apiConnectionItems)
{
prevAPIConnectionItems.Add(mqttitem);
}
}
private void Save()
{
var items = new List<APIConnection>();
foreach (var apiItem in apiConnectionItems)
{
items.Add(apiItem.GetAPIConnection());
apiItem.SaveItem();
}
if (prevAPISetting == null)
{
prevAPISetting = GetAPISetting();
}
prevAPISetting.apiConnections = items;
Active(false);
}
private void Close()
{
List<UI_APIConnection> item = new();
foreach (var apiItem in apiConnectionItems)
{
if (!prevAPIConnectionItems.Contains(apiItem))
{
item.Add(apiItem);
}
}
for (int i = 0; i < item.Count; i++)
{
RemoveAPIConnectionItem(item[i]);
}
RevertState();
Active(false);
}
private void RevertState()
{
if (prevAPISetting == null)
{
prevAPISetting = GetAPISetting();
}
ItemCreate();
var index = 0;
foreach (var apiItem in apiConnectionItems)
{
apiItem.RevertInfo(prevAPISetting.apiConnections[index]);
index++;
}
}
private void ItemCreate()
{
var gapCount = apiConnectionItems.Count - prevAPISetting.apiConnections.Count;
if (gapCount < 0)
{
var count = MathF.Abs(gapCount);
for (int i = 0; i < count; i++)
{
OnClickAddAPIConnectionItemButton();
}
}
}
private void OnClickAddAPIConnectionItemButton()
{

View File

@@ -39,6 +39,11 @@ namespace Studio.UI
public Action onClose;
public Button Button_Close;
private Button Button_OK;
private Button Button_Cancel;
private AppSetting prevAppSetting;
public void Active(bool isActive)
{
gameObject.SetActive(isActive);
@@ -53,12 +58,28 @@ namespace Studio.UI
Button_ImageSelected.onClick.AddListener(OnClickImageSelectedButton);
Toggle_AutoStart.onValueChanged.AddListener(OnAutoStartValuedChanged);
Button_LanguagePack.onClick.AddListener(OnClickLanguagePackButton);
Button_Close.onClick.AddListener(() => Active(false));
Button_OK.onClick.AddListener(Save);
Button_Cancel.onClick.AddListener(Close);
Button_Close.onClick.AddListener(Close);
SetAnimationStyleDropdown();
SetProgressBarStyleDropdown();
SetDefaultLangaugeDropdown();
}
public void Open()
{
SetAppSetting(prevAppSetting);
Active(true);
}
private void Save()
{
prevAppSetting = GetAppSetting();
Active(false);
}
private void Close()
{
Active(false);
}
private void SetAnimationStyleDropdown()
{
Dropdown_AnimationStyle.ClearOptions();
@@ -184,29 +205,42 @@ namespace Studio.UI
}
public void SetAppSetting(AppSetting appSetting)
{
prevAppSetting = appSetting;
if (appSetting == null)
{
Image_Selected.sprite = null;
Dropdown_AnimationStyle.value = 0;
Dropdown_ProgressBarStyle.value = 0;
Image_Selected.enabled = false;
var text = Button_ImageSelected.GetComponentInChildren<TMP_Text>();
text.enabled = true;
Toggle_AutoStart.isOn = true;
Dropdown_DefaultLangauge.value = 0;
InputField_LanguagePack.text = string.Empty;
return;
}
if (!string.IsNullOrEmpty(appSetting.splashImageByte))
{
var bytes = Convert.FromBase64String(appSetting.splashImageByte);
Texture2D texture = new Texture2D(2, 2);
Debug.Log("enter set null");
if (texture.LoadImage(bytes))
{
Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
Image_Selected.sprite = sprite;
}
}
else
{
Debug.Log("enter set null");
Image_Selected.sprite = null;
Image_Selected.enabled = false;
var text = Button_ImageSelected.GetComponentInChildren<TMP_Text>();
text.enabled = true;
}
Dropdown_AnimationStyle.value = Dropdown_AnimationStyle.options.FindIndex(option => option.text == appSetting.animationStyle);
Dropdown_ProgressBarStyle.value = Dropdown_ProgressBarStyle.options.FindIndex(option => option.text == appSetting.progressBarStyle);
Toggle_AutoStart.isOn = appSetting.autoStart;

View File

@@ -1,15 +1,11 @@
using Best.HTTP.SecureProtocol.Org.BouncyCastle.Asn1.Pkcs;
using Studio;
using Studio.Setting.Connect;
using Studio.Setting.Connect;
using Studio.UI;
using System;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using XRLib.UI;
using Newtonsoft.Json;
using Best.HTTP.JSON;
using UnityEngine.UI;
using System.Collections.Generic;
using System;
using XRLib.UI;
namespace Studio
{
@@ -38,13 +34,14 @@ namespace Studio
TextMeshProUGUI MaximumResponseTimeAPI;
LayoutGroup[] layoutGroups;
UI_ProtocolLabel[] protocolLabels;
Dictionary<string, UI_BaseDataButton> apiButtons = new();
Dictionary<string, UI_MQTTDataButton> mqttButtons = new();
public override void AfterAwake()
{
UI_ProtocolLabel[] protocolLabels = GetComponentsInChildren<UI_ProtocolLabel>();
protocolLabels = GetComponentsInChildren<UI_ProtocolLabel>();
foreach (UI_ProtocolLabel label in protocolLabels)
{
label.panel_Repository = this;
@@ -64,7 +61,7 @@ namespace Studio
StudioService studioService = StudioService.instance;
studioService.onAPIDataLoaded += UpdateAPIDataButton;
// studioService.onAPIDataLoaded += UpdateAPIDataButton;
studioService.onMQTTDataLoaded += UpdateMQTTDataButton;
foreach (string key in studioService.apiData.Keys)
@@ -72,16 +69,15 @@ namespace Studio
UpdateAPIDataButton(key, studioService.apiData[key]);
}
foreach (string key in studioService.mqttData.Keys)
{
UpdateMQTTDataButton(key, studioService.mqttData[key].Item1, studioService.mqttData[key].Item2);
}
//foreach (string key in studioService.mqttData.Keys)
//{
// UpdateMQTTDataButton(key, studioService.mqttData[key].Item1, studioService.mqttData[key].Item2);
//}
}
private void OnDisable()
{
StudioService.instance.onAPIDataLoaded -= UpdateAPIDataButton;
StudioService.instance.onMQTTDataLoaded -= UpdateMQTTDataButton;
}
@@ -130,33 +126,45 @@ namespace Studio
}
public void ShowInformation_API()
{
{
APITotalBoardEntity info = StudioService.instance.GetAPIStatusBoarder();
Panel_APIInfo.gameObject.SetActive(true);
Panel_APIDataInfo.gameObject.SetActive(false);
Panel_MQTTInfo.gameObject.SetActive(false);
Panel_MQTTDataInfo.gameObject.SetActive(false);
ResetButtonColor();
if (info == null)
return;
TotalRequestPacketSize.text = info.TotalRequestPacketSize.ToString();
AverageRequestPacketSize.text = info.AverageRequestPacketSize.ToString();
TotalResponsePacketSize.text = info.TotalResponsePacketSize.ToString();
AverageResponsePacketSize.text = info.AverageResponsePacketSize.ToString();
MaximumResponseTime.text = info.MaximumResponseTime.ToString();
AverageResponseTime.text = info.AverageResponseTime.ToString();
MaximumRequestPacketAPI.text = info.MaximumRequestPacketAPI;
MaximumResponsePacketAPI.text = info.MaximumResponsePacketAPI;
MaximumResponseTimeAPI.text = info.MaximumResponseTimeAPI;
Panel_APIInfo.gameObject.SetActive(true);
Panel_APIDataInfo.gameObject.SetActive(false);
Panel_MQTTInfo.gameObject.SetActive(false);
Panel_MQTTDataInfo.gameObject.SetActive(false);
MaximumRequestPacketAPI.text = info.MaximumRequestPacketAPI?.Contains("/api/") == true
? info.MaximumRequestPacketAPI.Split(new[] { "/api/" }, StringSplitOptions.None)[1]
: info.MaximumRequestPacketAPI;
MaximumResponsePacketAPI.text = info.MaximumResponsePacketAPI?.Contains("/api/") == true
? info.MaximumResponsePacketAPI.Split(new[] { "/api/" }, StringSplitOptions.None)[1]
: info.MaximumResponsePacketAPI;
MaximumResponseTimeAPI.text = info.MaximumResponseTimeAPI?.Contains("/api/") == true
? info.MaximumResponseTimeAPI.Split(new[] { "/api/" }, StringSplitOptions.None)[1]
: info.MaximumResponseTimeAPI;
}
public void ShowInformation_APIData<T>(StudioEntityWithState<T> baseDataValue)
public void ShowInformation_APIData<T>(string name, StudioEntityWithState<T> baseDataValue)
{
Panel_APIDataInfo.GetComponent<Panel_APIDataInfo>().ShowData(baseDataValue);
Panel_APIDataInfo.GetComponent<Panel_APIDataInfo>().ShowData(name, baseDataValue);
Panel_APIInfo.gameObject.SetActive(false);
Panel_APIDataInfo.gameObject.SetActive(true);
Panel_MQTTInfo.gameObject.SetActive(false);
Panel_MQTTDataInfo.gameObject.SetActive(false);
ResetButtonColor();
}
public void ShowInformation_MQTT()
@@ -165,21 +173,41 @@ namespace Studio
Panel_APIDataInfo.gameObject.SetActive(false);
Panel_MQTTInfo.gameObject.SetActive(true);
Panel_MQTTDataInfo.gameObject.SetActive(false);
ResetButtonColor();
}
public void ShowInformation_MQTTData(Dictionary<string, Dictionary<string, string>> data, TimeSpan elapsedTime)
public void ShowInformation_MQTTData(string name, Dictionary<string, Dictionary<string, string>> data, TimeSpan elapsedTime)
{
Panel_MQTTDataInfo.GetComponent<Panel_MQTTDataInfo>().ShowData(data, elapsedTime);
Panel_MQTTDataInfo.GetComponent<Panel_MQTTDataInfo>().ShowData(name, data, elapsedTime);
Panel_APIInfo.gameObject.SetActive(false);
Panel_APIDataInfo.gameObject.SetActive(false);
Panel_MQTTInfo.gameObject.SetActive(false);
Panel_MQTTDataInfo.gameObject.SetActive(true);
ResetButtonColor();
}
void Deactivate()
{
gameObject.SetActive(false);
}
private void ResetButtonColor()
{
foreach (UI_ProtocolLabel label in protocolLabels)
{
label.bg.color = Color.white;
}
foreach (var btn in apiButtons.Values)
{
btn.bg.color = Color.white;
}
foreach (var btn in mqttButtons.Values)
{
btn.bg.color = Color.white;
}
}
}
}

View File

@@ -10,6 +10,8 @@ namespace Studio.UI
{
public class Panel_MQTTDataInfo : PanelBase
{
TextMeshProUGUI TextTitle;
TextMeshProUGUI DataType;
TextMeshProUGUI RawData;
RectTransform rawDataRect;
float rawDataFoldHeight;
@@ -23,20 +25,22 @@ namespace Studio.UI
{
rawDataRect = RawData.GetComponent<RectTransform>();
rawDataFoldHeight = rawDataRect.sizeDelta.y;
RawDataFoldButton.GetComponent<Button>().onClick.AddListener(OnClickRawDataFoldButton);
//RawDataFoldButton.GetComponent<Button>().onClick.AddListener(OnClickRawDataFoldButton);
}
public void ShowData(Dictionary<string, Dictionary<string, string>> data, TimeSpan elapsedTime)
public void ShowData(string name, Dictionary<string, Dictionary<string, string>> data, TimeSpan elapsedTime)
{
TextTitle.text = name;
DataType.text = "Json";
RawData.text = JsonConvert.SerializeObject(data, Formatting.Indented);
rawDataOriginHeight = RawData.preferredHeight;
rawDataOriginHeight = Mathf.Max(rawDataFoldHeight, rawDataOriginHeight);
//rawDataOriginHeight = RawData.preferredHeight;
//rawDataOriginHeight = Mathf.Max(rawDataFoldHeight, rawDataOriginHeight);
rawDataRect = RawData.GetComponent<RectTransform>();
Vector2 sizeDelta = rawDataRect.sizeDelta;
sizeDelta.y = rawDataOriginHeight;
rawDataRect.sizeDelta = sizeDelta;
//rawDataRect = RawData.GetComponent<RectTransform>();
//Vector2 sizeDelta = rawDataRect.sizeDelta;
//sizeDelta.y = rawDataOriginHeight;
//rawDataRect.sizeDelta = sizeDelta;
var byteSize = System.Text.Encoding.Default.GetBytes(data.ToString()).Length;
PacketSize.text = byteSize.ToString();

View File

@@ -1,9 +1,10 @@
using System.Collections.Generic;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using XRLib.UI;
using System;
using Studio.Util;
using System.Linq;
namespace Studio.UI
{
@@ -18,25 +19,115 @@ namespace Studio.UI
public Action onClose;
public Button Button_Close;
private Button Button_OK;
private Button Button_Cancel;
private MQTTSetting prevMQTTSetting;
private List<UI_MQTTConnection> prevMQTTConnectionItems = new List<UI_MQTTConnection>();
public void Active(bool isActive)
{
gameObject.SetActive(isActive);
if (!isActive)
{
onClose?.Invoke();
}
}
public void Open()
{
Active(true);
prevMQTTConnectionItems.Clear();
foreach(var mqttitem in mqttConnectionItems)
{
prevMQTTConnectionItems.Add(mqttitem);
}
}
private void Save()
{
var items = new List<MQTTConnection>();
foreach (var mqttitem in mqttConnectionItems)
{
items.Add(mqttitem.GetMQTTConnection());
mqttitem.SaveItem();
}
if(prevMQTTSetting==null)
{
prevMQTTSetting = GetMQTTSetting();
}
prevMQTTSetting.mqttConnections = items;
Active(false);
}
private void Close()
{
List<UI_MQTTConnection> item = new();
foreach(var mqttitem in mqttConnectionItems)
{
if(!prevMQTTConnectionItems.Contains(mqttitem))
{
item.Add(mqttitem);
}
}
for (int i = 0; i < item.Count; i++)
{
RemoveMQTTConnectionItem(item[i]);
}
RevertState();
Active(false);
}
private void RevertState()
{
if (prevMQTTSetting == null)
{
prevMQTTSetting = GetMQTTSetting();
}
ItemCreate();
var index = 0;
foreach (var mqttitem in mqttConnectionItems)
{
mqttitem.RevertInfo(prevMQTTSetting.mqttConnections[index]);
index++;
}
}
private void ItemCreate()
{
var gapCount= mqttConnectionItems.Count - prevMQTTSetting.mqttConnections.Count;
if (gapCount < 0)
{
var count = MathF.Abs(gapCount);
for (int i = 0; i < count; i++)
{
CreateItem();
}
}
}
public override void AfterAwake()
{
prf_MQTTConnectionItem = Resources.Load<UI_MQTTConnection>("Prefabs/UI/PRF_MQTTConnectionItem");
Button_AddMQTTConnectionItem.onClick.AddListener(OnClickAddAPIConnectionItemButton);
mqttConnectionItems.Clear();
var btns = GetComponentsInChildren<Button>();
Button_OK = btns.FirstOrDefault(x=>x.name.Equals(nameof(Button_OK)));
Button_Cancel = btns.FirstOrDefault(x => x.name.Equals(nameof(Button_Cancel)));
Button_Close.onClick.AddListener(() => Active(false));
Button_OK.onClick.AddListener(Save);
Button_Cancel.onClick.AddListener(Close);
Button_Close.onClick.AddListener(Close);
}
private void OnClickAddAPIConnectionItemButton()
{
CreateItem();
}
private void CreateItem()
{
var item = Instantiate(prf_MQTTConnectionItem, Content);
item.onRemoveMQTTConnectionItem += RemoveMQTTConnectionItem;
@@ -65,6 +156,7 @@ namespace Studio.UI
}
public void SetMQTTSetting(MQTTSetting mqttSetting)
{
prevMQTTSetting = mqttSetting;
foreach(var item in mqttConnectionItems)
{
Destroy(item.gameObject);

View File

@@ -53,7 +53,7 @@ namespace Studio.UI
var projectName = GetProjectName();
var projectPath = GetProjectRoute();
if (!IsProjectNameVaild(projectName) || !IsProjectExistVaild())
if (!IsProjectNameVaild(projectName) || !IsProjectExistVaild(projectName) || IsWindowRestrictedKey(projectName))
{
InputFieldHighlight(InputField_ProjectName);
return;
@@ -107,18 +107,32 @@ namespace Studio.UI
}
return true;
}
private bool IsProjectExistVaild()
private bool IsProjectExistVaild(string projectName)
{
var projectPath = InputField_ProjectRoute.text;
var projectNameAndExtension = $"{InputField_ProjectName.text}.ocs";
var filePath = Path.Combine(projectPath, projectNameAndExtension);
if (File.Exists(filePath))
var projectNameAndExtension = $"{projectName}.ocs";
if (File.Exists(projectNameAndExtension))
{
return false;
}
return true;
}
private bool IsWindowRestrictedKey(string input)
{
char[] invalidChars = Path.GetInvalidFileNameChars();
if (input[0] == ' ')
return true;
foreach (char c in input)
{
if (invalidChars.Contains(c))
{
return true;
}
}
return false;
}
private void InputFieldHighlight(TMP_InputField inputField)
{
CoroutineRunner.instance.StartCoroutine(Blink(inputField));
@@ -129,7 +143,7 @@ namespace Studio.UI
Color tempColor = inputFieldOutline.effectColor;
var count = 0;
while (count < 1)
while (count < 2)
{
while (tempColor.a < 1f)
{

View File

@@ -1,11 +1,14 @@
using Newtonsoft.Json;
using Newtonsoft.Json;
using Ookii.Dialogs;
using Studio.Core;
using Studio.Manage;
using Studio.Util;
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using TMPro;
using TriLibCore.SFB;
using UnityEngine;
@@ -17,68 +20,145 @@ namespace Studio.UI
public class Panel_OpenProjectInfo : PanelBase
{
private GameObject recentProjectItemPrefab;
private List<string> recentProjectPathList = new();
private const int maxRecentProjectCount = 3;
private List<Outline> outlines = new();
public TMP_InputField InputField_ProjectRoute;
public Outline projectRouteOutline;
public Button Button_FileExplorer;
//public Button Button_Server;
public RectTransform RecentProjects;
public ToggleGroup RecentProjects;
public Action onClickFileExplorer;
public Action onClickServer;
private RectTransform Footer;
public TextMeshProUGUI Text_ProjectName;
public Image Image_ProjectMetaInfo;
public TextMeshProUGUI Text_ProjectLength;
public TextMeshProUGUI Text_ProjectCreateTime;
public TextMeshProUGUI Text_ProjectLastWriteTime;
public Button Button_Open;
public Action onClickOpen;
private const string projectPathsSaveKey = "RecentProjectPaths";
private Color32 warningOutlineColor = new Color32(0xFF, 0x00, 0x00, 0xFF);
private Color32 selectedOutlineColor = new Color32(0x7B, 0xB9, 0xFF, 0xFF);
private Color32 defaultOutlineColor;
public override void AfterAwake()
{
recentProjectItemPrefab = Resources.Load<GameObject>("Prefabs/UI/PRF_QuickStartItem");
InputField_ProjectRoute.onEndEdit.AddListener(OnEndEditProjectRoute);
projectRouteOutline = InputField_ProjectRoute.GetComponent<Outline>();
defaultOutlineColor = projectRouteOutline.effectColor;
InputField_ProjectRoute.onSelect.AddListener(OnSelectSearchProjectRoute);
InputField_ProjectRoute.onValueChanged.AddListener(OnValueChangedSearchProjectRoute);
Button_FileExplorer.onClick.AddListener(OnClickFileExplorer);
Button_Open.onClick.AddListener(OnClickOpen);
// Test
for (int i = 0; i < 3; i++)
LoadRecentProjects();
SetRecentProjectItems();
}
private void LoadRecentProjects()
{
if (PlayerPrefs.HasKey(projectPathsSaveKey))
{
CreateRecentProjectItem();
string json = PlayerPrefs.GetString(projectPathsSaveKey);
recentProjectPathList = JsonConvert.DeserializeObject<List<string>>(json);
}
}
private void OnEndEditProjectRoute(string input)
private void SetRecentProjectItems()
{
foreach (Transform child in RecentProjects.transform)
{
Destroy(child.gameObject);
}
outlines.Clear();
outlines.Add(projectRouteOutline);
foreach (string path in recentProjectPathList)
{
CreateRecentProjectItem(path);
}
}
public void CreateRecentProjectItem(string path)
{
UI_QuickStartItem item = Instantiate(recentProjectItemPrefab, RecentProjects.transform).GetComponent<UI_QuickStartItem>();
item.Init(path, OnClickItem);
outlines.Add(item.outline);
}
private void OnClickItem(string path)
{
projectRouteOutline.effectColor = defaultOutlineColor;
Footer.gameObject.SetActive(true);
if (IsPathVaild(path))
{
SetFooterUI(path);
}
else
{
ResetFooterUI();
}
}
private void SetFooterUI(string path)
{
FileInfo info = new FileInfo(path);
Text_ProjectName.text = Path.GetFileNameWithoutExtension(path);
Text_ProjectLength.text = info.Length.ToString();
Text_ProjectCreateTime.text = info.CreationTime.ToString();
Text_ProjectLastWriteTime.text = info.LastWriteTime.ToString();
}
private void ResetFooterUI()
{
Text_ProjectName.text = "-";
Text_ProjectLength.text = "-";
Text_ProjectCreateTime.text = "-";
Text_ProjectLastWriteTime.text = "-";
}
public void AddRecentProject(string newPath)
{
recentProjectPathList.Remove(newPath);
recentProjectPathList.Insert(0, newPath);
if (recentProjectPathList.Count > maxRecentProjectCount)
recentProjectPathList.RemoveAt(recentProjectPathList.Count - 1);
SaveRecentProjects();
SetRecentProjectItems();
}
private void SaveRecentProjects()
{
string json = JsonConvert.SerializeObject(recentProjectPathList);
PlayerPrefs.SetString(projectPathsSaveKey, json);
PlayerPrefs.Save();
}
private void OnSelectSearchProjectRoute(string input)
{
RecentProjects.SetAllTogglesOff();
OnValueChangedSearchProjectRoute(input);
}
private void OnValueChangedSearchProjectRoute(string input)
{
if (!IsPathVaild(input))
{
InputFieldHighlight(InputField_ProjectRoute);
projectRouteOutline.effectColor = warningOutlineColor;
Footer.gameObject.SetActive(false);
Text_ProjectName.text = string.Empty;
return;
}
projectRouteOutline.effectColor = selectedOutlineColor;
Footer.gameObject.SetActive(true);
var name = Path.GetFileNameWithoutExtension(input);
Text_ProjectName.text = name;
string json = File.ReadAllText(input);
var metaInfo = JsonConvert.DeserializeObject<ProjectData>(json).sceneStartSetting.appSetting;
if (!string.IsNullOrEmpty(metaInfo.splashImageByte))
{
var bytes = Convert.FromBase64String(metaInfo.splashImageByte);
Texture2D texture = new Texture2D(2, 2);
if (texture.LoadImage(bytes))
{
Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
Image_ProjectMetaInfo.sprite = sprite;
float height = Image_ProjectMetaInfo.rectTransform.rect.height;
float newWidth = Image_ProjectMetaInfo.rectTransform.rect.height / metaInfo.ratio;
Image_ProjectMetaInfo.rectTransform.sizeDelta = new Vector2(newWidth, height);
}
}
SetFooterUI(input);
}
private void OnClickFileExplorer()
@@ -87,32 +167,25 @@ namespace Studio.UI
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
{
RecentProjects.SetAllTogglesOff();
OnValueChangedSearchProjectRoute(paths[0].Name);
InputField_ProjectRoute.text = paths[0].Name;
InputField_ProjectRoute.onEndEdit?.Invoke(InputField_ProjectRoute.text);
}
onClickFileExplorer?.Invoke();
}
private void OnClickServer()
{
onClickServer?.Invoke();
}
public void CreateRecentProjectItem()
{
UI_QuickStartItem item = Instantiate(recentProjectItemPrefab, RecentProjects).GetComponent<UI_QuickStartItem>();
item.Init(name, OnClickItem);
}
private void OnClickItem()
{
Footer.gameObject.SetActive(true);
Text_ProjectName.text = "test Name";
}
private void OnClickOpen()
{
onClickOpen?.Invoke();
if (File.Exists(GetProjectRoute()))
{
onClickOpen?.Invoke();
}
else
{
CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_toastmessage.ActivateMessage("프로젝트가 존재하지 않습니다.");
Footer.gameObject.SetActive(false);
}
}
public void Open()
@@ -124,49 +197,24 @@ namespace Studio.UI
{
SetActive(false);
}
public string GetProjectRoute()
{
var route = InputField_ProjectRoute.text;
return route;
var target = outlines.FirstOrDefault(o => o.enabled && o.effectColor == selectedOutlineColor);
if (target == null)
return null;
var route = target.GetComponentInChildren<TextMeshProUGUI>().text;
var cleanRoute = Regex.Replace(route, @"\p{Z}|\p{C}", "");
return cleanRoute;
}
private bool IsPathVaild(string path)
{
if(path == string.Empty || !File.Exists(path))
if (path == string.Empty || !File.Exists(path))
{
return false;
}
return true;
}
private void InputFieldHighlight(TMP_InputField inputField)
{
CoroutineRunner.instance.StartCoroutine(Blink(inputField));
}
private IEnumerator Blink(TMP_InputField inputField)
{
var inputFieldOutline = inputField.GetComponent<Outline>();
Color tempColor = inputFieldOutline.effectColor;
var count = 0;
while (count < 1)
{
while (tempColor.a < 1f)
{
tempColor.a = Mathf.Clamp(tempColor.a + 0.1f, 0f, 1f);
inputFieldOutline.effectColor = tempColor;
yield return new WaitForSeconds(0.02f);
}
yield return new WaitForSeconds(0.1f);
while (tempColor.a > 0f)
{
tempColor.a = Mathf.Clamp(tempColor.a - 0.1f, 0f, 1f);
inputFieldOutline.effectColor = tempColor;
yield return new WaitForSeconds(0.02f);
}
yield return new WaitForSeconds(0.1f);
count++;
}
}
}
}

View File

@@ -1,4 +1,4 @@
using Studio.Manage;
using Studio.Manage;
using System;
using TMPro;
using UnityEngine;
@@ -102,19 +102,19 @@ namespace Studio.UI
private void OnClickLogo()
{
Debug.Log("On TopMenu Click Logo");
SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex);
ManagerHub.instance.Get<CameraManager>().InitCameraTransform();
}
private void OnClickMQTTSetting()
{
Debug.Log("On TopMenu Click MQTT Setting");
CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_mqttsetting.SetActive(true);
CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_mqttsetting.Open();
}
private void OnClickAPISetting()
{
Debug.Log("On TopMenu Click API Setting");
CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_apisetting.SetActive(true);
CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_apisetting.Open();
}
private void OnClickAuthSetting()
@@ -126,7 +126,7 @@ namespace Studio.UI
private void OnClickAppSetting()
{
Debug.Log("On TopMenu Click App Setting");
CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_appsetting.SetActive(true);
CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_appsetting.Open();
}
private void OnClickAssetSetting()
{

View File

@@ -0,0 +1,55 @@
using System.Collections;
using TMPro;
using UnityEngine;
using XRLib.UI;
namespace Studio.UI
{
public class Panel_ToastMessage : PanelBase
{
RectTransform Image_bg;
TextMeshProUGUI Text_Message;
public Vector2 padding = new Vector2(20f, 10f);
private float delay = 1f;
IEnumerator coroutine;
public override void AfterAwake()
{
transform.SetAsLastSibling();
}
public void ActivateMessage(string message)
{
if (coroutine != null)
StopCoroutine(coroutine);
Text_Message.text = message;
UpdateBackgroundSize();
gameObject.SetActive(true);
coroutine = AutoDeactivateAfterDelay();
StartCoroutine(coroutine);
}
public void DeactivateMessage()
{
gameObject.SetActive(false);
}
private IEnumerator AutoDeactivateAfterDelay()
{
yield return new WaitForSeconds(delay);
DeactivateMessage();
}
void UpdateBackgroundSize()
{
float textWidth = Text_Message.preferredWidth;
float textHeight = Text_Message.preferredHeight;
Image_bg.sizeDelta = new Vector2(textWidth + padding.x, textHeight + padding.y);
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 342dbf6aa759fab499828fbf940b0dd7

View File

@@ -1,10 +1,7 @@
using System.Reflection;
using System.Xml;
using TMPro;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
using UnityEngine.UI.Extensions;
using XRLib.UI;
namespace Studio.UI
@@ -15,6 +12,8 @@ namespace Studio.UI
TextMeshProUGUI text_tooltip;
public Vector2 padding = new Vector2(20f, 10f);
private float standardScreenWidth = 1920f;
private float standardScreenHeight = 1080f;
public override void AfterAwake()
{
@@ -73,22 +72,10 @@ namespace Studio.UI
{
Vector2 mousePos = Input.mousePosition;
float bgSizeX = image_bg.sizeDelta.x / 2;
float bgSizeY = image_bg.sizeDelta.y / 2;
float movePosX = mousePos.x + bgSizeX;
float bgSizeY = image_bg.sizeDelta.y * 1.3f * Screen.height / standardScreenHeight;
float movePosY = mousePos.y - bgSizeY;
if (mousePos.x + image_bg.sizeDelta.x > Screen.width)
{
movePosX = mousePos.x - bgSizeX;
}
if (mousePos.y - image_bg.sizeDelta.y < 0)
{
movePosY = mousePos.y + bgSizeY;
}
Vector2 movePos = new Vector2(movePosX, movePosY);
Vector2 movePos = new Vector2(mousePos.x, movePosY);
image_bg.transform.position = movePos;
text_tooltip.transform.position = movePos;

View File

@@ -2,6 +2,7 @@ using Studio.Core;
using System;
using System.Collections;
using System.IO;
using System.Linq;
using TMPro;
using TriLibCore.SFB;
using UnityEngine;
@@ -47,7 +48,7 @@ namespace Studio.UI
var projectName = GetProjectName();
var projectPath = GetProjectRoute();
if (!IsProjectNameVaild(projectName) || !IsProjectExistVaild())
if (!IsProjectNameVaild(projectName) || !IsProjectExistVaild(projectName) || IsWindowRestrictedKey(projectName))
{
InputFieldHighlight(InputField_ProjectName);
return;
@@ -99,18 +100,32 @@ namespace Studio.UI
}
return true;
}
private bool IsProjectExistVaild()
private bool IsProjectExistVaild(string projectName)
{
var projectPath = InputField_ProjectRoute.text;
var projectNameAndExtension = $"{InputField_ProjectName.text}.ocs";
var projectNameAndExtension = $"{projectName}.ocs";
var filePath = Path.Combine(projectPath, projectNameAndExtension);
if (File.Exists(filePath))
if (File.Exists(projectNameAndExtension))
{
return false;
}
return true;
}
private bool IsWindowRestrictedKey(string input)
{
char[] invalidChars = Path.GetInvalidFileNameChars();
if (input[0] == ' ')
return true;
foreach (char c in input)
{
if (invalidChars.Contains(c))
{
return true;
}
}
return false;
}
private void InputFieldHighlight(TMP_InputField inputField)
{
CoroutineRunner.instance.StartCoroutine(Blink(inputField));