이것 저것 수정

This commit is contained in:
Ino 2025-02-18 14:59:11 +09:00
parent 22e2c6044c
commit 60342521a8
20 changed files with 518 additions and 19547 deletions

View File

@ -269,7 +269,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.89019614, g: 0.8862746, b: 0.9058824, a: 1}
m_RaycastTarget: 0
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:

View File

@ -2,7 +2,7 @@ fileFormatVersion: 2
guid: dabbd77a66e8218499e808fa01d327e0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2,7 +2,7 @@ fileFormatVersion: 2
guid: fc98c6bc284eb6d42984dd113e103f14
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2,7 +2,7 @@ fileFormatVersion: 2
guid: 0ca4348990d16c64c9b7bd55b6e28b56
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2,7 +2,7 @@ fileFormatVersion: 2
guid: 1c6db4fa620781947a116d69785fc547
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2,7 +2,7 @@ fileFormatVersion: 2
guid: 06fa895f777df864abd092f4e8c3faeb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2,7 +2,7 @@ fileFormatVersion: 2
guid: 6224db48a2ff1554e989517e4f91fdc8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2,7 +2,7 @@ fileFormatVersion: 2
guid: c89759bb9b16580449abc77bc1e7272d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2,7 +2,7 @@ fileFormatVersion: 2
guid: 6febc7f686bdf2548a2da7524ba3d184
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2,7 +2,7 @@ fileFormatVersion: 2
guid: 5e9ec22321a613a4fac86604b50b6649
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2,7 +2,7 @@ fileFormatVersion: 2
guid: 042022bafbe83d54eb7d0f450c65795c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2,7 +2,7 @@ fileFormatVersion: 2
guid: 82dff55ee83f7254b8626132e3915e38
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1495,6 +1495,81 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_localtextKey: 186
--- !u!1 &104619399030244040
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3409269328062845066}
- component: {fileID: 1606635957414427815}
- component: {fileID: 4301893575571891414}
m_Layer: 5
m_Name: no
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3409269328062845066
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 104619399030244040}
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: 2579632502600516791}
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 &1606635957414427815
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 104619399030244040}
m_CullTransparentMesh: 1
--- !u!114 &4301893575571891414
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 104619399030244040}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, 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 &104750505646804398
GameObject:
m_ObjectHideFlags: 0
@ -1790,7 +1865,7 @@ GameObject:
m_Component:
- component: {fileID: 3812664029820168240}
- component: {fileID: 1755934351830897434}
- component: {fileID: 2860754647990524764}
- component: {fileID: 4881377734903615504}
m_Layer: 5
m_Name: bg
m_TagString: Untagged
@ -1826,7 +1901,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 157756901197820590}
m_CullTransparentMesh: 1
--- !u!114 &2860754647990524764
--- !u!114 &4881377734903615504
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -1835,27 +1910,24 @@ MonoBehaviour:
m_GameObject: {fileID: 157756901197820590}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.89019614, g: 0.8862746, b: 0.9058824, a: 1}
m_RaycastTarget: 1
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_Sprite: {fileID: 21300000, guid: a31e6307ce76ca74fae4e162babfc2f8, 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
m_Texture: {fileID: 2800000, guid: a31e6307ce76ca74fae4e162babfc2f8, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &172581590431189161
GameObject:
m_ObjectHideFlags: 0
@ -5157,7 +5229,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@ -9840,7 +9912,7 @@ GameObject:
m_Component:
- component: {fileID: 6402432877941551947}
- component: {fileID: 8989073790724333758}
- component: {fileID: 261498220793547435}
- component: {fileID: 818256621180929326}
m_Layer: 5
m_Name: bot_bg
m_TagString: Untagged
@ -9875,7 +9947,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 888160102046605469}
m_CullTransparentMesh: 1
--- !u!114 &261498220793547435
--- !u!114 &818256621180929326
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -9884,27 +9956,24 @@ MonoBehaviour:
m_GameObject: {fileID: 888160102046605469}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: ae3dd9bdaa3847444928351cc2b3326b, 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
m_Texture: {fileID: 2800000, guid: ae3dd9bdaa3847444928351cc2b3326b, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &890088099962823016
GameObject:
m_ObjectHideFlags: 0
@ -11998,6 +12067,81 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1 &1041126001313836698
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 886705825373735543}
- component: {fileID: 1537230701962175523}
- component: {fileID: 3874915774580517856}
m_Layer: 5
m_Name: no
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &886705825373735543
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1041126001313836698}
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: 6913852074128511511}
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 &1537230701962175523
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1041126001313836698}
m_CullTransparentMesh: 1
--- !u!114 &3874915774580517856
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1041126001313836698}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, 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 &1060359919966978804
GameObject:
m_ObjectHideFlags: 0
@ -12162,6 +12306,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3359606957993107563}
- {fileID: 8139120239228747206}
- {fileID: 1080857885390129922}
- {fileID: 3734107378447804724}
@ -19945,7 +20090,7 @@ GameObject:
m_Component:
- component: {fileID: 5361784138100151804}
- component: {fileID: 1654255486224492529}
- component: {fileID: 3265474166013512784}
- component: {fileID: 6613323406753100314}
m_Layer: 5
m_Name: New Image
m_TagString: Untagged
@ -19980,7 +20125,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1752462634594138302}
m_CullTransparentMesh: 1
--- !u!114 &3265474166013512784
--- !u!114 &6613323406753100314
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -19989,7 +20134,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1752462634594138302}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@ -20000,16 +20145,13 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 055c8fa935863d14ba0a7014510641a5, 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
m_Texture: {fileID: 2800000, guid: 055c8fa935863d14ba0a7014510641a5, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &1755202993034547698
GameObject:
m_ObjectHideFlags: 0
@ -21692,6 +21834,81 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1869714298466508637
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 218644919282629287}
- component: {fileID: 4921888855888435829}
- component: {fileID: 766095814189807140}
m_Layer: 5
m_Name: no
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &218644919282629287
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1869714298466508637}
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: 968397854553593359}
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 &4921888855888435829
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1869714298466508637}
m_CullTransparentMesh: 1
--- !u!114 &766095814189807140
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1869714298466508637}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, 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 &1877750369573639924
GameObject:
m_ObjectHideFlags: 0
@ -28991,7 +29208,7 @@ GameObject:
m_Component:
- component: {fileID: 8477929361545760819}
- component: {fileID: 4784956725592501366}
- component: {fileID: 1071621857265711110}
- component: {fileID: 6430617173830268295}
m_Layer: 5
m_Name: bg
m_TagString: Untagged
@ -29027,7 +29244,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2359737983294285245}
m_CullTransparentMesh: 1
--- !u!114 &1071621857265711110
--- !u!114 &6430617173830268295
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -29036,27 +29253,24 @@ MonoBehaviour:
m_GameObject: {fileID: 2359737983294285245}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.89019614, g: 0.8862746, b: 0.9058824, a: 1}
m_RaycastTarget: 1
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_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: a31e6307ce76ca74fae4e162babfc2f8, 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
m_Texture: {fileID: 2800000, guid: a31e6307ce76ca74fae4e162babfc2f8, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &2363298449017758487
GameObject:
m_ObjectHideFlags: 0
@ -29635,7 +29849,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@ -40418,7 +40632,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@ -40658,7 +40872,7 @@ GameObject:
m_Component:
- component: {fileID: 4534326516925197992}
- component: {fileID: 6895372468068957404}
- component: {fileID: 3330166342394317668}
- component: {fileID: 9031874290054324162}
m_Layer: 5
m_Name: New Image
m_TagString: Untagged
@ -40693,7 +40907,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3238477655569658409}
m_CullTransparentMesh: 1
--- !u!114 &3330166342394317668
--- !u!114 &9031874290054324162
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -40702,7 +40916,7 @@ MonoBehaviour:
m_GameObject: {fileID: 3238477655569658409}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@ -40713,16 +40927,13 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 055c8fa935863d14ba0a7014510641a5, 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
m_Texture: {fileID: 2800000, guid: 055c8fa935863d14ba0a7014510641a5, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &3260927161572791588
GameObject:
m_ObjectHideFlags: 0
@ -44598,7 +44809,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &8112082934472033055
RectTransform:
m_ObjectHideFlags: 0
@ -45944,7 +46155,7 @@ GameObject:
m_Component:
- component: {fileID: 8021828486778329183}
- component: {fileID: 854066175064879695}
- component: {fileID: 3952251622616763277}
- component: {fileID: 3050911467205091217}
m_Layer: 5
m_Name: New Image
m_TagString: Untagged
@ -45979,7 +46190,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3714468890599563911}
m_CullTransparentMesh: 1
--- !u!114 &3952251622616763277
--- !u!114 &3050911467205091217
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -45988,27 +46199,24 @@ MonoBehaviour:
m_GameObject: {fileID: 3714468890599563911}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 055c8fa935863d14ba0a7014510641a5, 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
m_Texture: {fileID: 2800000, guid: 055c8fa935863d14ba0a7014510641a5, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &3718546798710748696
GameObject:
m_ObjectHideFlags: 0
@ -69857,6 +70065,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 218644919282629287}
- {fileID: 6293606928921716849}
- {fileID: 3022661304010702938}
- {fileID: 890059663777587120}
@ -73247,6 +73456,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3626976199576539173}
- {fileID: 5797929273451651801}
- {fileID: 5596668806461245177}
- {fileID: 8112082934472033055}
@ -75443,7 +75653,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@ -78095,6 +78305,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3409269328062845066}
- {fileID: 6919743896501049083}
- {fileID: 7913127528999160525}
- {fileID: 1434535871065357016}
@ -80855,7 +81066,7 @@ GameObject:
m_Component:
- component: {fileID: 1344551653321315524}
- component: {fileID: 7190969905405490687}
- component: {fileID: 5061805452596764298}
- component: {fileID: 3321091654811025231}
m_Layer: 5
m_Name: bg
m_TagString: Untagged
@ -80891,7 +81102,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6808454598634869136}
m_CullTransparentMesh: 1
--- !u!114 &5061805452596764298
--- !u!114 &3321091654811025231
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -80900,27 +81111,24 @@ MonoBehaviour:
m_GameObject: {fileID: 6808454598634869136}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.89019614, g: 0.8862746, b: 0.9058824, a: 1}
m_RaycastTarget: 1
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_Sprite: {fileID: 21300000, guid: a31e6307ce76ca74fae4e162babfc2f8, 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
m_Texture: {fileID: 2800000, guid: a31e6307ce76ca74fae4e162babfc2f8, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &6810466963145257824
GameObject:
m_ObjectHideFlags: 0
@ -85795,6 +86003,81 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1 &7238883046812849633
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3626976199576539173}
- component: {fileID: 6475292696012916001}
- component: {fileID: 6673778641680427678}
m_Layer: 5
m_Name: no
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3626976199576539173
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7238883046812849633}
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: 7404742651207184332}
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 &6475292696012916001
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7238883046812849633}
m_CullTransparentMesh: 1
--- !u!114 &6673778641680427678
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7238883046812849633}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, 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 &7245831461759651370
GameObject:
m_ObjectHideFlags: 0
@ -90012,6 +90295,81 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_localtextKey: 192
--- !u!1 &7542041562904462369
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3359606957993107563}
- component: {fileID: 5313469318649687851}
- component: {fileID: 3171679934977306763}
m_Layer: 5
m_Name: no
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3359606957993107563
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7542041562904462369}
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: 2331490513192813796}
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 &5313469318649687851
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7542041562904462369}
m_CullTransparentMesh: 1
--- !u!114 &3171679934977306763
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7542041562904462369}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, 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 &7544736692068467179
GameObject:
m_ObjectHideFlags: 0
@ -93768,7 +94126,7 @@ GameObject:
m_Component:
- component: {fileID: 4815075738420279778}
- component: {fileID: 3646898707604594297}
- component: {fileID: 4048808739888945045}
- component: {fileID: 3438354297390555903}
m_Layer: 5
m_Name: New Image
m_TagString: Untagged
@ -93803,7 +94161,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7896673808232497622}
m_CullTransparentMesh: 1
--- !u!114 &4048808739888945045
--- !u!114 &3438354297390555903
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -93812,7 +94170,7 @@ MonoBehaviour:
m_GameObject: {fileID: 7896673808232497622}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@ -93823,16 +94181,13 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 055c8fa935863d14ba0a7014510641a5, 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
m_Texture: {fileID: 2800000, guid: 055c8fa935863d14ba0a7014510641a5, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &7910342406501495639
GameObject:
m_ObjectHideFlags: 0
@ -93918,7 +94273,7 @@ GameObject:
m_Component:
- component: {fileID: 791344179455118460}
- component: {fileID: 1434561231154103443}
- component: {fileID: 2165290175716955488}
- component: {fileID: 6503507653642557670}
m_Layer: 5
m_Name: bg
m_TagString: Untagged
@ -93954,7 +94309,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7915990221069550371}
m_CullTransparentMesh: 1
--- !u!114 &2165290175716955488
--- !u!114 &6503507653642557670
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -93963,27 +94318,24 @@ MonoBehaviour:
m_GameObject: {fileID: 7915990221069550371}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.89019614, g: 0.8862746, b: 0.9058824, a: 1}
m_RaycastTarget: 1
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_Sprite: {fileID: 21300000, guid: a31e6307ce76ca74fae4e162babfc2f8, 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
m_Texture: {fileID: 2800000, guid: a31e6307ce76ca74fae4e162babfc2f8, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &7916905024379612464
GameObject:
m_ObjectHideFlags: 0
@ -95215,6 +95567,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 886705825373735543}
- {fileID: 2518216429084743740}
- {fileID: 915794159400544783}
- {fileID: 6678857581749354256}
@ -118270,7 +118623,7 @@ PrefabInstance:
- target: {fileID: 8170153791668043269, guid: 0d230cc8be529a542a08cb878ab14b18,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 40988b517bd50b642b40c6250cdeff07
timeCreated: 1491810348
licenseType: Store
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -10,6 +10,7 @@ public class PCActor : MyActor
{
public Transform[] tfs_weapon; // 0 실드, 1 오른손
bool isUI;
float t_RecoverHPTime = 10f, t_RecoverMPTime = 10f, t_autoskill = 0.5f;
float t_HP = 0f, t_MP = 0f;
ObscuredFloat[] arr_magicCoolTime = new ObscuredFloat[] { 0f, 0f, 0f, 0f, 0f, 0f };
@ -29,7 +30,7 @@ public class PCActor : MyActor
protected override void OnDestroy()
{
base.OnDestroy();
if (!m_Enemy) MyValue.MyPC = null;
if (!m_Enemy && !isUI) MyValue.MyPC = null;
}
protected override void Update()
@ -133,6 +134,7 @@ public class PCActor : MyActor
f_FindEnemyRange = table_GlobalValue.Ins.Get_Float("f_PC_FindEnemyRange") + (float)m_Stat.Get_Stat(eStat.AttackRange_Up);
}
public void Set_UIPC() { isUI = true; }
public override void ReSet()
{
base.ReSet();

View File

@ -40,7 +40,6 @@ public class OptionInfo : MonoBehaviourSingletonTemplateBackKeyAdd<OptionInfo>
protected override void Awake()
{
base.Awake();
DontDestroy();
Screen.sleepTimeout = SleepTimeout.NeverSleep; // 게임 실행 중 화면 안 꺼지게
QualitySettings.SetQualityLevel(PlayerPrefs.GetInt("QualitySettings", 1)); // 퀄리티 중을 기본으로

View File

@ -76,7 +76,15 @@ public static class MyValue
};
public static string Get_AnimName(eAnim _animtype) { return dic_animNames[_animtype]; }
static PCActor _mypc;
public static PCActor MyPC { get { return _mypc; } set { _mypc = value; bMyPC = value; } }
public static PCActor MyPC
{
get { return _mypc; }
set
{
_mypc = value;
bMyPC = value;
}
}
public static bool bMyPC;
public static int ChatLimitLV = 1, PotionAddMin = 15;

View File

@ -11,6 +11,7 @@ public class UI3DModel : MonoBehaviour
public Transform tf_model;
AsyncOperationHandle<Texture> currentHandle;
AsyncOperationHandle<GameObject> GoHandle;
protected void Set_2DIlust(CostumeListTableData costumeData)
{
@ -39,12 +40,16 @@ public class UI3DModel : MonoBehaviour
var path = pc ? $"Assets/Res_Addr/PC/{prefab}.prefab" : prefab;
AddrResourceMgr.Ins.LoadObject<GameObject>(path, handle =>
{
var go = DSUtil.Get_Clone(handle.Result, tf_model);
if (GoHandle.IsValid())
Addressables.Release(GoHandle);
GoHandle = handle;
var go = DSUtil.Get_Clone(GoHandle.Result, tf_model);
if (DSUtil.CheckNull(go.GetComponent<AddressableReleaseSelf>()))
go.AddComponent<AddressableReleaseSelf>();
DSUtil.ChangeLayersRecursively(go.transform, "UI");
//Destroy(go.GetComponent<Actor>());
go.GetComponent<Actor>().Stop(true);
if (pc) go.GetComponent<PCActor>().Set_UIPC();
Destroy(go.GetComponent<BoxCollider>());
Destroy(go.GetComponent<NavMeshAgent>());
Destroy(go.GetComponent<Rigidbody>());