cull(engine-cleanup): pass-8 phase-2 cascade round 3 after AreaSelectUI stub
This commit is contained in:
@@ -10,77 +10,10 @@ public class AreaSelInfo : MonoBehaviour
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
private static readonly Vector3 CLEARPRESENT_CARD_COLLISIONSIZE = new Vector3(175f, 230f, 1f);
|
|
||||||
|
|
||||||
private static readonly string[] CLEARPRESENT_NAME = new string[10] { "", "Common_0205", "", "Common_0201", "", "", "", "", "", "Common_0115" };
|
private static readonly string[] CLEARPRESENT_NAME = new string[10] { "", "Common_0205", "", "Common_0201", "", "", "", "", "", "Common_0115" };
|
||||||
|
|
||||||
private static readonly string[] CLEARPRESENT_THUMBNAIL_SPRITENAME = new string[10] { "", "thumbnail_liquid", "", "thumbnail_crystal", "", "", "thumbnail_card", "thumbnail_emblem", "thumbnail_title", "thumbnail_rupy" };
|
private static readonly string[] CLEARPRESENT_THUMBNAIL_SPRITENAME = new string[10] { "", "thumbnail_liquid", "", "thumbnail_crystal", "", "", "thumbnail_card", "thumbnail_emblem", "thumbnail_title", "thumbnail_rupy" };
|
||||||
|
|
||||||
private readonly Vector3 REWARD_TABLE_DEFAULT_POSITION = new Vector3(45f, -85.3f, 0f);
|
|
||||||
|
|
||||||
private readonly Vector3 REWARD_TABLE_CARD_POSITION = new Vector3(28.5f, -85.3f, 0f);
|
|
||||||
|
|
||||||
private readonly Dictionary<UserGoods.Type, float> REWARD_BG_OFFSET_MAGNIFICATION = new Dictionary<UserGoods.Type, float>
|
|
||||||
{
|
|
||||||
{
|
|
||||||
UserGoods.Type.Degree,
|
|
||||||
2f
|
|
||||||
},
|
|
||||||
{
|
|
||||||
UserGoods.Type.Card,
|
|
||||||
1.2f
|
|
||||||
},
|
|
||||||
{
|
|
||||||
UserGoods.Type.Sleeve,
|
|
||||||
1.2f
|
|
||||||
},
|
|
||||||
{
|
|
||||||
UserGoods.Type.Skin,
|
|
||||||
1.2f
|
|
||||||
},
|
|
||||||
{
|
|
||||||
UserGoods.Type.RedEther,
|
|
||||||
1f
|
|
||||||
},
|
|
||||||
{
|
|
||||||
UserGoods.Type.Rupy,
|
|
||||||
1f
|
|
||||||
},
|
|
||||||
{
|
|
||||||
UserGoods.Type.Item,
|
|
||||||
1f
|
|
||||||
},
|
|
||||||
{
|
|
||||||
UserGoods.Type.Emblem,
|
|
||||||
1f
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
private List<AreaSelectClearReward> _clearRewardList = new List<AreaSelectClearReward>();
|
|
||||||
|
|
||||||
[SerializeField]
|
|
||||||
private UITable _tableRoot;
|
|
||||||
|
|
||||||
[SerializeField]
|
|
||||||
private UITable[] _tableRewardsCategory = new UITable[3];
|
|
||||||
|
|
||||||
[SerializeField]
|
|
||||||
private GameObject _cardObjEvacuationRoot;
|
|
||||||
|
|
||||||
[SerializeField]
|
|
||||||
private UISprite _spriteRewardBackground;
|
|
||||||
|
|
||||||
[SerializeField]
|
|
||||||
private UILabel _labelAcquired;
|
|
||||||
|
|
||||||
private List<UIBase_CardManager.CardObjData> _cardObjList = new List<UIBase_CardManager.CardObjData>();
|
|
||||||
|
|
||||||
private CardDetailUI _cardDetail;
|
|
||||||
|
|
||||||
private List<string> _loadFileList = new List<string>();
|
|
||||||
|
|
||||||
private bool _isLoadEnd = true;
|
|
||||||
|
|
||||||
public static string GetPresentItemName(int itemID, long userGoodsId)
|
public static string GetPresentItemName(int itemID, long userGoodsId)
|
||||||
{
|
{
|
||||||
switch ((UserGoods.Type)itemID)
|
switch ((UserGoods.Type)itemID)
|
||||||
|
|||||||
@@ -89,33 +89,6 @@ internal class AreaSelectClearReward : MonoBehaviour
|
|||||||
|
|
||||||
public UserGoods.Type RewardGoodsType { get; private set; }
|
public UserGoods.Type RewardGoodsType { get; private set; }
|
||||||
|
|
||||||
public void Init(List<UIBase_CardManager.CardObjData> cardObjList, GameObject cardObjEvacuationRoot)
|
|
||||||
{
|
|
||||||
_cardObjList = cardObjList;
|
|
||||||
_cardObjEvacuationRoot = cardObjEvacuationRoot;
|
|
||||||
HideAllLayout();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Transform GetRewardTransform()
|
|
||||||
{
|
|
||||||
switch (RewardGoodsType)
|
|
||||||
{
|
|
||||||
case UserGoods.Type.Card:
|
|
||||||
return _objAttachCard.transform;
|
|
||||||
case UserGoods.Type.RedEther:
|
|
||||||
case UserGoods.Type.Rupy:
|
|
||||||
return _spriteGoods.transform;
|
|
||||||
case UserGoods.Type.Item:
|
|
||||||
case UserGoods.Type.Sleeve:
|
|
||||||
case UserGoods.Type.Emblem:
|
|
||||||
case UserGoods.Type.Degree:
|
|
||||||
case UserGoods.Type.Skin:
|
|
||||||
return _textureGoods.transform;
|
|
||||||
default:
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void HideAllLayout()
|
private void HideAllLayout()
|
||||||
{
|
{
|
||||||
_objLayoutCard.SetActive(value: false);
|
_objLayoutCard.SetActive(value: false);
|
||||||
@@ -123,41 +96,6 @@ internal class AreaSelectClearReward : MonoBehaviour
|
|||||||
_objLayoutTexture.SetActive(value: false);
|
_objLayoutTexture.SetActive(value: false);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ShowCard(int cardId, int cardCount, bool isAcquired)
|
|
||||||
{
|
|
||||||
if (_displayedCardObj != null)
|
|
||||||
{
|
|
||||||
_displayedCardObj.SetActive(value: false);
|
|
||||||
_displayedCardObj.transform.SetParent(_cardObjEvacuationRoot.transform);
|
|
||||||
}
|
|
||||||
_objLayoutCard.SetActive(value: true);
|
|
||||||
UIBase_CardManager.CardObjData cardObjData = GetCardObjData(cardId);
|
|
||||||
if (cardObjData == null)
|
|
||||||
{
|
|
||||||
_objLayoutCard.SetActive(value: false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
_displayedCardObj = cardObjData.CardObj;
|
|
||||||
_displayedCardObj.transform.SetParent(_objAttachCard.transform);
|
|
||||||
_displayedCardObj.transform.localPosition = Vector3.zero;
|
|
||||||
_displayedCardObj.transform.localScale = Vector3.one;
|
|
||||||
_displayedCardObj.transform.rotation = CARDOBJECT_ROTATION_QUATERNION;
|
|
||||||
_displayedCardObj.SetActive(value: true);
|
|
||||||
CardListTemplate component = _displayedCardObj.GetComponent<CardListTemplate>();
|
|
||||||
component._newLabel.gameObject.SetActive(value: false);
|
|
||||||
_labelNum.text = Data.SystemText.Get("Common_0040", cardCount.ToString());
|
|
||||||
_labelNum.transform.localPosition = CARD_NUM_POSITION;
|
|
||||||
_labelNum.gameObject.SetActive(value: true);
|
|
||||||
_spriteCardAcquiredMask.gameObject.SetActive(isAcquired);
|
|
||||||
UIManager.SetObjectToGrey(_displayedCardObj, isAcquired);
|
|
||||||
if (isAcquired)
|
|
||||||
{
|
|
||||||
_spriteCardAcquiredMask.depth = component._frameSprite.depth + -1;
|
|
||||||
component._cardTexture.depth = component._frameSprite.depth + -2;
|
|
||||||
_displayedCardObj.GetComponent<BoxCollider>().enabled = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private UIBase_CardManager.CardObjData GetCardObjData(int cardId)
|
private UIBase_CardManager.CardObjData GetCardObjData(int cardId)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < _cardObjList.Count; i++)
|
for (int i = 0; i < _cardObjList.Count; i++)
|
||||||
@@ -171,39 +109,6 @@ internal class AreaSelectClearReward : MonoBehaviour
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ShowSprite(UserGoods.Type goodsType, int goodsCount, bool isAcquired)
|
|
||||||
{
|
|
||||||
_objLayoutSprite.SetActive(value: true);
|
|
||||||
_spriteGoods.spriteName = AreaSelInfo.GetPresentItemSpriteName((int)goodsType);
|
|
||||||
_spriteGoods.gameObject.SetActive(value: true);
|
|
||||||
_labelNum.text = Data.SystemText.Get("Common_0040", goodsCount.ToString());
|
|
||||||
_labelNum.transform.localPosition = DEFAULT_NUM_POSITION;
|
|
||||||
_labelNum.gameObject.SetActive(value: true);
|
|
||||||
_spriteGoods.color = GetAcquiredColor(isAcquired);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ShowTexture(UserGoods.Type goodsType, long goodsId, int goodsCount, bool isAcquired)
|
|
||||||
{
|
|
||||||
_objLayoutTexture.SetActive(value: true);
|
|
||||||
InitializeGoodsTexture(_textureGoods, goodsType, goodsId);
|
|
||||||
TextureTransformParam textureTransformParam = USERGOODS_TEXTURE_LAYOUT_DICT[goodsType];
|
|
||||||
_textureGoods.width = textureTransformParam.Width;
|
|
||||||
_textureGoods.height = textureTransformParam.Height;
|
|
||||||
_textureGoods.transform.localPosition = textureTransformParam.Position;
|
|
||||||
_textureGoods.transform.localRotation = textureTransformParam.Rotation;
|
|
||||||
if (goodsType == UserGoods.Type.Item)
|
|
||||||
{
|
|
||||||
_labelNum.text = Data.SystemText.Get("Common_0040", goodsCount.ToString());
|
|
||||||
_labelNum.transform.localPosition = DEFAULT_NUM_POSITION;
|
|
||||||
_labelNum.gameObject.SetActive(value: true);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
_labelNum.gameObject.SetActive(value: false);
|
|
||||||
}
|
|
||||||
_textureGoods.color = GetAcquiredColor(isAcquired);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void InitializeGoodsTexture(UITexture texture, UserGoods.Type goodsType, long goodsId)
|
private void InitializeGoodsTexture(UITexture texture, UserGoods.Type goodsType, long goodsId)
|
||||||
{
|
{
|
||||||
string text = string.Empty;
|
string text = string.Empty;
|
||||||
|
|||||||
@@ -120,8 +120,6 @@ public class Master
|
|||||||
|
|
||||||
private IDictionary<string, string> PracticeTextDic { get; set; }
|
private IDictionary<string, string> PracticeTextDic { get; set; }
|
||||||
|
|
||||||
private IDictionary<string, string> StorySectionTitleTextDic { get; set; }
|
|
||||||
|
|
||||||
public IDictionary<int, List<int>> RelationCardSortDic { get; private set; }
|
public IDictionary<int, List<int>> RelationCardSortDic { get; private set; }
|
||||||
|
|
||||||
public Dictionary<int, List<int>> GleamingGemListMaster { get; set; }
|
public Dictionary<int, List<int>> GleamingGemListMaster { get; set; }
|
||||||
|
|||||||
@@ -332,14 +332,6 @@ public class iTween : MonoBehaviour
|
|||||||
Launch(target, args);
|
Launch(target, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void MoveBy(GameObject target, Hashtable args)
|
|
||||||
{
|
|
||||||
args = CleanArgs(args);
|
|
||||||
args["type"] = "move";
|
|
||||||
args["method"] = "by";
|
|
||||||
Launch(target, args);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void ScaleTo(GameObject target, Hashtable args)
|
public static void ScaleTo(GameObject target, Hashtable args)
|
||||||
{
|
{
|
||||||
args = CleanArgs(args);
|
args = CleanArgs(args);
|
||||||
|
|||||||
@@ -131,7 +131,6 @@ namespace UnityEngine
|
|||||||
public static float Clamp01(float v) => Math.Max(0f, Math.Min(1f, v));
|
public static float Clamp01(float v) => Math.Max(0f, Math.Min(1f, v));
|
||||||
public static float Lerp(float a, float b, float t) => a + (b - a) * Clamp01(t);
|
public static float Lerp(float a, float b, float t) => a + (b - a) * Clamp01(t);
|
||||||
public static float SmoothDamp(float cur, float target, ref float vel, float time) { vel = 0; return target; }
|
public static float SmoothDamp(float cur, float target, ref float vel, float time) { vel = 0; return target; }
|
||||||
public static float SmoothDampAngle(float cur, float target, ref float vel, float time) { vel = 0; return target; }
|
|
||||||
public static float Sin(float f) => (float)Math.Sin(f);
|
public static float Sin(float f) => (float)Math.Sin(f);
|
||||||
public static float Cos(float f) => (float)Math.Cos(f);
|
public static float Cos(float f) => (float)Math.Cos(f);
|
||||||
public static float Asin(float f) => (float)Math.Asin(f);
|
public static float Asin(float f) => (float)Math.Asin(f);
|
||||||
|
|||||||
@@ -134,7 +134,6 @@ namespace UnityEngine
|
|||||||
public void SetParent(Transform p, bool worldPositionStays) { }
|
public void SetParent(Transform p, bool worldPositionStays) { }
|
||||||
public void SetSiblingIndex(int i) { }
|
public void SetSiblingIndex(int i) { }
|
||||||
public int GetSiblingIndex() => 0;
|
public int GetSiblingIndex() => 0;
|
||||||
public void SetAsLastSibling() { }
|
|
||||||
public Vector3 lossyScale => Vector3.one;
|
public Vector3 lossyScale => Vector3.one;
|
||||||
public Vector3 up { get => Vector3.up; set { } }
|
public Vector3 up { get => Vector3.up; set { } }
|
||||||
public Vector3 TransformPoint(Vector3 p) => p;
|
public Vector3 TransformPoint(Vector3 p) => p;
|
||||||
|
|||||||
Reference in New Issue
Block a user