diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index 39ff97c38..ca39af619 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -46,4 +46,6 @@ messageinfo 엄청 느린 버그 화살의 경우 화살 궤적 추가하자 전직 후 mypcui 갱신 +몬스터 공격 projectile 이름은 테이블에 있는 걸로 사용 + 추가 컨텐츠 (미믹 던전) \ No newline at end of file diff --git a/Assets/ResWork/UIPrefabs/Memory/HelpUI_MemoryPetBattleCard.prefab b/Assets/ResWork/UIPrefabs/Memory/HelpUI_MemoryPetBattleCard.prefab deleted file mode 100644 index 0676ee940..000000000 --- a/Assets/ResWork/UIPrefabs/Memory/HelpUI_MemoryPetBattleCard.prefab +++ /dev/null @@ -1,998 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1296783866167421656 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7278462216578262473} - - component: {fileID: 7932825447722687827} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7278462216578262473 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1296783866167421656} - 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: 1653204944118539601} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7932825447722687827 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1296783866167421656} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 1, g: 0.26666668, b: 0.26666668, a: 1} - mPivot: 4 - mWidth: 42 - mHeight: 20 - mDepth: 111 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 2.1 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 3996657457383321757, guid: b82558c03923de54da84da7ff79cd9f1, type: 3} - mText: 50% - mFontSize: 19 - mFontStyle: 0 - mAlignment: 0 - mEncoding: 1 - mMaxLineCount: 0 - mEffectStyle: 0 - mEffectColor: {r: 0, g: 0, b: 0, a: 1} - mSymbols: 1 - mEffectDistance: {x: 1, y: 1} - mOverflow: 2 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - mSpacingX: 0 - mSpacingY: 0 - mUseFloatSpacing: 0 - mFloatSpacingX: 0 - mFloatSpacingY: 0 - mOverflowEllipsis: 0 - mOverflowWidth: 0 - mOverflowHeight: 0 - mModifier: 0 - mShrinkToFit: 0 - mMaxLineWidth: 0 - mMaxLineHeight: 0 - mLineWidth: 0 - mMultiline: 1 ---- !u!1 &1719274366054063658 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5160774948663728086} - - component: {fileID: 5666860404480668838} - m_Layer: 5 - m_Name: Sprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5160774948663728086 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1719274366054063658} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -199, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6833882438136094131} - m_Father: {fileID: 5273697514902254805} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5666860404480668838 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1719274366054063658} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.20784314, g: 0.29411766, b: 0.42745098, a: 1} - mPivot: 4 - mWidth: 137 - mHeight: 37 - mDepth: 110 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 3.7027028 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: whitebg - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &2134356417115172283 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6022725498792925138} - - component: {fileID: 344204308381563560} - m_Layer: 5 - m_Name: Sprite (4) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6022725498792925138 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2134356417115172283} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 232.7, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5273697514902254805} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &344204308381563560 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2134356417115172283} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.20784314, g: 0.29411766, b: 0.42745098, a: 1} - mPivot: 4 - mWidth: 36 - mHeight: 37 - mDepth: 110 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.972973 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: whitebg - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &3118921286582411935 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1653204944118539601} - - component: {fileID: 6972051329859840054} - m_Layer: 5 - m_Name: Sprite (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1653204944118539601 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3118921286582411935} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 43.6, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7278462216578262473} - m_Father: {fileID: 5273697514902254805} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6972051329859840054 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3118921286582411935} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.20784314, g: 0.29411766, b: 0.42745098, a: 1} - mPivot: 4 - mWidth: 107 - mHeight: 37 - mDepth: 110 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 2.891892 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: whitebg - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &4486572580798885910 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 23750609893000265} - - component: {fileID: 6836324299555336802} - m_Layer: 5 - m_Name: Sprite (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &23750609893000265 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4486572580798885910} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -70, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1470480124529061945} - m_Father: {fileID: 5273697514902254805} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6836324299555336802 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4486572580798885910} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.20784314, g: 0.29411766, b: 0.42745098, a: 1} - mPivot: 4 - mWidth: 112 - mHeight: 37 - mDepth: 110 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 3.0270271 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: whitebg - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &4502953740313010415 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5802275489638328387} - - component: {fileID: 1026091365174695564} - m_Layer: 5 - m_Name: Sprite (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5802275489638328387 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4502953740313010415} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 156.2, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8854454083932925984} - m_Father: {fileID: 5273697514902254805} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1026091365174695564 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4502953740313010415} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.20784314, g: 0.29411766, b: 0.42745098, a: 1} - mPivot: 4 - mWidth: 107 - mHeight: 37 - mDepth: 110 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 2.891892 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: whitebg - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &5464747991058526852 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8854454083932925984} - - component: {fileID: 6622641457091045871} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8854454083932925984 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5464747991058526852} - 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: 5802275489638328387} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6622641457091045871 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5464747991058526852} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.24705882, g: 0.6901961, b: 1, a: 1} - mPivot: 4 - mWidth: 42 - mHeight: 20 - mDepth: 111 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 2.1 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 3996657457383321757, guid: b82558c03923de54da84da7ff79cd9f1, type: 3} - mText: 50% - mFontSize: 19 - mFontStyle: 0 - mAlignment: 0 - mEncoding: 1 - mMaxLineCount: 0 - mEffectStyle: 0 - mEffectColor: {r: 0, g: 0, b: 0, a: 1} - mSymbols: 1 - mEffectDistance: {x: 1, y: 1} - mOverflow: 2 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - mSpacingX: 0 - mSpacingY: 0 - mUseFloatSpacing: 0 - mFloatSpacingX: 0 - mFloatSpacingY: 0 - mOverflowEllipsis: 0 - mOverflowWidth: 0 - mOverflowHeight: 0 - mModifier: 0 - mShrinkToFit: 0 - mMaxLineWidth: 0 - mMaxLineHeight: 0 - mLineWidth: 0 - mMultiline: 1 ---- !u!1 &5774986260635884075 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5273697514902254805} - - component: {fileID: 8644990681268487340} - m_Layer: 5 - m_Name: HelpUI_MemoryPetBattleCard - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5273697514902254805 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5774986260635884075} - 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: 5160774948663728086} - - {fileID: 23750609893000265} - - {fileID: 1653204944118539601} - - {fileID: 5802275489638328387} - - {fileID: 4334535148887508463} - - {fileID: 6022725498792925138} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8644990681268487340 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5774986260635884075} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97ed715dec033da419ba9958cd66fc72, type: 3} - m_Name: - m_EditorClassIdentifier: - labels: - - {fileID: 9115364844509154877} - - {fileID: 8718486905061432708} - - {fileID: 7932825447722687827} - - {fileID: 6622641457091045871} - go_clear: {fileID: 7055104297216902402} ---- !u!1 &7055104297216902402 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4334535148887508463} - - component: {fileID: 3881203095853116383} - m_Layer: 5 - m_Name: Sprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4334535148887508463 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7055104297216902402} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 233.6, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5273697514902254805} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3881203095853116383 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7055104297216902402} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 1, g: 1, b: 1, a: 1} - mPivot: 4 - mWidth: 50 - mHeight: 38 - mDepth: 112 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 1.3157895 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: checkmark - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &8271990676522931000 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1470480124529061945} - - component: {fileID: 8718486905061432708} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1470480124529061945 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8271990676522931000} - 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: 23750609893000265} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8718486905061432708 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8271990676522931000} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 1, g: 1, b: 0.87843144, a: 1} - mPivot: 4 - mWidth: 84 - mHeight: 20 - mDepth: 111 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 4.2 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 3996657457383321757, guid: b82558c03923de54da84da7ff79cd9f1, type: 3} - mText: "FF\uAE09 \uB9C8\uB140" - mFontSize: 19 - mFontStyle: 0 - mAlignment: 0 - mEncoding: 1 - mMaxLineCount: 0 - mEffectStyle: 0 - mEffectColor: {r: 0, g: 0, b: 0, a: 1} - mSymbols: 1 - mEffectDistance: {x: 1, y: 1} - mOverflow: 2 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - mSpacingX: 0 - mSpacingY: 0 - mUseFloatSpacing: 0 - mFloatSpacingX: 0 - mFloatSpacingY: 0 - mOverflowEllipsis: 0 - mOverflowWidth: 0 - mOverflowHeight: 0 - mModifier: 0 - mShrinkToFit: 0 - mMaxLineWidth: 0 - mMaxLineHeight: 0 - mLineWidth: 0 - mMultiline: 1 ---- !u!1 &8971697757302268071 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6833882438136094131} - - component: {fileID: 9115364844509154877} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6833882438136094131 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8971697757302268071} - 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: 5160774948663728086} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &9115364844509154877 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8971697757302268071} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 1, g: 1, b: 0.87843144, a: 1} - mPivot: 4 - mWidth: 78 - mHeight: 20 - mDepth: 111 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 3.9 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 3996657457383321757, guid: b82558c03923de54da84da7ff79cd9f1, type: 3} - mText: "\uBE68\uAC04 \uB9C8\uB140" - mFontSize: 19 - mFontStyle: 0 - mAlignment: 0 - mEncoding: 1 - mMaxLineCount: 0 - mEffectStyle: 0 - mEffectColor: {r: 0, g: 0, b: 0, a: 1} - mSymbols: 1 - mEffectDistance: {x: 1, y: 1} - mOverflow: 2 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - mSpacingX: 0 - mSpacingY: 0 - mUseFloatSpacing: 0 - mFloatSpacingX: 0 - mFloatSpacingY: 0 - mOverflowEllipsis: 0 - mOverflowWidth: 0 - mOverflowHeight: 0 - mModifier: 0 - mShrinkToFit: 0 - mMaxLineWidth: 0 - mMaxLineHeight: 0 - mLineWidth: 0 - mMultiline: 1 diff --git a/Assets/ResWork/UIPrefabs/Memory/HelpUI_MemoryPetBattleCard.prefab.meta b/Assets/ResWork/UIPrefabs/Memory/HelpUI_MemoryPetBattleCard.prefab.meta deleted file mode 100644 index 47bddf4e8..000000000 --- a/Assets/ResWork/UIPrefabs/Memory/HelpUI_MemoryPetBattleCard.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3002398a772a5df419f7bc5f4a1cfe25 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index e4216f8bd..0cb28b9ae 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -3725,6 +3725,141 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &408153113885604664 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5892108125861505840} + - component: {fileID: 4124709434301219396} + - component: {fileID: 1134907645997091294} + m_Layer: 5 + m_Name: t_chaptername + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5892108125861505840 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 408153113885604664} + 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: 1438474692404572917} + 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: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4124709434301219396 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 408153113885604664} + m_CullTransparentMesh: 1 +--- !u!114 &1134907645997091294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 408153113885604664} + 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: "\uCC55\uD130 \uC774\uB984" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + 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: 55 + m_fontSizeBase: 55 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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 &409919009277886911 GameObject: m_ObjectHideFlags: 0 @@ -4744,6 +4879,96 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &529972152460884466 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3239661910951373017} + - component: {fileID: 2531977821924282838} + - component: {fileID: 9095492720556120334} + - component: {fileID: 4710266545357339627} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3239661910951373017 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 529972152460884466} + 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: 6726094097797865710} + m_Father: {fileID: 7215933868130760821} + 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, y: 1} +--- !u!222 &2531977821924282838 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 529972152460884466} + m_CullTransparentMesh: 1 +--- !u!114 &9095492720556120334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 529972152460884466} + 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: 10917, 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 &4710266545357339627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 529972152460884466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 --- !u!1 &531517334021582043 GameObject: m_ObjectHideFlags: 0 @@ -7562,6 +7787,44 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &865236735749573834 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9166762771282384750} + m_Layer: 5 + m_Name: WorldMapDungeonCard + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9166762771282384750 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 865236735749573834} + 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: 6315105599271688744} + - {fileID: 5934610984522903586} + - {fileID: 6990752344078578861} + m_Father: {fileID: 6726094097797865710} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 240, y: -50} + m_SizeDelta: {x: 480, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &883457059025034611 GameObject: m_ObjectHideFlags: 0 @@ -11067,6 +11330,141 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1192391943898538070 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6990752344078578861} + - component: {fileID: 1451345698880666491} + - component: {fileID: 9004671831214140285} + m_Layer: 5 + m_Name: dungeonDesc + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6990752344078578861 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1192391943898538070} + 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: 9166762771282384750} + 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: -24} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1451345698880666491 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1192391943898538070} + m_CullTransparentMesh: 1 +--- !u!114 &9004671831214140285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1192391943898538070} + 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: "\uB9CE\uC740 \uACE8\uB4DC\uC640 \uC815\uC218 \uD68D\uB4DD \uAC00\uB2A5" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + 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: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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 &1193171048082107215 GameObject: m_ObjectHideFlags: 0 @@ -22266,6 +22664,152 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2217829848941847260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1530509777072174400} + - component: {fileID: 2830171394363274965} + - component: {fileID: 1731921734350090192} + - component: {fileID: 4300923026904720138} + - component: {fileID: 8646972401589575402} + m_Layer: 5 + m_Name: btn_ + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1530509777072174400 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2217829848941847260} + 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: 6846762435921063468} + m_Father: {fileID: 3456383120591884671} + 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: 127} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2830171394363274965 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2217829848941847260} + m_CullTransparentMesh: 1 +--- !u!114 &1731921734350090192 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2217829848941847260} + 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.9960785, g: 0.7411765, b: 0.2509804, 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!114 &4300923026904720138 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2217829848941847260} + 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: 1731921734350090192} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: MapChoiceUI_WorldMap, Assembly-CSharp + m_MethodName: OnClick_Portal + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &8646972401589575402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2217829848941847260} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2226689046372767109 GameObject: m_ObjectHideFlags: 0 @@ -35631,6 +36175,155 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3396887743123530234 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6846762435921063468} + - component: {fileID: 7521396802755816461} + - component: {fileID: 4056221073623760888} + - component: {fileID: 4412313249357973675} + m_Layer: 5 + m_Name: btnName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6846762435921063468 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3396887743123530234} + 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: 1530509777072174400} + 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 &7521396802755816461 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3396887743123530234} + m_CullTransparentMesh: 1 +--- !u!114 &4056221073623760888 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3396887743123530234} + 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: "\uC989\uC2DC \uC774\uB3D9" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + 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: 50 + m_fontSizeBase: 50 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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!114 &4412313249357973675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3396887743123530234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} + m_Name: + m_EditorClassIdentifier: + m_localtextKey: 320 --- !u!1 &3399385713515205864 GameObject: m_ObjectHideFlags: 0 @@ -47680,6 +48373,140 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4723289906628814146 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6315105599271688744} + - component: {fileID: 5295236109656588087} + - component: {fileID: 8940834888112621125} + - component: {fileID: 7467117494121907016} + - component: {fileID: 4088007919082242487} + m_Layer: 5 + m_Name: btn_ + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6315105599271688744 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4723289906628814146} + 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: 235038788897522542} + m_Father: {fileID: 9166762771282384750} + 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 &5295236109656588087 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4723289906628814146} + m_CullTransparentMesh: 1 +--- !u!114 &8940834888112621125 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4723289906628814146} + 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.454902, g: 0.454902, b: 0.454902, 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!114 &7467117494121907016 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4723289906628814146} + 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: 8940834888112621125} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &4088007919082242487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4723289906628814146} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4723773007898273451 GameObject: m_ObjectHideFlags: 0 @@ -52656,7 +53483,7 @@ GameObject: m_Component: - component: {fileID: 2110679134536967495} m_Layer: 5 - m_Name: WorldMapInfo + m_Name: MapInfo m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -53403,6 +54230,59 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5410764190926701895 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5366708532861094367} + - component: {fileID: 5601256889859448277} + m_Layer: 5 + m_Name: Dungeon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5366708532861094367 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5410764190926701895} + 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: 7215933868130760821} + - {fileID: 3456383120591884671} + 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!114 &5601256889859448277 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5410764190926701895} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b6eabfd6323ae54295de96dccf8e9fb, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ScrollRect: {fileID: 0} + m_Content: {fileID: 0} + go_card: {fileID: 0} --- !u!1 &5415595708530692618 GameObject: m_ObjectHideFlags: 0 @@ -66453,6 +67333,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 199 +--- !u!1 &6755293792120460589 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2560577325283151973} + - component: {fileID: 7209594460526029543} + - component: {fileID: 6798085516758444629} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2560577325283151973 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6755293792120460589} + 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: 3456383120591884671} + 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 &7209594460526029543 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6755293792120460589} + m_CullTransparentMesh: 1 +--- !u!114 &6798085516758444629 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6755293792120460589} + 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 &6763456611471731641 GameObject: m_ObjectHideFlags: 0 @@ -68976,6 +69931,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7023612934184441358 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5934610984522903586} + - component: {fileID: 8851534330514950561} + - component: {fileID: 8258288278506779774} + m_Layer: 5 + m_Name: New Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5934610984522903586 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7023612934184441358} + 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: 9166762771282384750} + 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: 50, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8851534330514950561 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7023612934184441358} + m_CullTransparentMesh: 1 +--- !u!114 &8258288278506779774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7023612934184441358} + 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: 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: 3de6be90f6bd88749aff84b2516f0fe0, 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 &7031861778188060079 GameObject: m_ObjectHideFlags: 0 @@ -69247,6 +70277,84 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7043266383499571089 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6726094097797865710} + - component: {fileID: 366738413840023600} + - component: {fileID: 1175137125217107594} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6726094097797865710 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7043266383499571089} + 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: 9166762771282384750} + m_Father: {fileID: 3239661910951373017} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0, y: 1} +--- !u!114 &366738413840023600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7043266383499571089} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 1 +--- !u!114 &1175137125217107594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7043266383499571089} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 5 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &7053935814123782595 GameObject: m_ObjectHideFlags: 0 @@ -69976,6 +71084,81 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &7109073600957224693 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4928543301605757870} + - component: {fileID: 1612160928127007186} + - component: {fileID: 8712902271453385763} + m_Layer: 5 + m_Name: i_chapter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4928543301605757870 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7109073600957224693} + 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: 3456383120591884671} + 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: 98} + m_SizeDelta: {x: 300, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1612160928127007186 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7109073600957224693} + m_CullTransparentMesh: 1 +--- !u!114 &8712902271453385763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7109073600957224693} + 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: 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: 73e0df5777f8c384f85aea5ddb4e53d9, 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 &7124858540423575136 GameObject: m_ObjectHideFlags: 0 @@ -77954,41 +79137,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &7803600020979001073 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8047104692829914680} - m_Layer: 5 - m_Name: Dungeon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &8047104692829914680 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7803600020979001073} - 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!1 &7811554068491486894 GameObject: m_ObjectHideFlags: 0 @@ -78218,6 +79366,155 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7826404444906471480 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 235038788897522542} + - component: {fileID: 860325940291755300} + - component: {fileID: 8487281085793303370} + - component: {fileID: 1985678100910553118} + m_Layer: 5 + m_Name: dungeonName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &235038788897522542 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7826404444906471480} + 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: 6315105599271688744} + 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: 142, y: 16} + m_SizeDelta: {x: 480, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &860325940291755300 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7826404444906471480} + m_CullTransparentMesh: 1 +--- !u!114 &8487281085793303370 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7826404444906471480} + 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: "\uBBF8\uBBF9\uB358\uC804" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + 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: 35 + m_fontSizeBase: 35 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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: 258.21384, 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!114 &1985678100910553118 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7826404444906471480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} + m_Name: + m_EditorClassIdentifier: + m_localtextKey: 0 --- !u!1 &7838922834225789811 GameObject: m_ObjectHideFlags: 0 @@ -79461,7 +80758,7 @@ RectTransform: - {fileID: 3601566114630573212} - {fileID: 2346551909876340820} - {fileID: 6678857581749354256} - - {fileID: 8047104692829914680} + - {fileID: 5366708532861094367} m_Father: {fileID: 6291925347982253742} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -79484,7 +80781,7 @@ MonoBehaviour: m_Tab: {fileID: 1010605422663610091} gos: - {fileID: 9063278578834916780} - - {fileID: 7803600020979001073} + - {fileID: 5410764190926701895} --- !u!1 &8034583506025616827 GameObject: m_ObjectHideFlags: 0 @@ -82488,6 +83785,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8315818575494685814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1438474692404572917} + - component: {fileID: 5568563223671949429} + - component: {fileID: 4106114066224331596} + m_Layer: 5 + m_Name: topbg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1438474692404572917 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8315818575494685814} + 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: 5892108125861505840} + m_Father: {fileID: 3456383120591884671} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5568563223671949429 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8315818575494685814} + m_CullTransparentMesh: 1 +--- !u!114 &4106114066224331596 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8315818575494685814} + 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.043137256, g: 0.18823531, b: 0.25490198, 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: 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 &8318707283390530895 GameObject: m_ObjectHideFlags: 0 @@ -89046,6 +90419,46 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &8930944384717641293 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3456383120591884671} + m_Layer: 5 + m_Name: MapInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3456383120591884671 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8930944384717641293} + 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: 2560577325283151973} + - {fileID: 1438474692404572917} + - {fileID: 4928543301605757870} + - {fileID: 2819497699184699550} + - {fileID: 1530509777072174400} + m_Father: {fileID: 5366708532861094367} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -581.98, y: -51} + m_SizeDelta: {x: 856.03, y: 878.64} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8935773375063914104 GameObject: m_ObjectHideFlags: 0 @@ -91908,6 +93321,82 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &9114855500482148221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7215933868130760821} + - component: {fileID: 1842387937674693953} + - component: {fileID: 2764458593083815839} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7215933868130760821 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9114855500482148221} + 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: 3239661910951373017} + m_Father: {fileID: 5366708532861094367} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 541, y: -591} + m_SizeDelta: {x: 481.04004, y: 878.64} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1842387937674693953 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9114855500482148221} + m_CullTransparentMesh: 1 +--- !u!114 &2764458593083815839 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9114855500482148221} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 6726094097797865710} + m_Horizontal: 1 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 3239661910951373017} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &9117298131134593504 GameObject: m_ObjectHideFlags: 0 @@ -98448,6 +99937,210 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2053207618933338959} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2077806784895505066 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3456383120591884671} + m_Modifications: + - target: {fileID: 1156161939311564305, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4309501721179535655, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4309501721179535655, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4309501721179535655, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 182.5 + objectReference: {fileID: 0} + - target: {fileID: 4309501721179535655, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -21.5 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -214 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4716569824866738272, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5944612190041697600, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5944612190041697600, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5944612190041697600, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 32.5 + objectReference: {fileID: 0} + - target: {fileID: 5944612190041697600, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -21.5 + objectReference: {fileID: 0} + - target: {fileID: 5957689594540367808, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6672612604714614684, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_Name + value: ArrowUI + objectReference: {fileID: 0} + - target: {fileID: 8007294508452680228, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8007294508452680228, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8007294508452680228, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 107.5 + objectReference: {fileID: 0} + - target: {fileID: 8007294508452680228, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -21.5 + objectReference: {fileID: 0} + - target: {fileID: 8694238739028838891, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 741f139cbc7b708439dd195045c7d8a1, type: 3} +--- !u!224 &2819497699184699550 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1, + type: 3} + m_PrefabInstance: {fileID: 2077806784895505066} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2124106502348471045 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Character/NPC/WitchEnemyActor.cs b/Assets/Script/Character/NPC/WitchEnemyActor.cs index 8525e9837..d9083d63b 100644 --- a/Assets/Script/Character/NPC/WitchEnemyActor.cs +++ b/Assets/Script/Character/NPC/WitchEnemyActor.cs @@ -58,6 +58,6 @@ public class WitchEnemyActor : MobActor protected override void Set_Die() { base.Set_Die(); - GameUI.Ins.IngameUI.m_MemoryWitchResult.Add_ClearID(m_SpawnerId); + //GameUI.Ins.IngameUI.m_MemoryWitchResult.Add_ClearID(m_SpawnerId); } } \ No newline at end of file diff --git a/Assets/Script/Info/InGameInfo.cs b/Assets/Script/Info/InGameInfo.cs index 53186ae6b..1a0dec868 100644 --- a/Assets/Script/Info/InGameInfo.cs +++ b/Assets/Script/Info/InGameInfo.cs @@ -435,7 +435,6 @@ public partial class InGameInfo : MyCoroutine Set_Coroutine(() => { Time.timeScale = 1f; - GameUI.Ins.IngameUI.m_PetBattleResult.Set(_win, Return_To_Lobby); }, 0.5f); } public void Return_To_Lobby() diff --git a/Assets/Script/Server/ServerClass.cs b/Assets/Script/Server/ServerClass.cs index 385c52a9a..2f9a57d4f 100644 --- a/Assets/Script/Server/ServerClass.cs +++ b/Assets/Script/Server/ServerClass.cs @@ -79,8 +79,6 @@ public partial class ServerData public List ChapterQuest; public Dictionary>> Mission; public List Common; - public List Memory; - public Dictionary> QuickMemory; public List> Title, Pass; public Dictionary Inven = new Dictionary(); // ID, 개수 public Dictionary> Shop, Potion; @@ -186,14 +184,6 @@ public partial class ServerData Common = new List(); for (eCommon i = 0; i < eCommon.Max; i++) Common.Add(0); Set_Common(eCommon.Title, 1); - Memory = new List() { 0, 0, 0, 1000, 0 }; // 0 숲 단계, 1 숲 최종데미지, 2 마녀 등급, 3 투견장 점수, 4 투견장 상대 변경 횟수 - - // 14개 - Gold, Gem, WeaponStone, RingStone, NeckStone, BootsStone, FairyStone, Exp, 상자1, 상자2, 상자3, 과일, 씨앗, 드랍아이템 - QuickMemory = new Dictionary>(); - QuickMemory.Add("101", new List { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }); - QuickMemory.Add("102", new List { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }); - QuickMemory.Add("103", new List { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }); - QuickMemory.Add("104", new List { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }); Book = new List(); var booktabledata = table_book.Ins.Get_DataList(); @@ -282,9 +272,7 @@ public partial class ServerData temp.Common = DSUtil.Get_T_List(Common); - temp.Memory = DSUtil.Get_T_List(Memory); temp.Mission = DSUtil.Get_T_Dic(Mission); - temp.QuickMemory = DSUtil.Get_T_Dic(QuickMemory); temp.Book = new List(); for (int i = 0; i < Book.Count; i++) @@ -333,8 +321,7 @@ public class ServerData_Read public List ChapterQuest; public Dictionary>> Mission; public List Common; - public List Money, Memory; - public Dictionary> Gamble, QuickMemory; + public List Money; public List> Title, Pass; public Dictionary Inven = new Dictionary(); public Dictionary> Shop, Potion; @@ -384,9 +371,7 @@ public class ServerData_Read temp.Common = DSUtil.Get_T_List(Common); - temp.Memory = DSUtil.Get_T_List(Memory); temp.Mission = DSUtil.Get_T_Dic(Mission); - if (QuickMemory != null) temp.QuickMemory = DSUtil.Get_T_Dic(QuickMemory); temp.Book = new List(); for (int i = 0; i < Book.Count; i++) @@ -1515,45 +1500,6 @@ public partial class ServerData } #endregion - #region 마녀의 기억 - public int Get_Memory_Step(eMemory _memory) - { - if (_memory == eMemory.a2_Forest) return (int)Memory[0]; - else if (_memory == eMemory.a4_WitchGrade) return (int)Memory[2]; - return 0; - } - public void Add_MemoryStep(eMemory _memory) - { - if (_memory == eMemory.a2_Forest) { ++Memory[0]; Memory[0].RandomizeCryptoKey(); } - else if (_memory == eMemory.a5_PetBattle) { ++Memory[3]; Memory[3].RandomizeCryptoKey(); } - } - public double Get_Memory_Forest_TotalDamage() { return Memory[1]; } - public void Set_Memory_Forest_TotalDamage(double _dmg) - { - if (Memory[1] < _dmg) - { - Memory[1] = _dmg; - Memory[1].RandomizeCryptoKey(); - } - } - public void Set_Memory_WitchGrade(int _id) - { - if (Memory[2] < _id) - { - Memory[2] = _id; - Memory[2].RandomizeCryptoKey(); - } - } - public int Get_Memeory_PetBattle_Point() { return (int)Memory[3]; } - public void Set_Memory_PetBattle_Point(int _point) - { - Memory[3] = _point; - Memory[3].RandomizeCryptoKey(); - } - public int Get_Memory_PetBattle_Change() { return (int)Memory[4]; } - public void Add_Memory_PetBattle_Change() { ++Memory[4]; Memory[4].RandomizeCryptoKey(); } - #endregion - #region 마녀의 솥 public int Get_PotionRemainTime(int _id) { return Potion[_id.ToString()][1]; } public bool Is_UsePotion() diff --git a/Assets/Script/UI/Center/Memory.meta b/Assets/Script/UI/Center/Memory.meta deleted file mode 100644 index 4d86973c9..000000000 --- a/Assets/Script/UI/Center/Memory.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: daaa7e610b3b516409bc54cc32c42a2f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/Content_Memory.cs b/Assets/Script/UI/Center/Memory/Content_Memory.cs deleted file mode 100644 index c5ffa7b81..000000000 --- a/Assets/Script/UI/Center/Memory/Content_Memory.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Content_Memory : ScrollViewMgr -{ - private void OnEnable() - { - Set_ScrollView(table_chaptertext.Ins.Get_DataList(true)); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/MemoryDungeon.cs b/Assets/Script/UI/Center/Memory/MemoryDungeon.cs deleted file mode 100644 index 8f41deddd..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryDungeon.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MemoryDungeon : MemoryPopupBase -{ - public override void Set() - { - base.Set(); - Set_Memory(103); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/MemoryDungeon.cs.meta b/Assets/Script/UI/Center/Memory/MemoryDungeon.cs.meta deleted file mode 100644 index a658b3948..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryDungeon.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2f542dd95dcce724e8e18f70fce7ce52 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/MemoryFieldInfo.cs b/Assets/Script/UI/Center/Memory/MemoryFieldInfo.cs deleted file mode 100644 index 6baf531bd..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryFieldInfo.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MemoryFieldInfo : MemoryPopupBase -{ - public GameObject go_firstfree; - - public override void Set() - { - base.Set(); - Set_Memory(101); - go_firstfree.SetActive(ServerInfo.Ins.m_ServerData.Get_Common(eCommon.FieldFirstFree) == 0); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/MemoryFieldInfo.cs.meta b/Assets/Script/UI/Center/Memory/MemoryFieldInfo.cs.meta deleted file mode 100644 index c3d6e5cd5..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryFieldInfo.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 92f3cd97e7087654bb4687aa48a558ad -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/MemoryForestDetailInfo.cs b/Assets/Script/UI/Center/Memory/MemoryForestDetailInfo.cs deleted file mode 100644 index ade693001..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryForestDetailInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MemoryForestDetailInfo : ScrollViewMgr -{ - public override void Set() - { - base.Set(); - - //Set_ScrollView_NotSet(1 + table_pet.Ins.Get_DataList().Count); // 마녀 + 펫 - - //var sdata_memory2 = ServerInfo.Ins.m_ServerData.Memory2; - //for (int i = 0; i < list_CardBase.Count; i++) - // (list_CardBase[i] as MemoryForestDmgCard).Set(i, sdata_memory2[i]); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/MemoryForestDetailInfo.cs.meta b/Assets/Script/UI/Center/Memory/MemoryForestDetailInfo.cs.meta deleted file mode 100644 index 753852c8b..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryForestDetailInfo.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ae0fee93882a0c54caff6e9c0bb9c75e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/MemoryForestDmgCard.cs b/Assets/Script/UI/Center/Memory/MemoryForestDmgCard.cs deleted file mode 100644 index b193f62bf..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryForestDmgCard.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MemoryForestDmgCard : CardBase -{ - public UISprite[] sprites; // 0 얼굴 bg, 1 얼굴 - public UILabel[] labels; // 0 데미지 - - public void Set(int _id, double _dmg) - { - gameObject.SetActive(true); - if (_id == 0) - { - sprites[0].spriteName = "facebg"; - //sprites[1].spriteName = DSUtil.Get_ItemSpriteInfo(eItem.PC, ServerInfo.Ins.m_ServerData.Equip.Get_Preset_byGameMode(102).EquipMentEquip[0]).Icon; - } - else - { - sprites[0].spriteName = DSUtil.Get_GradeSpriteName(MyValue.Get_GradebyID(_id)); - sprites[1].spriteName = DSUtil.Get_ItemSpriteInfo(eItem.Pet, _id).Icon; - } - - labels[0].text = NumberFormatter.FormatNumber(_dmg); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/MemoryForestDmgCard.cs.meta b/Assets/Script/UI/Center/Memory/MemoryForestDmgCard.cs.meta deleted file mode 100644 index fcc59c23b..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryForestDmgCard.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b7ac1f5c4451ff3489766fb45e092dc6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/MemoryForestRewardInfo.cs b/Assets/Script/UI/Center/Memory/MemoryForestRewardInfo.cs deleted file mode 100644 index e662c0ce3..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryForestRewardInfo.cs +++ /dev/null @@ -1,76 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MemoryForestRewardInfo : MemoryPopupBase -{ - public UILabel[] mylabels; // 0 총 데미지, 1 단계, 2 목표 데미지, 3 보상 - public UISprite[] sprites; // 0 보상버튼 - public GameObject[] gos; // 0 보상 노티 - public MemoryForestDetailInfo m_MemoryForestDetailInfo; - public NGUIButtonPress m_NGUIButtonPress; - - DPSTableData m_DPSTableData; - bool GetReward = false; - - protected override void Awake() - { - base.Awake(); - m_NGUIButtonPress.Set_Action(OnClick_Get); - } - - public override void Set() - { - m_MemoryForestDetailInfo.Check(); - base.Set(); - Set_Memory(102); - GetReward = false; - - var sdata = ServerInfo.Ins.m_ServerData; - var totaldmg = sdata.Get_Memory_Forest_TotalDamage(); - mylabels[0].text = DSUtil.Format("총 데미지 : {0:#,##0}", NumberFormatter.FormatNumber(totaldmg)); - var curStep = sdata.Get_Memory_Step(eMemory.a2_Forest); - mylabels[1].text = curStep.ToString(); - m_DPSTableData = table_dps.Ins.Get_Data_orNull(curStep + 1); - if (m_DPSTableData == null) - { - mylabels[3].text = mylabels[2].text = "-"; - sprites[0].spriteName = MyValue.OffButtonName; - } - else - { - mylabels[2].text = NumberFormatter.FormatNumber(m_DPSTableData.Dmg); - mylabels[3].text = DSUtil.GetThousandCommaText(m_DPSTableData.Gem); - sprites[0].spriteName = totaldmg >= m_DPSTableData.Dmg ? "button5" : MyValue.OffButtonName; - gos[0].SetActive(totaldmg >= m_DPSTableData.Dmg); - } - } - - public void OnClick_Get() - { - var sdata = ServerInfo.Ins.m_ServerData; - if (m_DPSTableData != null && sdata.Get_Memory_Forest_TotalDamage() >= m_DPSTableData.Dmg) - { - GetItemUI.Ins.Set(sdata.Add_Item(new ItemData(eItem.Gem, 0, m_DPSTableData.Gem, "dps", eUICardType.GetItem))); - GetItemUI.Ins.Show_Items(); - sdata.Add_MemoryStep(eMemory.a2_Forest); - Set(); - GetReward = true; - } - } - - public void OnClick_ExMark() - { - m_MemoryForestDetailInfo.Set(); - } - - public override void OnClick_Back() - { - base.OnClick_Back(); - if (GetReward) - { - GameUI.Ins.LobbyUI.Get_MenuMemory().Set(); - GameUI.Ins.LobbyUI.Set_Noti(); - } - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/MemoryForestRewardInfo.cs.meta b/Assets/Script/UI/Center/Memory/MemoryForestRewardInfo.cs.meta deleted file mode 100644 index 5f20bfd8d..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryForestRewardInfo.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e6d3baf363933a74aafd3d895ad3af96 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/MemoryOpenCheck.cs b/Assets/Script/UI/Center/Memory/MemoryOpenCheck.cs deleted file mode 100644 index 3f33767d9..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryOpenCheck.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MemoryOpenCheck : MyCoroutine -{ - public GameObject go_child; - public UILabel[] labels; // 0 오픈 컨텐츠 - - private void Awake() - { - Act_Repeat_for1sec = () => - { - //var sdata = ServerInfo.Ins.m_ServerData; - //bool field = sdata.Get_Common(eCommon.MaxMapID) >= 4 && sdata.Get_MissionCount(MyValue.arr_Mission[1], 31) < 1; - //bool forest = sdata.Get_Common(eCommon.MaxMapID) >= 5 && sdata.Get_MissionCount(MyValue.arr_Mission[1], 32) < 1; - //bool dungeon = sdata.Get_Common(eCommon.MaxMapID) >= 6 && sdata.Get_MissionCount(MyValue.arr_Mission[1], 33) < 1; - //bool witch = sdata.Get_Common(eCommon.MaxMapID) >= 10 && sdata.Get_MissionCount(MyValue.arr_Mission[1], 34) < 1; - //bool petbattle = sdata.Get_Common(eCommon.MaxMapID) >= 10 && sdata.Get_MissionCount(MyValue.arr_Mission[1], 35) < 1; - - //if (!field && !forest && !dungeon && !witch && !petbattle) - // go_child.SetActive(false); - //else - //{ - // go_child.SetActive(true); - // if (petbattle) labels[0].text = "투견장\n오픈"; - // else if (witch) labels[0].text = "마녀\n오픈"; - // else if (dungeon) labels[0].text = "던전\n오픈"; - // else if (forest) labels[0].text = "숲\n오픈"; - // else if (field) labels[0].text = "들판\n오픈"; - //} - }; - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/MemoryOpenCheck.cs.meta b/Assets/Script/UI/Center/Memory/MemoryOpenCheck.cs.meta deleted file mode 100644 index e4d9d2f4d..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryOpenCheck.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 56a367b2eef35854c83e7ad286054442 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/MemoryPetBattleInfo.cs b/Assets/Script/UI/Center/Memory/MemoryPetBattleInfo.cs deleted file mode 100644 index 7fd50bb5d..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryPetBattleInfo.cs +++ /dev/null @@ -1,193 +0,0 @@ -using PlayFab.ClientModels; -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using Random = UnityEngine.Random; - -public class MemoryPetBattleInfo : MemoryPopupBase -{ - public PetBattleWitchInfo[] arr_WitchInfo; - public GameObject[] gos; // 0 상대변경, 1 젬 - public UILabel[] labels_; // 0 상대변경 버튼 텍스트, 1 일일 제한, 2 자동 시간 - public GameObject go_autocheck; - - List list_Enemy; - DateTime ChangeTimeEnd; - int m_LimitChange = 5, m_ChangeGem = 50, AutoTime; - - protected override void Awake() - { - base.Awake(); - Act_Repeat_for1sec = Check_ChangeTime; - Off_Auto(); - } - - public override void Set() - { - base.Set(); - Set_Memory(105); - arr_WitchInfo[0].Set(true, ServerInfo.Ins.m_ServerData, null); - if (list_Enemy == null || list_Enemy.Count < 1) - Find_Enemy(); - } - void Find_Enemy() - { - arr_WitchInfo[1].gameObject.SetActive(false); - ServerInfo.Ins.Get_Rank("PetBattle", true, - my => - { - }, - entry => - { - entry.RemoveAll(r => r.PlayFabId.Equals(ServerInfo.Ins.m_LoginInfo.PlayFabId) || string.IsNullOrEmpty(r.DisplayName)); - list_Enemy = entry; - Select_Enemy(false); - }); - } - void Set_UI() - { - var sdata = ServerInfo.Ins.m_ServerData; - var limit = sdata.Get_Memory_PetBattle_Change(); - labels_[1].text = DSUtil.Format("({0}/{1})", limit, m_LimitChange); - DSUtil.InActivateGameObjects(gos, m_LimitChange > limit ? 0 : 1); - } - - public override bool IsAuto() { return go_autocheck.activeSelf; } - - public override void Del_EnemyList() { list_Enemy.Clear(); } // 투기장 결과화면에서 호출, 여기 왔을 때 랭크에 맞게 상대를 바꾸기 위함 - protected override void Set_Label() - { - base.Set_Label(); - arr_WitchInfo[0].Set(true, ServerInfo.Ins.m_ServerData, null); - } - protected override bool CheckEnterCondition() - { - if (!Check_MyPets()) return false; - if (!Check_EnemyPets()) return false; - return true; - } - bool Check_MyPets() - { - return true; - //return ServerInfo.Ins.m_ServerData.Equip.Get_Preset_byGameMode(105).Equip[eItem.Pet] > 0; - } - bool Check_EnemyPets() - { - return true; - } - - void Select_Enemy(bool time) - { - var pick = list_Enemy[Random.Range(0, list_Enemy.Count)]; - ServerInfo.Ins.Get_OtherUserInfo(pick.PlayFabId, data => - { - if (time) - { - ChangeTimeEnd = ServerInfo.ServerTime.AddMinutes(1); - Check_ChangeTime(); - ServerInfo.Ins.Write(null); - } - arr_WitchInfo[1].Set(false, data, pick); - if (IsAuto()) - { - AutoTime = 5; - labels_[2].text = "5"; - } - }); - Set_UI(); - } - - void Check_ChangeTime() - { - var ts = ChangeTimeEnd - ServerInfo.ServerTime; - if (ts.TotalSeconds > 0) - { - labels_[0].text = DSUtil.Get_TimeText_MS(ts); - DSUtil.InActivateGameObjects(gos, 0); - } - else - { - labels_[0].text = "상대 변경"; - Set_UI(); - } - - if (AutoTime > 0 && IsAuto()) - { // 자동 중 - if (ServerInfo.Ins.m_ServerData.Check_ItemAmount(eItem.MemoryPetBattle, 1)) - { - if (Check_MyPets()) - { - if (Check_EnemyPets()) - { - --AutoTime; - labels_[2].text = AutoTime.ToString(); - if (AutoTime <= 0) - { - AutoTime = 5; - OnClick_Enter(); - } - } - else - AutoTime = 0; - } - else - OnClick_Auto(); - } - else - OnClick_Auto(); - } - } - - void Off_Auto() - { - go_autocheck.SetActive(false); - AutoTime = 0; - labels_[2].text = ""; - } - - public void OnClick_Auto() - { - go_autocheck.SetActive(!go_autocheck.activeInHierarchy); - if (IsAuto()) - { - AutoTime = 5; - labels_[2].text = AutoTime.ToString(); - } - else - Off_Auto(); - } - - public void OnClick_Change() - { - if (!Check_EnemyPets()) - Select_Enemy(false); - else - { - var ts = ChangeTimeEnd - ServerInfo.ServerTime; - if (ts.TotalSeconds <= 0) - { - var sdata = ServerInfo.Ins.m_ServerData; - if (sdata.Get_Memory_PetBattle_Change() < m_LimitChange) - { - sdata.Add_Memory_PetBattle_Change(); - Select_Enemy(true); - } - else if (sdata.Check_ItemAmount(eItem.Gem, m_ChangeGem)) - { - //Popup.Ins.Set(ePopupType.Two, DSUtil.Format("{0}젬을 사용해 상대를 변경 하시겠습니까?", m_ChangeGem), () => - //{ - // sdata.Use_Item(eItem.Gem, m_ChangeGem, 0, "petchange"); - // Select_Enemy(true); - //}); - } - } - } - } - - public override void OnClick_Back() - { - base.OnClick_Back(); - Off_Auto(); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/MemoryPetBattleInfo.cs.meta b/Assets/Script/UI/Center/Memory/MemoryPetBattleInfo.cs.meta deleted file mode 100644 index 1a46fdbb4..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryPetBattleInfo.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 49f8c60a1bd589145b5ff413c2f54cfb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/MemoryPopupBase.cs b/Assets/Script/UI/Center/Memory/MemoryPopupBase.cs deleted file mode 100644 index 9313db266..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryPopupBase.cs +++ /dev/null @@ -1,48 +0,0 @@ -public class MemoryPopupBase : BackKeyAdd -{ - public UILabel[] labels; // 0 덱 - - int m_ID; - eItem m_Frag; - - protected void Set_Memory(int _id) - { - m_ID = _id; - m_Frag = eItem.MemoryField + (m_ID - 101); - Set_Label(); - - //var chpaterdata = table_chaptertext.Ins.Get_Data(_id); - //labels[0].text = chpaterdata.ChapterName; - //labels[1].text = chpaterdata.Desc; - //labels[2].text = ServerInfo.Ins.m_ServerData.Get_ItemAmount(eItem.MemoryField + (m_ID - 101)).ToString(); - } - - public virtual bool IsAuto() { return false; } - public virtual void Del_EnemyList() { } - protected virtual void Set_Label() - { - //labels[0].text = DSUtil.Format("덱 : {0}", ServerInfo.Ins.m_ServerData.Equip.Get_Preset_byChapter(m_ID)); - } - protected virtual bool CheckEnterCondition() { return true; } - - public void OnClick_Enter() - { - if (ServerInfo.Ins.m_ServerData.Check_ItemAmount(m_Frag, 1) && CheckEnterCondition()) - { - GameUI.Ins.LobbyUI.Get_MenuChapter().Go_SelectChapter(m_ID, true); - LoadMapMgr.Ins.SetActive_Map(true); // 기억 들어갔다가 나오면 맵이 MenuBase(Menu_Memory)에 의해 꺼짐 - base.OnClick_Back(); - } - } - - public void OnClick_Deck() - { - GameUI.Ins.LobbyUI.Get_PresetUI().Set(m_ID); - GameUI.Ins.LobbyUI.Get_PresetUI().Set(Set_Label); - } - - public void OnClick_Quick() - { - GameUI.Ins.LobbyUI.Get_MenuMemory().m_QuickMemoryUI.Set(m_ID); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/MemoryPopupBase.cs.meta b/Assets/Script/UI/Center/Memory/MemoryPopupBase.cs.meta deleted file mode 100644 index 548dd41a9..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryPopupBase.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5b8055d3a0fa74d4bbecea8f8b75333b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/MemorySelectCard.cs b/Assets/Script/UI/Center/Memory/MemorySelectCard.cs deleted file mode 100644 index 45a74f779..000000000 --- a/Assets/Script/UI/Center/Memory/MemorySelectCard.cs +++ /dev/null @@ -1,87 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MemorySelectCard : CardBase -{ - public UILabel[] labels; // 0 이름, 1 보상, 2 잠금 조건 - public UISprite[] sprites; // 0 기억 그림, 1 2 3 4 5 보상 - public GameObject[] gos; // 0 보상 정보, 1 노티, 2 잠금 - public UIGrid grid_reward; - - ChapterTextTableData m_Data; - - public override void Set(T _base) - { - base.Set(_base); - m_Data = _base as ChapterTextTableData; - - labels[0].text = m_Data.ShortName; - sprites[0].spriteName = DSUtil.Format("memory_{0}", m_Data.ID); - OnClick_Close_ExMark(); - if (MyValue.CanEnter_Content(eContentOpen.Memory_Filed + m_Data.ID - 101)) - { - gos[2].SetActive(false); - gos[1].SetActive(ServerInfo.Ins.m_ServerData.Check_ItemAmount(eItem.MemoryField + m_Data.ID - 101, 1, 0, false)); - if (m_Data.ID == 102 && !gos[1].activeSelf) gos[1].SetActive(MyValue.CanGetMemoryForestReward()); - } - else - { - gos[2].SetActive(true); - gos[1].SetActive(false); - var chapter = 3; - if (m_Data.ID == 102) chapter = 4; - else if (m_Data.ID == 103) chapter = 5; - else if (m_Data.ID == 104 || m_Data.ID == 105) chapter = 9; - labels[2].text = DSUtil.Format("챕터 {0} 클리어\n필요", chapter); - } - } - - public void OnClick_Enter() - { // 해당 메모리 팝업 - GameUI.Ins.LobbyUI.Get_MenuMemory().Get_MemoryInfo(m_Data.ID - 101).Set(); - } - public void OnClick_Close_ExMark() - { - gos[0].SetActive(false); - } - public void OnClick_ExMark() - { - if (!gos[0].activeInHierarchy) - { - gos[0].SetActive(true); - for (int i = 1; i < sprites.Length; i++) - sprites[i].gameObject.SetActive(false); - labels[1].text = ""; - switch (m_Data.ID) - { - case 101: - sprites[1].gameObject.SetActive(true); - sprites[1].spriteName = DSUtil.Get_ItemSpriteInfo(eItem.Gold).Icon; - sprites[2].gameObject.SetActive(true); - sprites[2].spriteName = DSUtil.Get_ItemSpriteInfo(eItem.Exp).Icon; - break; - case 102: - sprites[1].gameObject.SetActive(true); - sprites[1].spriteName = DSUtil.Get_ItemSpriteInfo(eItem.Gem).Icon; - break; - case 103: - for (int i = 1; i < sprites.Length; i++) - { - sprites[i].gameObject.SetActive(true); - sprites[i].spriteName = DSUtil.Get_ItemSpriteInfo(eItem.WeaponStone + i - 1).Icon; - } - break; - case 104: - labels[1].text = "마녀 공격력 및 체력"; - break; - case 105: - labels[1].text = "펫 공격력 및 체력"; - break; - } - grid_reward.repositionNow = true; - } - else - OnClick_Close_ExMark(); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/MemorySelectCard.cs.meta b/Assets/Script/UI/Center/Memory/MemorySelectCard.cs.meta deleted file mode 100644 index fb1bf7e5e..000000000 --- a/Assets/Script/UI/Center/Memory/MemorySelectCard.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d438d89de0768bc4eb1a96c5c415efa2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/MemoryWitchInfo.cs b/Assets/Script/UI/Center/Memory/MemoryWitchInfo.cs deleted file mode 100644 index 4e36b96f0..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryWitchInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MemoryWitchInfo : MemoryPopupBase -{ - public UILabel[] mylabels; // 0 현재 마녀 등급, 1 현재 공격력, 2 현재 체력, 3 다음 마녀 등급, 4 다음 공격력, 5 다음 체력 - public UISprite[] mysprites; // 0 다음 목표 - - public override void Set() - { - base.Set(); - Set_Memory(104); - - var curStep = ServerInfo.Ins.m_ServerData.Get_Memory_Step(eMemory.a4_WitchGrade); - var data = table_memorywitch.Ins.Get_Data(curStep); - var titledata = table_title.Ins.Get_Data(data.TitleID); - mylabels[0].text = titledata.Name; - mylabels[1].text = DSUtil.Format("{0:N0}%", data.Attack * 100f); - mylabels[2].text = DSUtil.Format("{0:N0}%", data.HP * 100f); - - data = table_memorywitch.Ins.Get_Data(curStep + 1); - if (data != null) - { - mysprites[0].spriteName = DSUtil.Get_ItemSpriteInfo(eItem.PC, data.ID).SubIcon; - var nexttitledata = table_title.Ins.Get_Data(data.TitleID); - mylabels[3].text = nexttitledata.Name; - mylabels[4].text = DSUtil.Format("{0:N0}%", data.Attack * 100f); - mylabels[5].text = DSUtil.Format("{0:N0}%", data.HP * 100f); - } - else - { - mylabels[3].text = mylabels[4].text = mylabels[5].text = "-"; - } - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/MemoryWitchInfo.cs.meta b/Assets/Script/UI/Center/Memory/MemoryWitchInfo.cs.meta deleted file mode 100644 index c39867821..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryWitchInfo.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a6efc55c0c985ab4985d5ab55d2d30e2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/MemoryWitchMap.cs b/Assets/Script/UI/Center/Memory/MemoryWitchMap.cs deleted file mode 100644 index cd119f5b5..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryWitchMap.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MemoryWitchMap : BackKeyAdd -{ - public MemoryWitchMapCard[] arr_MemoryWitchMapCard; - - public override void Set() - { - base.Set(); - var lst = table_memorywitch.Ins.Get_DataList(); - var serverclearstep = ServerInfo.Ins.m_ServerData.Get_Memory_Step(eMemory.a4_WitchGrade); - var CurClearids = GameUI.Ins.IngameUI.m_MemoryWitchResult.Get_ClearID(); - for (int i = 0; i < arr_MemoryWitchMapCard.Length; i++) - { - var step = i + 1; // 0 은 새싹임 - arr_MemoryWitchMapCard[i].Set(lst[step].ID, DSUtil.Get_ItemSpriteInfo(eItem.PC, lst[step].ID).SubIcon, serverclearstep >= step || CurClearids.Find(f => f == step) > 0); - } - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/MemoryWitchMap.cs.meta b/Assets/Script/UI/Center/Memory/MemoryWitchMap.cs.meta deleted file mode 100644 index 99a997371..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryWitchMap.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e0ba2420168f0c24ba6022d1d7415ac5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/MemoryWitchMapCard.cs b/Assets/Script/UI/Center/Memory/MemoryWitchMapCard.cs deleted file mode 100644 index 31b579e59..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryWitchMapCard.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MemoryWitchMapCard : MonoBehaviour -{ - public UILabel label_num; - public UISprite sprite_witch; - public GameObject go_clear; - - public void Set(int _num, string _witch, bool _clear) - { - label_num.text = _num.ToString(); - sprite_witch.spriteName = _witch; - go_clear.SetActive(_clear); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/MemoryWitchMapCard.cs.meta b/Assets/Script/UI/Center/Memory/MemoryWitchMapCard.cs.meta deleted file mode 100644 index 3c86efe07..000000000 --- a/Assets/Script/UI/Center/Memory/MemoryWitchMapCard.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f8164482858cfe34d9d69ad9baff4e00 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/PetBattlePetInfoCard.cs b/Assets/Script/UI/Center/Memory/PetBattlePetInfoCard.cs deleted file mode 100644 index 52191f653..000000000 --- a/Assets/Script/UI/Center/Memory/PetBattlePetInfoCard.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class PetBattlePetInfoCard : CardBase -{ - public UIItemCard m_UIItemCard; - public UILabel[] labels; // 0 공격력, 1 체력, 2 펫 레벨 - public GameObject[] gos; // 0 착용한 펫이 없습니다. 1 공격력 아이콘, 2 체력 아이콘 - - int m_PetID; - - public override void Set(int _val) - { - base.Set(); - m_PetID = _val; - if (m_PetID > 0) - { - m_UIItemCard.Set(new ItemData(eItem.Pet, _val, 0, "", eUICardType.GetItem)); - DSUtil.ActivateGameObjects(gos, 0); - } - else - { - DSUtil.InActivateGameObjects(gos, 0); - labels[0].text = labels[1].text = labels[2].text = ""; - m_UIItemCard.gameObject.SetActive(false); - } - } - public void Set(ServerData sdata) - { - if (m_PetID > 0) - { - //var petTdata = table_pet.Ins.Get_Data(m_PetID); - //var statinfo = MyValue.Get_ActorStatInfo(eRole.Pet, petTdata.PetAttackType, sdata, m_PetID); - //labels[0].text = MoneyUnitString.Get_String(statinfo.Get_Stat(eStat.Attack)); - //labels[1].text = MoneyUnitString.Get_String(statinfo.Get_Stat(eStat.HP)); - //labels[2].text = DSUtil.Format("Lv.{0}({1})", sdata.Get_PetLv(m_PetID), sdata.Get_PetTLv(m_PetID)); - } - } - public void Set(Actor _pet) - { - labels[0].text = DSUtil.Format("가한 데미지 : {0}", NumberFormatter.FormatNumber(_pet.Get_RealDamage())); - labels[1].text = DSUtil.Format("받은 피해량 : {0}", NumberFormatter.FormatNumber(_pet.Get_ReceiveDmg())); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/PetBattlePetInfoCard.cs.meta b/Assets/Script/UI/Center/Memory/PetBattlePetInfoCard.cs.meta deleted file mode 100644 index e961fe454..000000000 --- a/Assets/Script/UI/Center/Memory/PetBattlePetInfoCard.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2111f528f26c81b49b86aed347b01311 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/PetBattleWitchInfo.cs b/Assets/Script/UI/Center/Memory/PetBattleWitchInfo.cs deleted file mode 100644 index 823320ca7..000000000 --- a/Assets/Script/UI/Center/Memory/PetBattleWitchInfo.cs +++ /dev/null @@ -1,26 +0,0 @@ -using PlayFab.ClientModels; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class PetBattleWitchInfo : ScrollViewMgr -{ - public UISprite[] sprites; // 0 얼굴 - public UILabel[] lables; // 0 이름(투견장 등급) - - public void Set(bool _my, ServerData sdata, PlayerLeaderboardEntry _entry) - { - gameObject.SetActive(true); - - string nick = _my ? ServerInfo.Ins.UserName : _entry.DisplayName; - if (!_my) PetBattleUI.EnemyNick = nick; - - sprites[0].spriteName = DSUtil.Get_ItemSpriteInfo(eItem.PC, sdata.Get_EqiupmentEquip(eItem.PC)).Icon; - //lables[0].text = DSUtil.Format("{0}({1})", nick, table_title.Ins.Get_Data(table_memorypetbattle.Ins.Get_Data(sdata.Get_Memeory_PetBattle_Point()).TitleID).Name); - lables[0].text = nick; - //var mypets = sdata.Equip.Get_Preset_byGameMode(105).PetEquip; - //Set_ScrollView(new List { mypets[0], mypets[1], mypets[2] }); - //for (int i = 0; i < list_CardBase.Count; i++) - // (list_CardBase[i] as PetBattlePetInfoCard).Set(sdata); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/PetBattleWitchInfo.cs.meta b/Assets/Script/UI/Center/Memory/PetBattleWitchInfo.cs.meta deleted file mode 100644 index e9f858bd7..000000000 --- a/Assets/Script/UI/Center/Memory/PetBattleWitchInfo.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 02f41e8f61e0659498abd9caf0c6718e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/Quick.meta b/Assets/Script/UI/Center/Memory/Quick.meta deleted file mode 100644 index 3a77bab8b..000000000 --- a/Assets/Script/UI/Center/Memory/Quick.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ad86cd527b9f7a34cb553add2c914bb1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/Quick/QuickMemoryRewardCard.cs b/Assets/Script/UI/Center/Memory/Quick/QuickMemoryRewardCard.cs deleted file mode 100644 index dcf2ad2b1..000000000 --- a/Assets/Script/UI/Center/Memory/Quick/QuickMemoryRewardCard.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class QuickMemoryRewardCard : CardBase -{ - public UISprite[] sprites; // 0 아이콘 - public UILabel[] labels; // 0 개수 - - public override void Set(T _base) - { - base.Set(_base); - var _id = _base as ObtainItemData; - - if (_id.m_Item == eItem.Food) - sprites[0].spriteName = "farm_apple"; - else if (_id.m_Item == eItem.Seed) - sprites[0].spriteName = "icon_seed"; - else - sprites[0].spriteName = DSUtil.Get_ItemSpriteInfo(_id.m_Item, _id.m_ID).Icon; - labels[0].text = NumberFormatter.FormatNumber(_id.m_Amount); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/Quick/QuickMemoryRewardCard.cs.meta b/Assets/Script/UI/Center/Memory/Quick/QuickMemoryRewardCard.cs.meta deleted file mode 100644 index 4afdc5a8a..000000000 --- a/Assets/Script/UI/Center/Memory/Quick/QuickMemoryRewardCard.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d46cd1997e6c4484ab5a1645af2eb70c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/Quick/QuickMemoryUI.cs b/Assets/Script/UI/Center/Memory/Quick/QuickMemoryUI.cs deleted file mode 100644 index 96ac6c796..000000000 --- a/Assets/Script/UI/Center/Memory/Quick/QuickMemoryUI.cs +++ /dev/null @@ -1,147 +0,0 @@ -using CodeStage.AntiCheat.ObscuredTypes; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class QuickMemoryUI : ScrollViewMgr -{ - // Gold, Gem, WeaponStone, RingStone, NeckStone, BootsStone, FairyStone, Exp, 상자1, 상자2, 상자3, 과일, 씨앗, 드랍아이템 - List list_item = new List() - { - new ObtainItemData{ m_Item = eItem.Gold }, - new ObtainItemData{ m_Item = eItem.Gem }, - new ObtainItemData{ m_Item = eItem.WeaponStone }, - new ObtainItemData{ m_Item = eItem.RingStone }, - new ObtainItemData{ m_Item = eItem.NeckStone }, - new ObtainItemData{ m_Item = eItem.BootsStone }, - new ObtainItemData{ m_Item = eItem.FairyStone }, - new ObtainItemData{ m_Item = eItem.Exp }, - new ObtainItemData{ m_Item = eItem.Food }, - new ObtainItemData{ m_Item = eItem.Seed }, - new ObtainItemData{ m_Item = eItem.IdontKnow }, - }; - eItem[] arr_Item = new eItem[] { eItem.Page, eItem.Fairy, eItem.Extra, eItem.Skill, eItem.Necklace, eItem.Pet, eItem.Ring, eItem.Weapon }; - List iist_book = new List { 1, 2, 3, 4, 5, 6, 7, 8, 9 }; - List iist_itemid = new List { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 }; - - public UISprite[] sprites; // 0 파편 아이콘 - public UILabel[] labels; // 0 사용할 파편 개수, 1 설명 - - ObscuredInt m_Count; - eItem m_Fragment; - int m_Chapter; - - public override void Set(int _id) - { - base.Set(_id); - m_Chapter = _id; - m_Fragment = eItem.MemoryField + (_id - 101); - sprites[0].spriteName = DSUtil.Get_ItemSpriteInfo(m_Fragment).Icon; - m_Count = 1; - Set_Label(); - } - void Set_Label() - { - m_Count.RandomizeCryptoKey(); - labels[0].text = DSUtil.Format("{0}{1}", Get_FragColor(), m_Count); - labels[1].text = DSUtil.Format("[f0f000]{0}[-]에서 가장 좋았던 기억으로 [d37bff]소탕합니다.", Get_MemoryName()); - - var sdata = ServerInfo.Ins.m_ServerData; - var quick = sdata.QuickMemory[m_Chapter.ToString()]; - for (int i = 0; i < quick.Count; i++) - list_item[i].m_Amount = quick[i] * m_Count; - Set_ScrollView(list_item); - } - string Get_MemoryName() - { - switch (m_Fragment) - { - case eItem.MemoryField: return "들판"; - case eItem.MemoryForest: return "숲"; - case eItem.MemoryDungeon: return "던전"; - case eItem.MemoryWitchGrade: return "마녀"; - } - return ""; - } - string Get_FragColor() - { - switch (m_Fragment) - { - case eItem.MemoryField: return "[FDF488]"; - case eItem.MemoryForest: return "[E9A7FF]"; - case eItem.MemoryDungeon: return "[FF8892]"; - case eItem.MemoryWitchGrade: return "[CDFA73]"; - } - return ""; - } - - public void OnClick_Left() - { - --m_Count; - if (m_Count < 1) m_Count = 1; - Set_Label(); - } - public void OnClick_Right() - { - ++m_Count; - var sdata = ServerInfo.Ins.m_ServerData; - int frament = (int)sdata.Get_ItemAmount(m_Fragment); - if (m_Count > frament) m_Count = Mathf.Max(1, frament); - Set_Label(); - } - - public void OnClick_QuickReward() - { - bool noItem = true; - for (int i = 0; i < list_item.Count; i++) - { - if (list_item[i].m_Amount > 0) - { - noItem = false; - break; - } - } - var sdata = ServerInfo.Ins.m_ServerData; - if (!noItem && sdata.Check_ItemAmount(m_Fragment, m_Count)) - { - sdata.Use_Item(m_Fragment, m_Count, 0, "quick"); - sdata.Add_MissionCount(MyValue.arr_Mission[1], 31 + m_Fragment - eItem.MemoryField, m_Count); - List list = new List(); - for (int i = 0; i < list_item.Count; i++) - { - switch (list_item[i].m_Item) - { - case eItem.Food: - case eItem.Seed: - break; - case eItem.IdontKnow: - for (int j = 0; j < list_item[i].m_Amount; j++) - { - var itemdata = new ItemData(); - itemdata.ItemType = arr_Item[Random.Range(0, arr_Item.Length)]; - itemdata.Amount = 1; - itemdata.Amount.RandomizeCryptoKey(); - itemdata.UICardType = eUICardType.GetItem; - if (itemdata.ItemType == eItem.Page) - { - var pageid = table_bookpage.Ins.Get_RandomPageID(iist_book); - itemdata.Set_ID(pageid); - } - else - itemdata.Set_ID(iist_itemid[Random.Range(0, iist_itemid.Count)]); - list.AddRange(sdata.Add_Item(itemdata)); - } - break; - default: - if (list_item[i].m_Amount > 0) - list.AddRange(sdata.Add_Item(new ItemData(list_item[i].m_Item, list_item[i].m_ID, list_item[i].m_Amount, "", eUICardType.GetItem))); - break; - } - } - - GetItemUI.Ins.Set(list); - GetItemUI.Ins.Show_Items(); - Set_Label(); - } - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/Quick/QuickMemoryUI.cs.meta b/Assets/Script/UI/Center/Memory/Quick/QuickMemoryUI.cs.meta deleted file mode 100644 index 5ed86f43e..000000000 --- a/Assets/Script/UI/Center/Memory/Quick/QuickMemoryUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5f1079dc1014ad243a1b61536f19e756 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/Result.meta b/Assets/Script/UI/Center/Memory/Result.meta deleted file mode 100644 index b131b28af..000000000 --- a/Assets/Script/UI/Center/Memory/Result.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a7854032a376c3240a1a4a91d45c5d8f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Memory/Result/PetBattleResult.cs b/Assets/Script/UI/Center/Memory/Result/PetBattleResult.cs deleted file mode 100644 index d817fbbee..000000000 --- a/Assets/Script/UI/Center/Memory/Result/PetBattleResult.cs +++ /dev/null @@ -1,87 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class PetBattleResult : BackKeyAdd -{ - public GameObject[] gos; // 0 승리, 1 실패 - public PetBattlePetInfoCard[] arr_PetBattlePetInfoCard; - public UILabel[] labels; // 0 기존 점수, 1 등급, 2 총 데미지, 3 총 받은 피해, 4 현재 점수, 5 펫 공격력, 6 펫 체력 - public UISprite[] sprites; // 0 확인 버튼 - public GameObject[] gos_arrow; - public GameObject go_auto; - - Action act_Back; - - public void Set(bool _win, Action _act) - { - go_auto.SetActive(false); - InGameInfo.Ins.AllEffect_Off(); - GameUI.Ins.LobbyUI.Get_MenuMemory().Get_MemoryInfo(4).Del_EnemyList(); - act_Back = _act; - base.Set(); - DSUtil.InActivateGameObjects(gos, _win ? 0 : 1); - sprites[0].spriteName = MyValue.OffButtonName; - - double totaldmg = 0d, totalgetdmg = 0d; - var pets = ActorInfo.Ins.Get_Actors(eRole.Pet, 0, true); - for (int i = 0; i < arr_PetBattlePetInfoCard.Length; i++) - { - if (pets.Count > i) - { - arr_PetBattlePetInfoCard[i].Set(pets[i].Get_ID()); - arr_PetBattlePetInfoCard[i].Set(pets[i]); - totaldmg += pets[i].Get_RealDamage(); - totalgetdmg += pets[i].Get_ReceiveDmg(); - } - else - arr_PetBattlePetInfoCard[i].Set(0); // 카드 끄기 - } - - var sdata = ServerInfo.Ins.m_ServerData; - var beforePoint = sdata.Get_Memeory_PetBattle_Point(); - if (_win) - { - SoundInfo.Ins.Play_OneShot(eSound.s020_WinPetBattle); - sdata.Set_Memory_PetBattle_Point(sdata.Get_Memeory_PetBattle_Point() + 5); // 테스트 : 투견장 승리 점수 (기본 5점) - } - else - { - SoundInfo.Ins.Play_OneShot(eSound.s021_Fail, 0.05f); - sdata.Set_Memory_PetBattle_Point(sdata.Get_Memeory_PetBattle_Point() - 3); - } - var curPoint = sdata.Get_Memeory_PetBattle_Point(); - var pTdata = table_memorypetbattle.Ins.Get_Data(curPoint); - labels[0].text = DSUtil.Format("점수 : {0:#,##0}", beforePoint); - labels[4].text = DSUtil.GetThousandCommaText(curPoint); - labels[1].text = DSUtil.Format("현재 등급 : {0}", table_title.Ins.Get_Data(pTdata.TitleID).Name); - sdata.Add_Item(new ItemData(eItem.Title, pTdata.TitleID, 1)); // 칭호 : 견습 집사 ~ 마녀 집사 (95 ~ 111) - labels[2].text = DSUtil.Format("총 데미지 : {0}", NumberFormatter.FormatNumber(totaldmg)); - labels[3].text = DSUtil.Format("받은 피해 : {0}", NumberFormatter.FormatNumber(totalgetdmg)); - labels[5].text = DSUtil.GetThousandCommaText(pTdata.PetAttack * 100f, true); - labels[6].text = DSUtil.GetThousandCommaText(pTdata.PetHP * 100f, true); - - sdata.Use_Item(eItem.MemoryPetBattle, 1); - sdata.Add_MissionCount(MyValue.arr_Mission[1], 35); - ServerInfo.Ins.Save_Rank("PetBattle", sdata.Get_Memeory_PetBattle_Point()); - ServerInfo.Ins.Write(() => - { - sprites[0].spriteName = "button7"; - if (GameUI.Ins.LobbyUI.Get_MenuMemory().Get_MemoryInfo(4).IsAuto()) - { - go_auto.SetActive(true); - Set_Coroutine(OnClick_Back, 4f); - } - }); - } - - public override void OnClick_Back() - { - if (sprites[0].spriteName == "button7") - { - base.OnClick_Back(); - act_Back(); - } - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/Result/PetBattleResult.cs.meta b/Assets/Script/UI/Center/Memory/Result/PetBattleResult.cs.meta deleted file mode 100644 index 472ec31d6..000000000 --- a/Assets/Script/UI/Center/Memory/Result/PetBattleResult.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 29671c80247e31340a2f430d0fbcbaee -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/ETC/HelpUI_MemoryPetBattleCard.cs b/Assets/Script/UI/ETC/HelpUI_MemoryPetBattleCard.cs deleted file mode 100644 index 1c640b76f..000000000 --- a/Assets/Script/UI/ETC/HelpUI_MemoryPetBattleCard.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class HelpUI_MemoryPetBattleCard : CardBase -{ - public UILabel[] labels; // 0 목표, 1 칭호, 2 공격력, 3 체력 - public GameObject go_clear; - - public override void Set(T _base) - { - base.Set(_base); - - var Tdata = _base as MemoryPetBattleTableData; - var point = ServerInfo.Ins.m_ServerData.Get_Memeory_PetBattle_Point(); - - labels[0].text = DSUtil.GetThousandCommaText(Tdata.Point); - labels[1].text = table_title.Ins.Get_Data(Tdata.TitleID).Name; - labels[2].text = DSUtil.Format("{0}%", Tdata.PetAttack * 100f); - labels[3].text = DSUtil.Format("{0}%", Tdata.PetHP * 100f); - go_clear.SetActive(point >= Tdata.Point); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/ETC/HelpUI_MemoryPetBattleCard.cs.meta b/Assets/Script/UI/ETC/HelpUI_MemoryPetBattleCard.cs.meta deleted file mode 100644 index 3f884d75b..000000000 --- a/Assets/Script/UI/ETC/HelpUI_MemoryPetBattleCard.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 97ed715dec033da419ba9958cd66fc72 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/GameUI.cs b/Assets/Script/UI/GameUI.cs index 0c5a0766a..5ab381294 100644 --- a/Assets/Script/UI/GameUI.cs +++ b/Assets/Script/UI/GameUI.cs @@ -189,9 +189,6 @@ public class Ingame_Bundle public IngameChapterQuest m_ChapterQuest; public StageInfoUI m_StageInfoUI; public StageInfoUI_DPS m_DPS; - public PetBattleResult m_PetBattleResult; - public MemoryWitchMap m_MemoryWitchMap; - public MemoryWitchResult m_MemoryWitchResult; public StageTimeUI m_StageTimeUI; public PetBattleUI m_PetBattleUI; @@ -204,8 +201,6 @@ public class Ingame_Bundle m_BossInfoUI.Set(); m_StageResult.Initialized(); m_PauseUI.Check(); - m_MemoryWitchMap.Check(); - m_MemoryWitchResult.Init(); m_PetBattleUI.Set(chapter); if (LobbyChapterQuest.UseNote) m_ChapterQuest.Set(); else m_ChapterQuest.gameObject.SetActive(false); @@ -224,7 +219,6 @@ public class Ingame_Bundle else if (chapter == 104) { gos[0].SetActive(true); - m_StageTimeUI.Set(chapter, () => { m_MemoryWitchResult.Set(); }); } else m_StageTimeUI.gameObject.SetActive(false); @@ -270,9 +264,7 @@ public class Ingame_Bundle //} //else // ToastUI.Ins.Set("1챕터 클리어 후 사용 가능합니다."); - break; case "btn_map": - m_MemoryWitchMap.Set(); break; } } @@ -309,7 +301,6 @@ public class GameUI : MonoBehaviourSingletonTemplate if (SleepMode.IsActive) OptionInfo.Ins.m_SleepMode.Set(); break; case eGameMode.Stage: - case eGameMode.Memory: DSUtil.InActivateGameObjects(gos_lobby); DSUtil.InActivateGameObjects(gos_myfarm); DSUtil.ActivateGameObjects(gos_ingame); diff --git a/Assets/Script/UI/Map/MapChoiceUI_Dungeon.cs b/Assets/Script/UI/Map/MapChoiceUI_Dungeon.cs new file mode 100644 index 000000000..154fd2465 --- /dev/null +++ b/Assets/Script/UI/Map/MapChoiceUI_Dungeon.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MapChoiceUI_Dungeon : uScrollViewMgr +{ + +} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Memory/Content_Memory.cs.meta b/Assets/Script/UI/Map/MapChoiceUI_Dungeon.cs.meta similarity index 83% rename from Assets/Script/UI/Center/Memory/Content_Memory.cs.meta rename to Assets/Script/UI/Map/MapChoiceUI_Dungeon.cs.meta index c136a74bc..ae829cd21 100644 --- a/Assets/Script/UI/Center/Memory/Content_Memory.cs.meta +++ b/Assets/Script/UI/Map/MapChoiceUI_Dungeon.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a7c394f134a51b440a72d864f5e1a7c6 +guid: 7b6eabfd6323ae54295de96dccf8e9fb MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Script/UI/Menu/Menu_Memory.cs b/Assets/Script/UI/Menu/Menu_Memory.cs index ea66adb21..91fb7c5ec 100644 --- a/Assets/Script/UI/Menu/Menu_Memory.cs +++ b/Assets/Script/UI/Menu/Menu_Memory.cs @@ -4,26 +4,5 @@ using UnityEngine; public class Menu_Memory : MenuBase { - public MemoryPopupBase[] arr_Info; // 0 들판, 1 숲, 2 던전, 3 마녀, 4 투견장 - public QuickMemoryUI m_QuickMemoryUI; - protected override void Awake() - { - base.Awake(); - for (int i = 0; i < arr_Info.Length; i++) - arr_Info[i].Check(); - m_QuickMemoryUI.Check(); - } - - public MemoryPopupBase Get_MemoryInfo(int memory) { return arr_Info[memory]; } - - public override void OnClick_Back() - { - base.OnClick_Back(); - - //if (InGameInfo.Ins.Get_CurStageData().Chapter > 100) - //{ // 기억에서 되돌아 올 때는 여기로 와야 됨 - // InGameInfo.Ins.Return_To_ChapterLobby(); - //} - } } \ No newline at end of file diff --git a/Assets/Script/UI/Result/MemoryWitchResult.cs b/Assets/Script/UI/Result/MemoryWitchResult.cs deleted file mode 100644 index dc08d822f..000000000 --- a/Assets/Script/UI/Result/MemoryWitchResult.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MemoryWitchResult : BackKeyAdd -{ - public UILabel[] labels; // 0 현재 등급, 1 현재 효과 공격력, 2 현재 효과 체력, 3 4 5 상자 개수 - public UISprite[] sprites; // 0 확인 버튼 - public GameObject[] gos; // 0 1 등급 상승 - - List list_clearID = new List(); - int HighID; - - public void Init() { list_clearID.Clear(); HighID = 0; Check(); } - - public override void Set() - { - base.Set(); - - sprites[0].spriteName = MyValue.OffButtonName; - - var sdata = ServerInfo.Ins.m_ServerData; - var beforeStep = sdata.Get_Memory_Step(eMemory.a4_WitchGrade); - gos[0].SetActive(beforeStep < HighID); - gos[1].SetActive(beforeStep < HighID); - sdata.Set_Memory_WitchGrade(HighID); - var wTdata = table_memorywitch.Ins.Get_Data(sdata.Get_Memory_Step(eMemory.a4_WitchGrade)); - var tTdata = table_title.Ins.Get_Data(wTdata.TitleID); - labels[0].text = tTdata.Name; - labels[1].text = DSUtil.GetThousandCommaText(wTdata.Attack * 100f, true); - labels[2].text = DSUtil.GetThousandCommaText(wTdata.HP * 100f, true); - - InGameInfo.Ins.SaveItems(); - sdata.Use_Item(eItem.MemoryWitchGrade); - sdata.Add_MissionCount(MyValue.arr_Mission[1], 34); - for (int i = 0; i < list_clearID.Count; i++) - sdata.Add_Item(new ItemData(eItem.Title, table_memorywitch.Ins.Get_Data(list_clearID[i]).TitleID, 1)); - ServerInfo.Ins.Write(() => - { - sprites[0].spriteName = "button7"; - }); - } - - public override void OnClick_Back() - { - if (sprites[0].spriteName == "button7") - { - base.OnClick_Back(); - InGameInfo.Ins.Return_To_Lobby(); - } - } - - public void Add_ClearID(int _id) - { - if (HighID < _id) HighID = _id; - list_clearID.Add(_id); - } - public List Get_ClearID() { return list_clearID; } -} \ No newline at end of file diff --git a/Assets/Script/UI/Result/MemoryWitchResult.cs.meta b/Assets/Script/UI/Result/MemoryWitchResult.cs.meta deleted file mode 100644 index 0476e63f8..000000000 --- a/Assets/Script/UI/Result/MemoryWitchResult.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8c3f542fa395e914d917de07934808f7 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Stage/StageInfoUI_DPS.cs b/Assets/Script/UI/Stage/StageInfoUI_DPS.cs index dfca75993..dbfb1a7cb 100644 --- a/Assets/Script/UI/Stage/StageInfoUI_DPS.cs +++ b/Assets/Script/UI/Stage/StageInfoUI_DPS.cs @@ -26,7 +26,6 @@ public class StageInfoUI_DPS : MonoBehaviour } } InGameInfo.Ins.SaveItems(); - sdata.Set_Memory_Forest_TotalDamage(totaldmg); sdata.Use_Item(eItem.MemoryForest); sdata.Add_MissionCount(MyValue.arr_Mission[1], 32); diff --git a/Assets/Script/Util/MyEnum.cs b/Assets/Script/Util/MyEnum.cs index 0588d9dbe..6975bed51 100644 --- a/Assets/Script/Util/MyEnum.cs +++ b/Assets/Script/Util/MyEnum.cs @@ -1,8 +1,7 @@ -public enum eGameMode { Lobby, Stage, MyFarm, Memory, Max } // list 순서 +public enum eGameMode { Lobby, Stage, MyFarm, Dungeon, Max } // list 순서 +public enum eDungeon { d1_Mimic, d2_Maze, d3_Nightmare, d4_Wave } public enum eDifficult { Normal, Hard, NightMare, Hell, Max } public enum eUnlockCondition { None, BossKill, GetItem, SealBreaking, ChapterClear, } - -public enum eMemory { a1_Filed, a2_Forest, a3_Mine, a4_WitchGrade, a5_PetBattle } public enum eRole { Mob, Boss, Pet, PC, Fairy, EnemyPC, Farmer, Summon, BattleNPC, OBJ, QuestMob, MemoryMob, EnemyPet, EnemySummon } public enum eSubRol { None, Healer, Dummy, Ore, Witch } public enum eClassType { SwordMan, Archer, Fighter, Mage } diff --git a/Assets/Script/Util/MyValue.cs b/Assets/Script/Util/MyValue.cs index 65324d306..5fa0f3f56 100644 --- a/Assets/Script/Util/MyValue.cs +++ b/Assets/Script/Util/MyValue.cs @@ -218,10 +218,6 @@ public static class MyValue public static bool CanGetMemoryForestReward() { var sdata = ServerInfo.Ins.m_ServerData; - var totaldmg = sdata.Get_Memory_Forest_TotalDamage(); - var curStep = sdata.Get_Memory_Step(eMemory.a2_Forest); - var m_DPSTableData = table_dps.Ins.Get_Data_orNull(curStep + 1); - if (m_DPSTableData != null) return totaldmg >= m_DPSTableData.Dmg; return false; } public static bool CanDrinkPotion()