Add some art, fix UI anchors

This commit is contained in:
henriquenakashima 2020-09-26 15:57:58 -04:00
parent c31747bc19
commit 0ca4c3276d
22 changed files with 542 additions and 65 deletions

View file

@ -9,13 +9,15 @@ public abstract class BaseCard
protected int cost; protected int cost;
protected CardType type; protected CardType type;
protected string effectText; protected string effectText;
protected string stringId;
public BaseCard(BattleParticipant owner, string displayName, int cost, CardType type, string effectText) { public BaseCard(BattleParticipant owner, string displayName, int cost, CardType type, string effectText, string stringId) {
this.owner = owner; this.owner = owner;
this.displayName = displayName; this.displayName = displayName;
this.cost = cost; this.cost = cost;
this.type = type; this.type = type;
this.effectText = effectText; this.effectText = effectText;
this.stringId = stringId;
} }
public BattleParticipant Owner {get => this.owner;} public BattleParticipant Owner {get => this.owner;}
@ -38,4 +40,8 @@ public abstract class BaseCard
public bool IsPermanent() { public bool IsPermanent() {
return this.type == CardType.Enchantment; return this.type == CardType.Enchantment;
} }
public string StringId {
get => this.stringId;
}
} }

View file

@ -179,8 +179,10 @@ public class BattleController : MonoBehaviour, IBattleEffectApplier, IBattleEffe
this.monsterCardDatabase, mCardIds.Cast<int>().ToArray(), mCardOwners); this.monsterCardDatabase, mCardIds.Cast<int>().ToArray(), mCardOwners);
this.playArea = new PlayArea(); this.playArea = new PlayArea();
this.heroHandPlayability = new HandPlayability<HeroCard>( this.heroHandPlayability = new HandPlayability<HeroCard>(
this.state, this.heroEnergy, TeamChoice.Heroes, this.heroDeck); this.state, this.heroEnergy, TeamChoice.Heroes, this.heroDeck);
this.OnBattleStateChanged += this.heroHandPlayability.NotifyBattleStateChanged;
this.battlePlayerControls.Init( this.battlePlayerControls.Init(
this.heroDeck, this.monsterDeck, this.playArea, this.insightLevel, this.heroDeck, this.monsterDeck, this.playArea, this.insightLevel,
@ -188,9 +190,6 @@ public class BattleController : MonoBehaviour, IBattleEffectApplier, IBattleEffe
this.battlePlayerControls.OnCardUsed += this.NotifyHeroCardUsed; this.battlePlayerControls.OnCardUsed += this.NotifyHeroCardUsed;
this.battlePlayerControls.OnTurnPassed += this.NotifyHeroTurnPassed; this.battlePlayerControls.OnTurnPassed += this.NotifyHeroTurnPassed;
this.insightLevel.OnChanged += this.battlePlayerControls.NotifyInsightLevelChanged; this.insightLevel.OnChanged += this.battlePlayerControls.NotifyInsightLevelChanged;
this.heroDeck.OnHandPileChanged += this.battlePlayerControls.NotifyHeroHandPileChanged;
this.monsterDeck.OnHandPileChanged += this.battlePlayerControls.NotifyMonsterHandPileChanged;
this.OnBattleStateChanged += this.heroHandPlayability.NotifyBattleStateChanged;
} }
private void PositionSprite(TeamChoice team, GameObject sprite, int i) { private void PositionSprite(TeamChoice team, GameObject sprite, int i) {
@ -310,8 +309,8 @@ public class BattleController : MonoBehaviour, IBattleEffectApplier, IBattleEffe
public IEnumerator UseHeroCard(HeroCard card) { public IEnumerator UseHeroCard(HeroCard card) {
this.heroEnergy.PayForCard(card); this.heroEnergy.PayForCard(card);
this.heroDeck.RemoveCardFromHand(card);
yield return card.Use(this, this, battlePlayerControls); yield return card.Use(this, this, battlePlayerControls);
this.heroDeck.RemoveCardFromHand(card);
if (card.IsPermanent()) { if (card.IsPermanent()) {
this.playArea.AddPlayedHeroPermanent(card); this.playArea.AddPlayedHeroPermanent(card);
} else { } else {
@ -325,8 +324,8 @@ public class BattleController : MonoBehaviour, IBattleEffectApplier, IBattleEffe
public IEnumerator UseMonsterCard(MonsterCard card) { public IEnumerator UseMonsterCard(MonsterCard card) {
this.monsterEnergy.PayForCard(card); this.monsterEnergy.PayForCard(card);
this.monsterDeck.RemoveCardFromHand(card);
yield return card.Use(this, this); yield return card.Use(this, this);
this.monsterDeck.RemoveCardFromHand(card);
if (card.IsPermanent()) { if (card.IsPermanent()) {
this.playArea.AddPlayedMonsterPermanent(card); this.playArea.AddPlayedMonsterPermanent(card);
} else { } else {

View file

@ -35,11 +35,11 @@ public class BattlePlayerControls : MonoBehaviour
this.insightLevel = insightLevel; this.insightLevel = insightLevel;
this.heroHandControls = new HandControls<HeroCard>( this.heroHandControls = new HandControls<HeroCard>(
this.uiCanvas, this.cardPrefab, HandControlsPosition.Bottom, TeamChoice.Heroes, heroDeck, this.uiCanvas, this.cardPrefab, HandControlsPosition.Bottom, TeamChoice.Heroes,
int.MaxValue, heroHandPlayability); int.MaxValue, heroHandPlayability);
this.heroHandControls.OnCardClicked += OnHeroCardClicked; this.heroHandControls.OnCardClicked += OnHeroCardClicked;
this.monsterHandControls = new HandControls<MonsterCard>( this.monsterHandControls = new HandControls<MonsterCard>(
this.uiCanvas, this.cardPrefab, HandControlsPosition.Top, TeamChoice.Monsters, 1, null); monsterDeck, this.uiCanvas, this.cardPrefab, HandControlsPosition.Top, TeamChoice.Monsters, 1, null);
this.monsterHandControls.OnCardClicked += OnMonsterCardClicked; this.monsterHandControls.OnCardClicked += OnMonsterCardClicked;
this.cardsInPlayUIs = new Dictionary<BaseCard, GameObject>(); this.cardsInPlayUIs = new Dictionary<BaseCard, GameObject>();
@ -94,14 +94,6 @@ public class BattlePlayerControls : MonoBehaviour
return this.singleTargeting != null && this.singleTargeting.CanTarget(participant); return this.singleTargeting != null && this.singleTargeting.CanTarget(participant);
} }
public void NotifyHeroHandPileChanged() {
this.heroHandControls.SetHand(this.heroDeck.GetHandPile().ToList());
}
public void NotifyMonsterHandPileChanged() {
this.monsterHandControls.SetHand(this.monsterDeck.GetHandPile().ToList());
}
private void NotifyPlayAreaChanged() { private void NotifyPlayAreaChanged() {
DestroyCardsThatLeftPlayArea(); DestroyCardsThatLeftPlayArea();
CreateCardsThatEnteredPlayArea(); CreateCardsThatEnteredPlayArea();

View file

@ -153,9 +153,9 @@ RectTransform:
m_Father: {fileID: 35522592} m_Father: {fileID: 35522592}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 565, y: 320}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &24180901 --- !u!114 &24180901
@ -358,9 +358,9 @@ RectTransform:
m_Father: {fileID: 35522592} m_Father: {fileID: 35522592}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: -570, y: -338.11}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &431798876 --- !u!114 &431798876
@ -493,7 +493,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -467.1, y: -316} m_AnchoredPosition: {x: -467.1, y: -298.4}
m_SizeDelta: {x: 171.60992, y: 30} m_SizeDelta: {x: 171.60992, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &527589755 --- !u!114 &527589755
@ -637,7 +637,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -467.1, y: -316} m_AnchoredPosition: {x: -467.1, y: -295}
m_SizeDelta: {x: 171.60992, y: 30} m_SizeDelta: {x: 171.60992, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1242658820 --- !u!114 &1242658820
@ -793,9 +793,9 @@ RectTransform:
m_Father: {fileID: 35522592} m_Father: {fileID: 35522592}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 480.5, y: -314.1} m_AnchoredPosition: {x: -83.3, y: 19.899994}
m_SizeDelta: {x: 160, y: 30} m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1415908915 --- !u!114 &1415908915
@ -970,7 +970,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -467.1, y: -345.14} m_AnchoredPosition: {x: -467.1, y: -321.3}
m_SizeDelta: {x: 171.60992, y: 30} m_SizeDelta: {x: 171.60992, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1522237122 --- !u!114 &1522237122
@ -1046,9 +1046,9 @@ RectTransform:
m_Father: {fileID: 35522592} m_Father: {fileID: 35522592}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 60} m_AnchoredPosition: {x: 565, y: 380}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1887276864 --- !u!114 &1887276864
@ -1097,9 +1097,9 @@ RectTransform:
m_Father: {fileID: 35522592} m_Father: {fileID: 35522592}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 60} m_AnchoredPosition: {x: 565, y: 380}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2103461258 --- !u!114 &2103461258

View file

@ -5,7 +5,7 @@ using UnityEngine;
public class IronskinDraughtHCard : HeroCard public class IronskinDraughtHCard : HeroCard
{ {
public IronskinDraughtHCard(BattleParticipant owner) public IronskinDraughtHCard(BattleParticipant owner)
: base(owner, HCardId.Cover, "Ironskin Draught", 3, CardType.Skill, : base(owner, HCardId.IronskinDraught, "Ironskin Draught", 3, CardType.Skill,
"Block 6 damage on target ally.") { "Block 6 damage on target ally.") {
} }

View file

@ -30,8 +30,8 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.033333335 time: 0.13333334
value: 0.99937946 value: 0.9790395
inSlope: 0.15729958 inSlope: 0.15729958
outSlope: 0.15729958 outSlope: 0.15729958
tangentMode: 1 tangentMode: 1
@ -39,8 +39,8 @@ AnimationClip:
inWeight: 0.10925299 inWeight: 0.10925299
outWeight: 0.020041859 outWeight: 0.020041859
- serializedVersion: 3 - serializedVersion: 3
time: 0.21666667 time: 0.26666668
value: 0.012205221 value: -0.008134745
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 0 tangentMode: 0
@ -113,8 +113,8 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.033333335 time: 0.13333334
value: 0.99937946 value: 0.9790395
inSlope: 0.15729958 inSlope: 0.15729958
outSlope: 0.15729958 outSlope: 0.15729958
tangentMode: 1 tangentMode: 1
@ -122,8 +122,8 @@ AnimationClip:
inWeight: 0.10925299 inWeight: 0.10925299
outWeight: 0.020041859 outWeight: 0.020041859
- serializedVersion: 3 - serializedVersion: 3
time: 0.21666667 time: 0.26666668
value: 0.012205221 value: -0.008134745
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 0 tangentMode: 0

View file

@ -14,6 +14,7 @@ public class HandControls<BaseCardT> where BaseCardT : BaseCard
public delegate void CardClickedAction(BaseCardT card); public delegate void CardClickedAction(BaseCardT card);
public event CardClickedAction OnCardClicked; public event CardClickedAction OnCardClicked;
private BattleDeck<BaseCardT> deck;
private GameObject uiCanvas; private GameObject uiCanvas;
private GameObject cardPrefab; private GameObject cardPrefab;
private HandControlsPosition position; private HandControlsPosition position;
@ -24,8 +25,9 @@ public class HandControls<BaseCardT> where BaseCardT : BaseCard
private int insightLevel; private int insightLevel;
private HandPlayability<BaseCardT> playability; private HandPlayability<BaseCardT> playability;
public HandControls(GameObject uiCanvas, GameObject cardPrefab, HandControlsPosition position, public HandControls(BattleDeck<BaseCardT> deck, GameObject uiCanvas, GameObject cardPrefab, HandControlsPosition position,
TeamChoice team, int insightLevel, HandPlayability<BaseCardT> playability) { TeamChoice team, int insightLevel, HandPlayability<BaseCardT> playability) {
this.deck = deck;
this.uiCanvas = uiCanvas; this.uiCanvas = uiCanvas;
this.cardPrefab = cardPrefab; this.cardPrefab = cardPrefab;
this.position = position; this.position = position;
@ -33,14 +35,11 @@ public class HandControls<BaseCardT> where BaseCardT : BaseCard
this.insightLevel = insightLevel; this.insightLevel = insightLevel;
this.playability = playability; this.playability = playability;
if (playability != null) { deck.OnHandPileChanged += this.UpdateState;
playability.OnPlayabilityChanged += UpdateCardPlayability;
}
}
public void SetHand(List<BaseCardT> hand) { if (playability != null) {
this.hand = hand; playability.OnPlayabilityChanged += this.UpdateState;
RenderHand(); }
} }
private Vector3 CalculateHandCardPosition(int index, int count) { private Vector3 CalculateHandCardPosition(int index, int count) {
@ -89,6 +88,11 @@ public class HandControls<BaseCardT> where BaseCardT : BaseCard
int cardIndex = i; int cardIndex = i;
cardUI.GetComponent<Button>().onClick.AddListener(delegate {OnCardClicked(card);}); cardUI.GetComponent<Button>().onClick.AddListener(delegate {OnCardClicked(card);});
} }
}
private void UpdateState() {
this.hand = this.deck.GetHandPile().ToList();
RenderHand();
UpdateCardPlayability(); UpdateCardPlayability();
} }

View file

@ -8,7 +8,7 @@ public abstract class HeroCard : BaseCard
public HeroCard(BattleParticipant owner, HCardId id, string displayName, int cost, CardType type, public HeroCard(BattleParticipant owner, HCardId id, string displayName, int cost, CardType type,
string effectText) string effectText)
: base(owner, displayName, cost, type, effectText) { : base(owner, displayName, cost, type, effectText, id.ToString()) {
this.id = id; this.id = id;
} }

View file

@ -8,7 +8,7 @@ public abstract class MonsterCard : BaseCard
public MonsterCard(BattleParticipant owner, MCardId id, string displayName, int cost, CardType type, public MonsterCard(BattleParticipant owner, MCardId id, string displayName, int cost, CardType type,
string effectText) string effectText)
: base(owner, displayName, cost, type, effectText) { : base(owner, displayName, cost, type, effectText, id.ToString()) {
this.id = id; this.id = id;
} }

View file

@ -16,14 +16,23 @@ public class CardUI : MonoBehaviour
this.typeText.text = card.GetDisplayType(); this.typeText.text = card.GetDisplayType();
this.costText.text = "" + card.GetCost(); this.costText.text = "" + card.GetCost();
this.effectText.text = card.GetEffectText(); this.effectText.text = card.GetEffectText();
Sprite sprite = Resources.Load<Sprite>(GetCardArtResourcePath(card));
this.artImage.sprite = sprite;
} }
public void InitHidden() { public void InitHidden() {
Color BROWN = new Color(0.14f, 0.09f, 0.04f);
this.nameText.text = "????"; this.nameText.text = "????";
this.typeText.text = "????"; this.typeText.text = "????";
this.costText.text = "????"; this.costText.text = "????";
this.effectText.text = "????"; this.effectText.text = "????";
this.GetComponent<Image>().color = Color.black; this.GetComponent<Image>().color = BROWN;
this.artImage.color = BROWN;
}
public string GetCardArtResourcePath(BaseCard card) {
return "CardArt/" + (card.Owner.Team == TeamChoice.Heroes? "Hero" : "Monster")
+ card.StringId;
} }
// Start is called before the first frame update // Start is called before the first frame update
@ -41,6 +50,7 @@ public class CardUI : MonoBehaviour
public bool Playable { public bool Playable {
set { set {
this.GetComponent<Image>().color = value ? Color.white : Color.grey; this.GetComponent<Image>().color = value ? Color.white : Color.grey;
this.artImage.color = value ? Color.white : Color.grey;
} }
} }
} }

View file

@ -219,8 +219,6 @@ MonoBehaviour:
costText: {fileID: 6834692580065399204} costText: {fileID: 6834692580065399204}
artImage: {fileID: 8419538927331240723} artImage: {fileID: 8419538927331240723}
effectText: {fileID: 2477879197027808366} effectText: {fileID: 2477879197027808366}
normalMaterial: {fileID: 0}
disabledMaterial: {fileID: 0}
--- !u!1 &2477879197027808364 --- !u!1 &2477879197027808364
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -255,8 +253,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -41.68} m_AnchoredPosition: {x: 0, y: -48.86}
m_SizeDelta: {x: -8, y: -91.37523} m_SizeDelta: {x: -8, y: -105.724106}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2477879197027808367 --- !u!222 &2477879197027808367
CanvasRenderer: CanvasRenderer:
@ -287,7 +285,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 12 m_FontSize: 10
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 1 m_MinSize: 1
@ -333,8 +331,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 1, y: 18} m_AnchoredPosition: {x: -0.11389, y: 11.333}
m_SizeDelta: {x: 112, y: 48} m_SizeDelta: {x: 114.22778, y: 64.87021}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2144677943642500384 --- !u!222 &2144677943642500384
CanvasRenderer: CanvasRenderer:
@ -357,7 +355,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.3207547, g: 0.28062788, b: 0.27082592, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
@ -407,8 +405,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 40.35, y: 49} m_AnchoredPosition: {x: 40.35, y: 50}
m_SizeDelta: {x: -88.7, y: -138} m_SizeDelta: {x: -88.7, y: -136}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7591601241322559362 --- !u!222 &7591601241322559362
CanvasRenderer: CanvasRenderer:
@ -485,8 +483,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -19.96, y: 49} m_AnchoredPosition: {x: -19.96, y: 50}
m_SizeDelta: {x: -47.914093, y: -138} m_SizeDelta: {x: -47.914093, y: -136}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4222329136353876023 --- !u!222 &4222329136353876023
CanvasRenderer: CanvasRenderer:

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e5d26912d906a274288acebf56c87202
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

View file

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 655f379c6a6490648bcf02f92a9f226f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 106 KiB

View file

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 282241fd97e55874fb0ebd5800f3521a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

View file

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: e2d678585c666254dbde68a024391f2b
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

View file

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 21f8f53a18b55a1488db629d1ed0efa5
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

View file

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 4ed77898f206ab9448c42b1e7b738eff
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant: