Browse Source

建议多写重载

pull/95/head
yjm484 11 months ago
parent
commit
b6e19d8f7a
  1. 37
      ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Common.prefab
  2. 2
      ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab
  3. 13
      ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs
  4. 2
      ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Pharmacist.cs
  5. 10
      ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Thief.cs
  6. 150
      ColorlessWorld-2024-4-2/Assets/TextMesh Pro/Resources/Fonts & Materials/OutLineSourceHanSansCN-Normal SDF 1.asset
  7. 453
      ColorlessWorld-2024-4-2/Assets/TextMesh Pro/Resources/Fonts & Materials/SourceHanSansCN-Normal SDF.asset

37
ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Common.prefab

@ -452,23 +452,40 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
cardId: 0 cardId: 0
cost: {fileID: 7944922551607220993} cost: {fileID: 0}
cardIndex: 0 cardIndex: 0
cardDescription: {fileID: 4157078162787977941} cardDescription: {fileID: 0}
cardName: {fileID: 6020088242945090177} cardName: {fileID: 0}
cardType: {fileID: 7547543933361732122} cardType: {fileID: 0}
cardTypeImage: {fileID: 2180037887096685672}
cardImage: {fileID: 2030393732758620615} cardImage: {fileID: 2030393732758620615}
midBorder: {fileID: 0}
topBorder: {fileID: 3893753280325337861}
cardRelease: {fileID: 6139004980639369640}
cardEffectRange: {fileID: 3698325467319520071}
gem: {fileID: 0}
canUse: 1 canUse: 1
fun1Image: {fileID: 0}
fun2Image: {fileID: 0}
fun3Image: {fileID: 0}
successCondition: {fileID: 0}
unsuccessCondition: {fileID: 0}
fun1Val: {fileID: 0}
fun2Val: {fileID: 0}
fun3Val: {fileID: 0}
cardBulletFatherPrefab: {fileID: 0}
smallCardPrefab: {fileID: 3615574969851259241, guid: 2f88da2f5ca2fbc438b76c3faf2ea9db, smallCardPrefab: {fileID: 3615574969851259241, guid: 2f88da2f5ca2fbc438b76c3faf2ea9db,
type: 3} type: 3}
noSmallCard: 0 noSmallCard: 0
noSyncText: 0 noSyncText: 0
isLookCard: 0
conditionList: []
trueFun: {fileID: 0}
trueFunPrefab: {fileID: 0}
nodeColorResultFrame: {fileID: 0}
nodeColorResultImage: {fileID: 0}
castRange: {fileID: 0}
colorConditon: {fileID: 0}
cardDataSummary: {fileID: 0}
animator: {fileID: 0}
borderAnim: {fileID: 0}
currentCost: 0
currentCostType:
tempIsDisposable: 0
--- !u!114 &5545682449418996990 --- !u!114 &5545682449418996990
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

2
ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab

@ -1182,7 +1182,7 @@ MonoBehaviour:
borderAnim: {fileID: 4731515924597847675} borderAnim: {fileID: 4731515924597847675}
currentCost: 0 currentCost: 0
currentCostType: currentCostType:
tempIsDisposable: 1 tempIsDisposable: 0
--- !u!114 &5545682449418996990 --- !u!114 &5545682449418996990
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

13
ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs

@ -900,13 +900,20 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
{ {
if (enemyScript == EnemyScript.Pharmacist) if (enemyScript == EnemyScript.Pharmacist)
{ {
RewardManager.Instance.AddRewardTips(RewardManager.RewardType.potion,1); RewardManager.Instance.AddRewardTips(RewardManager.RewardType.potion,1.ToString());
} }
if (enemyScript == EnemyScript.Thief) if (enemyScript == EnemyScript.Thief)
{ {
Thief thief = (Thief)enemy; Thief thief = (Thief)enemy;
RewardManager.Instance.AddRewardTips(RewardManager.RewardType.money, thief.stolenMoney); if (thief.stolenMoney != 0)
RewardManager.Instance.AddRewardTips(RewardManager.RewardType.forgPoint, thief.stolenForgingPointCount); {
RewardManager.Instance.AddRewardTips(RewardManager.RewardType.money, thief.stolenMoney.ToString());
}
if (thief.stolenForgingPointCount != 0)
{
RewardManager.Instance.AddRewardTips(RewardManager.RewardType.forgPoint, thief.stolenForgingPointCount.ToString());
}
} }
} }
//ËÀÍöÌØÐ§ //ËÀÍöÌØÐ§

2
ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Pharmacist.cs

@ -49,7 +49,7 @@ public class Pharmacist : Enemy
} }
public override void OnDeath() public override void OnDeath()
{ {
RewardManager.Instance.AddRewardTips(RewardManager.RewardType.potion, 1); RewardManager.Instance.AddRewardTips(RewardManager.RewardType.potion, 1.ToString());
} }
public override void ChooseAction() public override void ChooseAction()
{ {

10
ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Thief.cs

@ -30,8 +30,14 @@ public class Thief : Enemy
public override void OnDeath() public override void OnDeath()
{ {
RewardManager.Instance.AddRewardTips(RewardManager.RewardType.money, stolenMoney); if (stolenMoney != 0)
RewardManager.Instance.AddRewardTips(RewardManager.RewardType.forgPoint, stolenForgingPointCount); {
RewardManager.Instance.AddRewardTips(RewardManager.RewardType.money, stolenMoney.ToString());
}
if (stolenForgingPointCount != 0)
{
RewardManager.Instance.AddRewardTips(RewardManager.RewardType.forgPoint, stolenForgingPointCount.ToString());
}
} }
public override void enemyTurnBegin() public override void enemyTurnBegin()

150
ColorlessWorld-2024-4-2/Assets/TextMesh Pro/Resources/Fonts & Materials/OutLineSourceHanSansCN-Normal SDF 1.asset

File diff suppressed because one or more lines are too long

453
ColorlessWorld-2024-4-2/Assets/TextMesh Pro/Resources/Fonts & Materials/SourceHanSansCN-Normal SDF.asset

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save