diff --git a/Assets/ResWork/UIPrefabs/Common/InvenMoneyCard.prefab b/Assets/ResWork/UIPrefabs/Common/InvenMoneyCard.prefab deleted file mode 100644 index cd3845b49..000000000 --- a/Assets/ResWork/UIPrefabs/Common/InvenMoneyCard.prefab +++ /dev/null @@ -1,492 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &37219759790193510 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2931966638877431630} - - component: {fileID: 6647259381408013507} - - component: {fileID: 5606364731670713118} - - component: {fileID: 3971939118792720206} - - component: {fileID: 3893501580934922483} - - component: {fileID: 7390855479772127285} - m_Layer: 5 - m_Name: bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2931966638877431630 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37219759790193510} - 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: 894321058262962073} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6647259381408013507 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37219759790193510} - 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.29411766, g: 0.30980393, b: 0.4745098, a: 1} - mPivot: 4 - mWidth: 265 - mHeight: 44 - mDepth: 0 - mMat: {fileID: 0} - autoResizeBoxCollider: 1 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 6.0227275 - 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!65 &5606364731670713118 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37219759790193510} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 265, y: 44, z: 0} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &3971939118792720206 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37219759790193510} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e862f287df53bb64db191162f851a296, type: 3} - m_Name: - m_EditorClassIdentifier: - onHoverOver: [] - onHoverOut: [] - onPress: [] - onRelease: [] - onSelect: [] - onDeselect: [] - onClick: - - mTarget: {fileID: 166514510474300842} - mMethodName: OnClick_ItemInfo - mParameters: [] - oneShot: 0 - onDoubleClick: [] - onDragStart: [] - onDragEnd: [] - onDragOver: [] - onDragOut: [] - onDrag: [] ---- !u!114 &3893501580934922483 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37219759790193510} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8d345b0a7677bc0499d4d92888f142c3, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &7390855479772127285 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37219759790193510} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} - m_Name: - m_EditorClassIdentifier: - scrollView: {fileID: 0} - draggablePanel: {fileID: 0} ---- !u!1 &2790826245513592878 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8015625721107185871} - - component: {fileID: 1287135572858953054} - m_Layer: 5 - m_Name: Sprite_sub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8015625721107185871 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2790826245513592878} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 37, y: -29, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3691141637331575610} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1287135572858953054 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2790826245513592878} - 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: 46 - mHeight: 46 - mDepth: 2 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 1 - mType: 0 - 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: chest_boots - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &3168464830471047990 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3691141637331575610} - - component: {fileID: 2063447205333864332} - m_Layer: 5 - m_Name: Sprite_icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3691141637331575610 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3168464830471047990} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -108.3, y: 0, z: 0} - m_LocalScale: {x: 0.2, y: 0.2, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8015625721107185871} - m_Father: {fileID: 894321058262962073} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2063447205333864332 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3168464830471047990} - 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: 140 - mHeight: 140 - mDepth: 1 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 1 - 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: farm_pumpkinwhite - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &5164686954875218766 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4441352849796849516} - - component: {fileID: 6533642560321338899} - m_Layer: 5 - m_Name: Label_amount - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4441352849796849516 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5164686954875218766} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -84.9, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 894321058262962073} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6533642560321338899 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5164686954875218766} - 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: 1, a: 1} - mPivot: 3 - mWidth: 172 - mHeight: 22 - mDepth: 2 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 7.818182 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 3996657457383321757, guid: b82558c03923de54da84da7ff79cd9f1, type: 3} - mText: 0,000,000,000 - mFontSize: 22 - 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: 0 - 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 &7269186853562461207 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 894321058262962073} - - component: {fileID: 166514510474300842} - m_Layer: 5 - m_Name: InvenMoneyCard - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &894321058262962073 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7269186853562461207} - 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: 2931966638877431630} - - {fileID: 3691141637331575610} - - {fileID: 4441352849796849516} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &166514510474300842 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7269186853562461207} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 96298346aa352344bb44be068b56eb0c, type: 3} - m_Name: - m_EditorClassIdentifier: - sprites: - - {fileID: 2063447205333864332} - - {fileID: 1287135572858953054} - label_amount: {fileID: 6533642560321338899} diff --git a/Assets/ResWork/UIPrefabs/Common/InvenMoneyCard.prefab.meta b/Assets/ResWork/UIPrefabs/Common/InvenMoneyCard.prefab.meta deleted file mode 100644 index ad47a5eb2..000000000 --- a/Assets/ResWork/UIPrefabs/Common/InvenMoneyCard.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b4b0297ab7c7d9a47b3f8193a8392335 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Common/InvenMoneyCard.cs b/Assets/Script/UI/Common/InvenMoneyCard.cs deleted file mode 100644 index 32a4aa71a..000000000 --- a/Assets/Script/UI/Common/InvenMoneyCard.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class InvenMoneyCard : MonoBehaviour -{ - public UISprite[] sprites; // 0 아이콘, 1 서브 - public UILabel label_amount; - - eItem m_item; - int m_id; - - public void Set(eItem item, int _id) - { - m_item = item; - m_id = _id; - var icondata = DSUtil.Get_ItemSpriteInfo(item, _id); - sprites[0].spriteName = icondata.Icon; - sprites[1].spriteName = icondata.SubIcon; - Refresh(); - } - - public void Refresh() - { - label_amount.text = DSUtil.GetThousandCommaText(ServerInfo.Ins.m_ServerData.Get_ItemAmount(m_item, m_id)); - } - - public void OnClick_ItemInfo() - { - ItemDescUI.Ins.Set(new ItemData(m_item, m_id, 0, "", eUICardType.GetItem)); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Common/InvenMoneyCard.cs.meta b/Assets/Script/UI/Common/InvenMoneyCard.cs.meta deleted file mode 100644 index 3cb34b37b..000000000 --- a/Assets/Script/UI/Common/InvenMoneyCard.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 96298346aa352344bb44be068b56eb0c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Common/WitchMiniInfo.cs b/Assets/Script/UI/Common/WitchMiniInfo.cs deleted file mode 100644 index 1cfeb25c7..000000000 --- a/Assets/Script/UI/Common/WitchMiniInfo.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class WitchMiniInfo : MonoBehaviour -{ - public UISprite sprite_face; - public UILabel[] labels; // 0 이름, 1 레벨 - public UISlider slider_lv; - - string nickname; - - private void Awake() { NickChange.actChangeNick.Add(Set_Name); } - - public void Set(string nick, ServerData sdata) - { - sprite_face.spriteName = table_itemlist.Ins.Get_Data(sdata.Get_EqiupmentEquip(eItem.PC)).s_ItemIcon; - - nickname = nick; - Set_Name(nick); - labels[1].text = DSUtil.Format("Lv {0}", sdata.PC.Lv); - - slider_lv.value = sdata.PC.Get_ExpSliderValue(); - } - - void Set_Name(string nick) - { - if (nick.Length > 7) - labels[0].text = DSUtil.Format("{0}{1}{2}{3}{4}{5}{6}..", nick[0], nick[1], nick[2], nick[3], nick[4], nick[5], nick[6]); - else - labels[0].text = nick; - } - - public void OnClick_Detail() - { - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Common/WitchMiniInfo.cs.meta b/Assets/Script/UI/Common/WitchMiniInfo.cs.meta deleted file mode 100644 index 8016b6c11..000000000 --- a/Assets/Script/UI/Common/WitchMiniInfo.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0b56e13322acaa9458a486ce2d4cdbc2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Kettle.meta b/Assets/Script/UI/Kettle.meta deleted file mode 100644 index 902b46181..000000000 --- a/Assets/Script/UI/Kettle.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a785fd2c40cdddc4a920cfecd04e3ca8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Kettle/CardInKettlePotion.cs b/Assets/Script/UI/Kettle/CardInKettlePotion.cs deleted file mode 100644 index bc1621a89..000000000 --- a/Assets/Script/UI/Kettle/CardInKettlePotion.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class CardInKettlePotion : CardBase -{ - public UISprite[] sprites; // 0 아이콘, 1 버튼, 2 공체 - public UILabel[] labels; // 0 개수, 1 남은 시간, 2 마녀 or 펫 - - KettleTableData m_Tdata; - - private void Awake() - { - Set_Repeat_for1sec(Set_RemainTime); - } - - public override void Set(T _base) - { - base.Set(_base); - m_Tdata = _base as KettleTableData; - sprites[0].spriteName = m_Tdata.Icon; - sprites[2].spriteName = m_Tdata.Stat == eStat.ATK ? "reinforce_attack" : "reinforce_hp"; - labels[2].text = m_Tdata.m_Role == eRole.PC ? "마녀" : "펫"; - Set_UI(); - } - - public override void Set_UI() - { - var sdata = ServerInfo.Ins.m_ServerData; - var amount = sdata.Get_ItemAmount(eItem.Potion, m_Tdata.ID); - labels[0].text = amount.ToString(); - sprites[1].spriteName = amount > 0 ? "button5" : MyValue.OffButtonName; - Set_RemainTime(); - } - - void Set_RemainTime() - { - if (m_Tdata == null) return; - - var sdata = ServerInfo.Ins.m_ServerData; - var sec = sdata.Get_PotionRemainTime(m_Tdata.ID); - if (sec > 3600) labels[1].text = DSUtil.Format("{0}시간", sec / 3600); - else if (sec == 0) labels[1].text = ""; - else labels[1].text = DSUtil.Get_TimeText_MS(sec); - } - - public void OnClick_Icon() - { - ItemDescUI.Ins.Set(m_Tdata.Icon, m_Tdata.Name, m_Tdata.Desc); - } - - public void OnClick_Use() - { - Use(true); - } - - public void Use(bool _showtoast) - { - var sdata = ServerInfo.Ins.m_ServerData; - if (sdata.Check_ItemAmount(eItem.Potion, 1, m_Tdata.ID, _showtoast)) - { - sdata.Add_PotionTime(m_Tdata.ID); - Content_Potion.Ins.Set_UI(); - //NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.UsePotion); - } - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Kettle/CardInKettlePotion.cs.meta b/Assets/Script/UI/Kettle/CardInKettlePotion.cs.meta deleted file mode 100644 index 0e9093ce6..000000000 --- a/Assets/Script/UI/Kettle/CardInKettlePotion.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 85844248d1827d2458ed07c27e947437 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Kettle/CombineMaterialCard.cs b/Assets/Script/UI/Kettle/CombineMaterialCard.cs deleted file mode 100644 index 7a2e63695..000000000 --- a/Assets/Script/UI/Kettle/CombineMaterialCard.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class CombineMaterialCard : MonoBehaviour -{ - public UISprite[] sprites; // 0 아이콘bg, 1 아이콘 - public UILabel[] labels; // 0 개수, 1 조합에 필요한 개수, 2 + - - ItemData m_ItemData = new ItemData { UICardType = eUICardType.GetItem }; - KettleCombineData m_Data; - - public void Set(eItem item, KettleCombineData data, bool _islast) - { - m_ItemData.ItemType = eItem.Food; - m_ItemData.Set_ID(data.FoodID); - - m_Data = data; - - gameObject.SetActive(true); - labels[2].text = _islast ? "" : "+"; - - if (item == eItem.Potion) - { - sprites[0].color = new Color32(75, 23, 80, 255); - labels[2].color = new Color32(203, 141, 176, 255); - } - else - { - sprites[0].color = new Color32(70, 72, 4, 255); - labels[2].color = new Color32(216, 233, 73, 255); - } - - sprites[1].spriteName = DSUtil.Get_ItemSpriteInfo(eItem.Food, data.FoodID).Icon; - Set_UI(); - labels[1].text = data.FoodNeedAmount.ToString(); - } - - public void Set_UI() - { - labels[0].text = ServerInfo.Ins.m_ServerData.Get_ItemAmount(eItem.Food, m_Data.FoodID).ToString(); - } - - public void OnClick_Item() - { - ItemDescUI.Ins.Set(m_ItemData); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Kettle/CombineMaterialCard.cs.meta b/Assets/Script/UI/Kettle/CombineMaterialCard.cs.meta deleted file mode 100644 index 88f906ec4..000000000 --- a/Assets/Script/UI/Kettle/CombineMaterialCard.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0060d5d1804c83e498ce60e9989b1f1f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Kettle/Content_Exchange.cs b/Assets/Script/UI/Kettle/Content_Exchange.cs deleted file mode 100644 index cd0db8f53..000000000 --- a/Assets/Script/UI/Kettle/Content_Exchange.cs +++ /dev/null @@ -1,140 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Content_Exchange : MonoBehaviourSingletonTemplate -{ - public ArrowUI m_ArrowUI; - public KettleExchangeCard[] arr_Card; // 0 왼쪽, 1 오른쪽 - - int[] arr_id = new int[] { 0, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 201, 202, 203, 204, 205, 206, 207, 208 }; - int LeftSelectIndex, RightSelectIndex; - int Get_LeftID() { return arr_id[LeftSelectIndex]; } - int Get_RightID() { return arr_id[RightSelectIndex]; } - - private void OnEnable() - { - LeftSelectIndex = 0; - RightSelectIndex = 0; - Set(); - } - - public void Set() - { - var sdata = ServerInfo.Ins.m_ServerData; - if (Get_LeftID() == 0 && Get_RightID() == 0) - m_ArrowUI.Set(null, 0); - - arr_Card[0].Set(Get_LeftID()); - var leftAmount = sdata.Get_ItemAmount(eItem.Food, Get_LeftID()); - m_ArrowUI.Set(totalcount => { Set_Amount(totalcount); }, (int)(leftAmount / 2)); - arr_Card[1].Set(Get_RightID()); - } - - void Set_Amount(int totalCount) - { - arr_Card[0].Set_Amount(new Color32(0, 239, 255, 255), 2 * totalCount); - arr_Card[1].Set_Amount(new Color32(89, 255, 72, 255), totalCount); - } - - public void OnClick_SelectCardArrow(GameObject _go) - { - switch (_go.name) - { - case "arrow_left_left": - --LeftSelectIndex; - if (LeftSelectIndex < 0) - { - LeftSelectIndex = arr_id.Length - 1; - RightSelectIndex = 0; // 채소에서 과일로 변해서 오른쪽 초기화 - } - else if (LeftSelectIndex == 0 || LeftSelectIndex == 20) - RightSelectIndex = 0; // 과일에서 채소로 변해서 오른쪽 초기화 - - if (RightSelectIndex > 0 && LeftSelectIndex > 0 && RightSelectIndex == LeftSelectIndex) - RightSelectIndex = 0; - break; - case "arrow_left_right": - ++LeftSelectIndex; - if (LeftSelectIndex >= arr_id.Length) - { - LeftSelectIndex = 0; - RightSelectIndex = 0; // 과일에서 채소로 변해서 오른쪽 초기화 - } - else if (LeftSelectIndex == 21) - RightSelectIndex = 0; // 채소에서 과일로 변해서 오른쪽 초기화 - - if (RightSelectIndex > 0 && LeftSelectIndex > 0 && RightSelectIndex == LeftSelectIndex) - RightSelectIndex = 0; - break; - case "arrow_right_left": - Right_Left(); - if (RightSelectIndex > 0 && LeftSelectIndex > 0 && RightSelectIndex == LeftSelectIndex) - Right_Left(); - - break; - case "arrow_right_right": - Right_Right(); - if (RightSelectIndex > 0 && LeftSelectIndex > 0 && RightSelectIndex == LeftSelectIndex) - Right_Right(); - break; - } - Set(); - arr_Card[1].Set_Amount(new Color32(89, 255, 72, 255), m_ArrowUI.Get_TotalCount()); - } - void Right_Left() - { - if (Get_LeftID() > 0) - { - --RightSelectIndex; - if (Get_LeftID() < 201) - { // 채소 - if (RightSelectIndex < 0) - RightSelectIndex = 20; - } - else if (Get_LeftID() > 200) - { // 과일 - if (RightSelectIndex == 20) - RightSelectIndex = 0; - else if (RightSelectIndex < 0) - RightSelectIndex = 28; - } - } - } - void Right_Right() - { - if (Get_LeftID() > 0) - { - ++RightSelectIndex; - if (Get_LeftID() < 201) - { // 채소 - if (RightSelectIndex > 20) - RightSelectIndex = 0; - } - else if (Get_LeftID() > 200) - { // 과일 - if (RightSelectIndex >= arr_id.Length) - RightSelectIndex = 0; - else if (RightSelectIndex > 0 && RightSelectIndex < 21) - RightSelectIndex = 21; - } - } - } - - public void OnClick_Exchange() - { - if (Get_LeftID() == 0) - ToastUI.Ins.Set(168); - else if (Get_RightID() == 0) - ToastUI.Ins.Set(169); - else if (m_ArrowUI.Get_TotalCount() > 0) - { - var sdata = ServerInfo.Ins.m_ServerData; - sdata.Use_Item(eItem.Food, m_ArrowUI.Get_TotalCount() * 2, Get_LeftID(), "exchange"); - var items = sdata.Add_Item(new ItemData(eItem.Food, Get_RightID(), m_ArrowUI.Get_TotalCount(), "exchange", eUICardType.GetItem)); - GetItemUI.Ins.Set(items); - GetItemUI.Ins.Show_Items(); - Set(); - } - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Kettle/Content_Exchange.cs.meta b/Assets/Script/UI/Kettle/Content_Exchange.cs.meta deleted file mode 100644 index df400bbe1..000000000 --- a/Assets/Script/UI/Kettle/Content_Exchange.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: af6817db179a46b4dbcf305bc4b4d940 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Kettle/Content_Potion.cs b/Assets/Script/UI/Kettle/Content_Potion.cs deleted file mode 100644 index 7ae30f903..000000000 --- a/Assets/Script/UI/Kettle/Content_Potion.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Content_Potion : MonoBehaviourSingletonTemplate -{ - public UIGrid m_Grid, m_Grid_Potion; - public UILabel label_potiondesc; - public GameObject go_card, go_potioncard, go_btn, go_btnNoti; - - List list_KettlePotionCard = new List(); - - protected override void Awake() - { - base.Awake(); - label_potiondesc.text = DSUtil.Format("포션을 조제할 수 있습니다.\n조제한 포션을 사용 할 수 있으며,\n사용 시 {0}분이 추가됩니다.\n포션 능력치는 중복됩니다.", MyValue.PotionAddMin); - } - - private void OnEnable() - { - Set_UI(); - } - - public void Set_UI() - { - var lst = table_kettle.Ins.Get_DataList(eItem.Potion); - var lst_value = new List(); - for (int i = 0; i < lst.Count; i++) - { - var val = (lst[i] as KettleTableData).Value; - if (lst_value.Find(f => f == val) <= 0f) - lst_value.Add(val); - if (lst_value.Count == 3) break; - } - var lst1 = lst.FindAll(f => (f as KettleTableData).Value == lst_value[0]); - var lst2 = lst.FindAll(f => (f as KettleTableData).Value == lst_value[1]); - var lst3 = lst.FindAll(f => (f as KettleTableData).Value == lst_value[2]); - - if (list_KettlePotionCard.Count == 0) - { - for (int i = 0; i < 3; i++) - list_KettlePotionCard.Add(DSUtil.Get_Clone(go_card, m_Grid.transform)); - } - - list_KettlePotionCard[0].Set(lst1); - list_KettlePotionCard[1].Set(lst2); - list_KettlePotionCard[2].Set(lst3); - - go_btnNoti.SetActive(MyValue.CanCombineKettle(eItem.Potion)); - } - - public void Refresh_UI() - { - list_KettlePotionCard.ForEach(f => f.Refresh_UI()); - } - - public void OnClick_UseAll() - { - for (int i = 0; i < list_KettlePotionCard.Count; i++) - list_KettlePotionCard[i].Use_AllPotion(); - } - - public void OnClick_Combine() - { - } -} diff --git a/Assets/Script/UI/Kettle/Content_Potion.cs.meta b/Assets/Script/UI/Kettle/Content_Potion.cs.meta deleted file mode 100644 index 17ee07439..000000000 --- a/Assets/Script/UI/Kettle/Content_Potion.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: baa318e0e1159d94cba6b290a592a065 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Kettle/Content_Relic.cs b/Assets/Script/UI/Kettle/Content_Relic.cs deleted file mode 100644 index fae0e5a7c..000000000 --- a/Assets/Script/UI/Kettle/Content_Relic.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Content_Relic : ScrollViewMgr -{ - public GameObject go_btn, go_btnNoti; - - public void OnEnable() - { - Set_ScrollView(table_kettle.Ins.Get_DataList(eItem.Relic)); - go_btnNoti.SetActive(MyValue.CanCombineKettle(eItem.Relic)); - } - - public void Refresh_UI() - { - list_CardBase.ForEach(f => f.Set_UI()); - go_btnNoti.SetActive(MyValue.CanCombineKettle(eItem.Relic)); - } - - public void OnClick_Combine() - { - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Kettle/Content_Relic.cs.meta b/Assets/Script/UI/Kettle/Content_Relic.cs.meta deleted file mode 100644 index 174ca23b3..000000000 --- a/Assets/Script/UI/Kettle/Content_Relic.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 73bdeb26dd8851640b4bac3bd2f83d8e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Kettle/KettleCombineUI.cs b/Assets/Script/UI/Kettle/KettleCombineUI.cs deleted file mode 100644 index 4b056279c..000000000 --- a/Assets/Script/UI/Kettle/KettleCombineUI.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class KettleCombineUI : ScrollViewMgr -{ - GameObject go_CombineBtn; - - public void Set(GameObject btn) - { - go_CombineBtn = btn; - go_CombineBtn.SetActive(false); - base.Set(); - Set_UI(true, false); - } - - public void Set_UI(bool _repos, bool _refresh) - { - if (!_refresh) - Set_ScrollView(go_CombineBtn.name.Contains("potion") ? table_kettle.Ins.Get_DataList(eItem.Potion) : table_kettle.Ins.Get_DataList(eItem.Relic), _repos); - } - - public override void OnClick_Back() - { - base.OnClick_Back(); - go_CombineBtn.SetActive(true); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Kettle/KettleCombineUI.cs.meta b/Assets/Script/UI/Kettle/KettleCombineUI.cs.meta deleted file mode 100644 index a96cfda46..000000000 --- a/Assets/Script/UI/Kettle/KettleCombineUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1c5eb53ff8a18e342abf6d56531a1027 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Kettle/KettleExchangeCard.cs b/Assets/Script/UI/Kettle/KettleExchangeCard.cs deleted file mode 100644 index 4fa3eaaaa..000000000 --- a/Assets/Script/UI/Kettle/KettleExchangeCard.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class KettleExchangeCard : MonoBehaviour -{ - public UISprite[] sprites; // 0 아이콘 - public UILabel[] labels; // 0 가지고 있는 개수, 1 변경되는 개수, 2 이름 - - int m_ID; - - public void Set(int id) - { - m_ID = id; - - if (m_ID > 0) - { - sprites[0].spriteName = DSUtil.Get_ItemSpriteInfo(eItem.Food, m_ID).Icon; - labels[0].text = DSUtil.GetThousandCommaText(ServerInfo.Ins.m_ServerData.Get_ItemAmount(eItem.Food, id)); - labels[1].text = ""; - //labels[2].text = MyText.Get_ItemName(id); - } - else - { - sprites[0].spriteName = DSUtil.Get_ItemSpriteInfo(eItem.IdontKnow, m_ID).Icon; - labels[0].text = labels[1].text = labels[2].text = ""; - } - } - - public void Set_Amount(Color color, int amount) - { - if (m_ID > 0) - { - labels[1].color = color; - labels[1].text = DSUtil.Format("{0}{1}", Mathf.Approximately(color.r, 0f) ? "-" : "+", DSUtil.GetThousandCommaText(amount)); - } - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Kettle/KettleExchangeCard.cs.meta b/Assets/Script/UI/Kettle/KettleExchangeCard.cs.meta deleted file mode 100644 index c8cb59d5a..000000000 --- a/Assets/Script/UI/Kettle/KettleExchangeCard.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a217566e66d70de44be285511b9309d6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Kettle/KettlePotionCard.cs b/Assets/Script/UI/Kettle/KettlePotionCard.cs deleted file mode 100644 index 429722bd1..000000000 --- a/Assets/Script/UI/Kettle/KettlePotionCard.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class KettlePotionCard : ScrollViewMgr -{ - public UILabel label_percent; - - public void Set(List _lst) - { - gameObject.SetActive(true); - - label_percent.text = DSUtil.Format("{0}%", (_lst[0] as KettleTableData).Value * 100f); - - Set_ScrollView(_lst); - } - - public void Refresh_UI() - { - list_CardBase.ForEach(f => (f as CardInKettlePotion).Set_UI()); - } - - public void Use_AllPotion() - { - for (int i = 0; i < list_CardBase.Count; i++) - { - var temp = list_CardBase[i] as CardInKettlePotion; - temp.Use(false); - } - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Kettle/KettlePotionCard.cs.meta b/Assets/Script/UI/Kettle/KettlePotionCard.cs.meta deleted file mode 100644 index 99f6650a0..000000000 --- a/Assets/Script/UI/Kettle/KettlePotionCard.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9a7346ee2dc4031498f8e427cd6f556e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Kettle/KettleRelicCard.cs b/Assets/Script/UI/Kettle/KettleRelicCard.cs deleted file mode 100644 index ceb127afc..000000000 --- a/Assets/Script/UI/Kettle/KettleRelicCard.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class KettleRelicCard : CardBase -{ - public UISprite[] sprites; // 0 아이콘 - public UILabel[] labels; // 0 유물 이름, 1 유물 효과, 2 레벨, 3 max - public GameObject[] gos; // 0 미획득 - - KettleTableData m_Tdata; - - public override void Set(T _base) - { - base.Set(_base); - m_Tdata = _base as KettleTableData; - - sprites[0].spriteName = m_Tdata.Icon; - labels[0].text = m_Tdata.Name; - Set_UI(); - } - - public override void Set_UI() - { - var lv = ServerInfo.Ins.m_ServerData.Get_ItemAmount(eItem.Relic, m_Tdata.ID); - labels[1].text = DSUtil.Format("{0} {1}", MyText.Get_StatName(m_Tdata.Stat), MyText.Get_StatValueText(m_Tdata.Stat, lv * m_Tdata.Value)); - labels[2].text = DSUtil.Format("Lv.{0}", lv); - labels[3].text = lv >= m_Tdata.MaxLv ? "(Max)" : ""; - gos[0].SetActive(lv < 1); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Kettle/KettleRelicCard.cs.meta b/Assets/Script/UI/Kettle/KettleRelicCard.cs.meta deleted file mode 100644 index 6698ea19b..000000000 --- a/Assets/Script/UI/Kettle/KettleRelicCard.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 716ac7a6554ad74418f49bafd54d1b63 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/MenuButler.meta b/Assets/Script/UI/MenuButler.meta deleted file mode 100644 index 4ca5030ee..000000000 --- a/Assets/Script/UI/MenuButler.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8398250af0fb08a428a6b1af3344dd8d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/MenuButler/ButlerCostumeCard.cs b/Assets/Script/UI/MenuButler/ButlerCostumeCard.cs deleted file mode 100644 index 83349bda2..000000000 --- a/Assets/Script/UI/MenuButler/ButlerCostumeCard.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ButlerCostumeCard : CardBase -{ - public UISprite[] sprites; // 0 코스튬, 1 옵션타입 - public UILabel label_lv, label_name; - public GameObject[] gos; // 0 선택, 1 장착 버튼, 2 장착 중, 3 추천 - - //PCTableData m_PCTableData; - int m_Lv; - - public override void Set(T _base) - { - base.Set(_base); - //m_PCTableData = _base as PCTableData; - //var sdata = ServerInfo.Ins.m_ServerData; - //DSUtil.InActivateGameObjects(gos); - - //sprites[0].spriteName = m_PCTableData.Icon; - //sprites[1].spriteName = m_PCTableData.Option; - //m_Lv = sdata.PC.Get_Lv(m_PCTableData.ID); - //sprites[0].color = m_Lv > 0 ? Color.white : Color.black; - //if (m_Lv >= m_PCTableData.MaxLv) label_lv.text = "Max"; - //else label_lv.text = m_Lv.ToString(); - //label_name.text = m_PCTableData.Name; - - //gos[2].SetActive(IsEquipCostume()); - //gos[3].SetActive(m_Lv == 0 && m_PCTableData.Recommend); - } - - public bool IsCostumeCard(int _id) - { - return false; - //return _id == m_PCTableData.ID; - } - public bool IsEquipCostume() - { - return false; - //var info = ServerInfo.Ins.m_ServerData.Equip.Get_Preset_byPrest(Content_Costume.Ins.m_DeckTabUI.Get_Tab()); - //return info.Equip[eItem.PC] == m_PCTableData.ID; - } - //public PCTableData Get_PCData() - //{ // 코스튬 UI 진입 시 한 번만 호출 - // gos[0].SetActive(true); - // gos[1].SetActive(m_Lv > 0 && !IsEquipCostume()); - // return m_PCTableData; - //} - public void OnClick_SelectCostume() - { - //Content_Costume.Ins.Set_Scroll(); - gos[0].SetActive(true); - gos[1].SetActive(m_Lv > 0 && !IsEquipCostume()); - //Content_Costume.Ins.Set_LeftInfo(m_PCTableData); - } - - public void OnClick_EquipCostume() - { - //ServerInfo.Ins.m_ServerData.Equip.Set_Equip(Content_Costume.Ins.m_DeckTabUI.Get_Tab(), eItem.PC, 0, m_PCTableData.ID, 0); - //Content_Costume.Ins.Set_UI(); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/MenuButler/ButlerCostumeCard.cs.meta b/Assets/Script/UI/MenuButler/ButlerCostumeCard.cs.meta deleted file mode 100644 index 9a72f6347..000000000 --- a/Assets/Script/UI/MenuButler/ButlerCostumeCard.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e3ca46b28ba6b8546be36aee70f194c2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/MenuButler/Content_Costume.cs b/Assets/Script/UI/MenuButler/Content_Costume.cs deleted file mode 100644 index 0afeda0f6..000000000 --- a/Assets/Script/UI/MenuButler/Content_Costume.cs +++ /dev/null @@ -1,160 +0,0 @@ -using CodeStage.AntiCheat.ObscuredTypes; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Content_Costume : MonoBehaviourSingletonScrollViewMgr -{ - public UILabel[] labels; // 0 코스튬 이름, 1 코스튬 설명, 2 전 능력, 3 후 능력, 4 강화 가격, 5 구매 가격 - public GameObject[] gos; // 0 화살표, 1 강화 불가능, 2 젬 이미지, 3 구매 버튼, 4 강화 불가능, 5 강화 Max, 6 상점에서 구매 - public NGUIButtonPress m_NGUIButtonPress; - public DeckTabUI m_DeckTabUI; - public CountChoiceUI m_CountChoiceUI; - - //PCTableData Select_PCTableData; - //ObscuredInt m_LvUpPrice, m_Unit = 1; - - //protected override void Awake() - //{ - // base.Awake(); - // m_NGUIButtonPress.Set_Action(OnClick_LvUp); - // m_CountChoiceUI.Set(Set_LeftInfoUI); - //} - - //private void OnEnable() - //{ - // m_DeckTabUI.Set(1, Set_UI, true); - //} - - //public void Set_UI() - //{ - // Set_Scroll(); - // var equip = list_CardBase.Find(f => (f as ButlerCostumeCard).IsEquipCostume()) as ButlerCostumeCard; - // //Set_LeftInfo(equip.Get_PCData()); - //} - - //public void Set_Scroll() - //{ - // //Set_ScrollView(table_pc.Ins.Get_DataList()); - //} - - //public void Set_LeftInfo() - //{ - // //Select_PCTableData = _select; - // Set_LeftInfoUI(); - //} - //void Set_LeftInfoUI() - //{ - // var sdata = ServerInfo.Ins.m_ServerData; - // var lv = sdata.PC.Get_Lv(Select_PCTableData.ID); - // if (lv < 1) m_Unit = 1; - // else m_Unit = m_CountChoiceUI.Get_Count(); - // if (lv + m_Unit > Select_PCTableData.MaxLv) - // m_Unit = Select_PCTableData.MaxLv - lv; - - // int i = 0; - // labels[i++].text = Select_PCTableData.Name; - // labels[i++].text = Select_PCTableData.Desc; - // gos[0].SetActive(false); - // string valueFormat = Select_PCTableData.ID == 16 ? "{0}" : "{0:#,##0.###}%"; - // double valueMul = Select_PCTableData.ID == 16 ? 1d : 100d; - // switch (Select_PCTableData.ID) - // { - // case 1: - // case 4: - // labels[i++].text = labels[i++].text = ""; - // break; - // default: - // labels[i++].text = DSUtil.Format(valueFormat, Select_PCTableData.Get_Value(sdata) * valueMul); - // if (lv < Select_PCTableData.MaxLv) - // { - // gos[0].SetActive(true); - // labels[i++].text = DSUtil.Format(valueFormat, Select_PCTableData.Get_Value(sdata, m_Unit) * valueMul); - // } - // else - // labels[i++].text = ""; - // break; - // } - // labels[5].text = DSUtil.GetThousandCommaText(Select_PCTableData.BuyGemPrice); - - // gos[3].SetActive(lv <= 0); - // if (lv >= Select_PCTableData.MaxLv) - // { - // labels[4].text = ""; - // gos[2].SetActive(false); - // gos[4].SetActive(true); - // gos[5].SetActive(true); - // m_CountChoiceUI.gameObject.SetActive(false); - // } - // else - // { - // m_LvUpPrice = m_Unit * Select_PCTableData.LvGemPrice; - // labels[4].text = DSUtil.GetThousandCommaText(m_LvUpPrice); - // gos[2].SetActive(true); - // gos[4].SetActive(lv <= 0 || !sdata.Check_ItemAmount(eItem.Gem, Select_PCTableData.LvGemPrice, 0, false)); - // gos[5].SetActive(false); - // m_CountChoiceUI.gameObject.SetActive(lv > 0); - // } - - // if (GameUI.Ins != null) - // GameUI.Ins.LobbyUI.Get_MenuWitch().Set_3DModel(sdata, Select_PCTableData.ID); - - // switch (Select_PCTableData.ID) - // { - // case 13: case 15: case 16: case 17: - // gos[6].SetActive(lv == 0); - // break; - // default: - // gos[6].SetActive(false); - // break; - // } - //} - - //public void OnClick_Buy() - //{ - // var sdata = ServerInfo.Ins.m_ServerData; - // if (sdata.Check_ItemAmount(eItem.Gem, Select_PCTableData.BuyGemPrice)) - // { - // sdata.Use_Item(eItem.Gem, Select_PCTableData.BuyGemPrice, 0, DSUtil.Format("cos buy {0}", Select_PCTableData.ID)); - // sdata.PC.Add_Lv(Select_PCTableData.ID); - // ServerInfo.Ins.Write(() => - // { - // var buycard = list_CardBase.Find(f => (f as ButlerCostumeCard).IsCostumeCard(Select_PCTableData.ID)) as ButlerCostumeCard; - // buycard.Set(Select_PCTableData); - // Set_LeftInfo(buycard.Get_PCData()); - // }); - // } - //} - //public void OnClick_BuyFromShop() - //{ - // GameUI.Ins.LobbyUI.Get_MenuWitch().OnClick_Back(); - // GameUI.Ins.LobbyUI.Get_MenuShop().Set_Tab(eShopTab.Package, 1f); - //} - //public void OnClick_LvUp() - //{ - // var sdata = ServerInfo.Ins.m_ServerData; - // var lv = sdata.PC.Get_Lv(Select_PCTableData.ID); - // if (Select_PCTableData.MaxLv > lv && sdata.Check_ItemAmount(eItem.Gem, m_LvUpPrice)) - // { - // sdata.Use_Item(eItem.Gem, m_LvUpPrice, 0, DSUtil.Format("coslv {0}", Select_PCTableData.ID)); - // sdata.PC.Add_Lv(Select_PCTableData.ID, m_Unit); - // GameUI.Ins.LobbyUI.Get_MenuWitch().Show_ModelEffect(); - // var lvupcard = list_CardBase.Find(f => (f as ButlerCostumeCard).IsCostumeCard(Select_PCTableData.ID)) as ButlerCostumeCard; - // lvupcard.Set(Select_PCTableData); - // Set_LeftInfo(lvupcard.Get_PCData()); - // if (soundtime <= 0f) - // { - // SoundInfo.Ins.Play_OneShot(eSound.s012_CosumeLvUp, 0.8f); - // soundtime = 0.3f; - // } - // } - //} - - //float soundtime; - //protected override void Update() - //{ - // base.Update(); - // if (soundtime > 0f) - // soundtime -= Time.deltaTime; - //} -} \ No newline at end of file diff --git a/Assets/Script/UI/MenuButler/Content_Costume.cs.meta b/Assets/Script/UI/MenuButler/Content_Costume.cs.meta deleted file mode 100644 index 2534fabdd..000000000 --- a/Assets/Script/UI/MenuButler/Content_Costume.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 77d20c77d25168b459337a0adbc2dfc5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/MenuButler/MagicBlossomUI.cs b/Assets/Script/UI/MenuButler/MagicBlossomUI.cs deleted file mode 100644 index 8e14103a1..000000000 --- a/Assets/Script/UI/MenuButler/MagicBlossomUI.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MagicBlossomUI : BackKeyAdd -{ - public GameObject[] gos; // 0 블라썸, 1 설명 팝업, 2 확인 버튼 - public UISprite[] sprites; // 0 1 등급, 2 3 아이콘 - public UILabel[] labels; // 0 타이틀, 1 설명 - public Transform tf_icon; - public ParticleSystem PS_CardGlow; - - public void Set(int _step, SkillListTableData _magic, Action _refresh) - { - base.Set(); - DontBack = true; - var psmain = PS_CardGlow.main; - //psmain.startColor = MyValue.Get_SliderGradeColor(_magic.e_Grade); - //sprites[0].spriteName = sprites[1].spriteName = DSUtil.Get_GradeSpriteName(_magic.e_Grade); - //sprites[2].spriteName = sprites[3].spriteName = _magic.s_Icon; - //labels[0].text = DSUtil.Format("{0}{1} 개화", MyValue.Get_GradeColor(_magic.e_Grade), _magic.n_SkillName); - //labels[1].text = _magic.Get_SkillEnhanceDesc(_step); - StartCoroutine(Co_Blossom(_refresh)); - } - - IEnumerator Co_Blossom(Action _refresh) - { - SoundInfo.Ins.Play_OneShot(eSound.s016_MagicStepOpen, 0.7f); - DSUtil.InActivateGameObjects(gos, 0); - tf_icon.localPosition = Vector3.zero; - float t = 0f, time = 0f; - var targetpos = Vector3.up * 200f; - while (time < 2f) - { - yield return null; - time += Time.deltaTime; - t += Time.deltaTime * 1.33f; - tf_icon.localPosition = Vector3.Lerp(Vector3.zero, targetpos, t); - } - - // 팝업 보여주기 - DSUtil.InActivateGameObjects(gos, 1); - yield return new WaitForSeconds(0.5f); - gos[2].SetActive(true); - DontBack = false; - _refresh?.Invoke(); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/MenuButler/MagicBlossomUI.cs.meta b/Assets/Script/UI/MenuButler/MagicBlossomUI.cs.meta deleted file mode 100644 index 971ae433e..000000000 --- a/Assets/Script/UI/MenuButler/MagicBlossomUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: acdbaf8ea3db9504293e1cb439c627e5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: