Skip to content

Commit

Permalink
all
Browse files Browse the repository at this point in the history
  • Loading branch information
lyt0628 committed Oct 10, 2024
1 parent 502fa38 commit 6f716a5
Show file tree
Hide file tree
Showing 22 changed files with 1,094 additions and 1,291 deletions.
2 changes: 1 addition & 1 deletion .vs/Assembly-CSharp.csproj.dtbcache.json

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
485 changes: 180 additions & 305 deletions .vs/learn-u3d/v17/DocumentLayout.backup.json

Large diffs are not rendered by default.

490 changes: 180 additions & 310 deletions .vs/learn-u3d/v17/DocumentLayout.json

Large diffs are not rendered by default.

Binary file added .vs/learn-u3d/v17/HierarchyCache.v1.txt
Binary file not shown.
29 changes: 29 additions & 0 deletions 2
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@



using UnityEngine;

namespace QS.API
{
public abstract class AbstractItem : IItem
{
public virtual IItemModel Model { protected get; set; }

public string Name => Model.Name;

public string UUID => Model.UUID;

public string Description => Model.Description;

public ItemType Type => Model.Type;

public string SubType => Model.SubType;

public Sprite sprite => Model.SpriteImg;

public abstract bool Usable => Model.Usable;
public virtual void Use() { }
public abstract bool Consumable => Model.Comsumable;

}
}
5 changes: 3 additions & 2 deletions Assets/Script/Api/Iventory/AbstractItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ public abstract class AbstractItem : IItem

public string SubType => Model.SubType;

public Sprite sprite => Model.SpriteImg;
public Sprite SpriteImg => Model.SpriteImg;

public bool Usable => Model.Usable;
public virtual void Use() => Model.Use();
public void Use() => Model.Use();
public bool Consumable => Model.Consumable;

public GameObject Prefab => Model.Prefab;
}
}
1 change: 1 addition & 0 deletions Assets/Script/Api/Iventory/AbstractItemModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public abstract class AbstractItemModel : IItemModel
public abstract bool Usable { get; }
public abstract bool Consumable { get; }
public abstract Sprite SpriteImg { get; }
public abstract GameObject Prefab { get; }

public abstract void Use();
}
Expand Down
4 changes: 3 additions & 1 deletion Assets/Script/Api/Iventory/IItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ public interface IItem
void Use();
bool Consumable { get; }

Sprite sprite { get; }
Sprite SpriteImg { get; }

GameObject Prefab { get; }

}
}
2 changes: 2 additions & 0 deletions Assets/Script/Api/Iventory/IItemModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,7 @@ public interface IItemModel

Sprite SpriteImg { get; }

GameObject Prefab { get; }

}
}
2 changes: 2 additions & 0 deletions Assets/Script/Trunk/Item/RealityPiece.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ private class RealityPieceModel : IItemModel

public bool Consumable => false;

public GameObject Prefab => throw new System.NotImplementedException();

public void Use()
{
}
Expand Down
1 change: 1 addition & 0 deletions Assets/Script/Trunk/Item/RealityPieceModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public class RealityPieceModel : IItemModel

public bool Consumable => false;

public GameObject Prefab => throw new System.NotImplementedException();

public void Use()
{
Expand Down
Empty file.
11 changes: 11 additions & 0 deletions Assets/Script/Trunk/MountLocation.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/Script/Trunk/UI/ImageView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ protected override GameObject CreateWidget()

var cur = GameManager.Instance.GetManager<InventoryManager>()
.Inventory.GetItemEntry(GameConstants.REALITY_PIECE);
image.sprite = cur.sprite;
image.sprite = cur.SpriteImg;
return ret;
}
public override void OnInit()
Expand Down
5 changes: 4 additions & 1 deletion UserSettings/EditorUserSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ EditorUserSettings:
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
flags: 0
RecentlyUsedSceneGuid-1:
value: 5007505304530c590b570e2716250e44421649787f797e347e2d1e32b7b3626e
value: 53095652520d5c0a580f5b741173074413151e78787e23612f701937e1b26161
flags: 0
RecentlyUsedSceneGuid-2:
value: 5007505304530c590b570e2716250e44421649787f797e347e2d1e32b7b3626e
flags: 0
RecentlyUsedSceneGuid-3:
value: 0600075706540b025d575e2743745d444f4e4f292d7a7e63742d4963b7b06268
flags: 0
vcSharedLogLevel:
Expand Down
Loading

0 comments on commit 6f716a5

Please sign in to comment.