bump unity sample and package version

cathei · Jun 18, 2024 · d4b41e2 · d4b41e2
1 parent 0331a37
commit d4b41e2
Show file tree

Hide file tree

Showing 15 changed files with 253 additions and 114 deletions.
diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ For C# projects or server, download with [NuGet](https://www.nuget.org/packages?
 
 For Unity projects, add git package from Package Manager.
 ```
-https://github.com/cathei/BakingSheet.git?path=UnityProject/Packages/com.cathei.bakingsheet#v4.1.2
+https://github.com/cathei/BakingSheet.git?path=UnityProject/Packages/com.cathei.bakingsheet#v4.1.3
 ```
 
 Or install it via [OpenUPM](https://openupm.com/packages/com.cathei.bakingsheet/).

diff --git a/UnityProject/Assets/Samples/001 - Define Sheet Container/HeroSheet.cs b/UnityProject/Assets/Samples/001 - Define Sheet Container/HeroSheet.cs
@@ -11,7 +11,7 @@ public class Row : SheetRowArray<Elem>
             public string Name { get; private set; }
 
             public int Strength { get; private set; }
-            public int Inteligence { get; private set; }
+            public int Intelligence { get; private set; }
             public int Vitality { get; private set; }
 
             public Elem GetLevel(int level)

diff --git a/UnityProject/Assets/Samples/002 - Import From Excel/Excel/Heroes.xlsx b/UnityProject/Assets/Samples/002 - Import From Excel/Excel/Heroes.xlsx
diff --git a/UnityProject/Assets/Samples/Extras/AssetPath/Direct/Image01.png.meta b/UnityProject/Assets/Samples/Extras/AssetPath/Direct/Image01.png.meta
diff --git a/UnityProject/Assets/Samples/Extras/AssetPath/Resources/Image01.png.meta b/UnityProject/Assets/Samples/Extras/AssetPath/Resources/Image01.png.meta
diff --git a/UnityProject/Assets/Samples/Extras/ScriptableObject/Heroes.asset b/UnityProject/Assets/Samples/Extras/ScriptableObject/Heroes.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a0cef8d0045424afb8f94c1e6798e096, type: 3}
   m_Name: HERO003
   m_EditorClassIdentifier: 
-  serializedRow: '{"Name":"Assassin","Strength":140,"Inteligence":100,"Vitality":80,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":{"$type":"ref","Value":0}}],"Id":"HERO003"}'
+  serializedRow: '{"Name":"Assassin","Strength":140,"Intelligence":100,"Vitality":80,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":{"$type":"ref","Value":0}}],"Id":"HERO003"}'
   references:
   - {fileID: 6378575936028295508, guid: 2b4bb08db72ef422883f91820c8e50ad, type: 2}
 --- !u!114 &11400000
@@ -44,7 +44,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a0cef8d0045424afb8f94c1e6798e096, type: 3}
   m_Name: HERO002
   m_EditorClassIdentifier: 
-  serializedRow: '{"Name":"Mage","Strength":60,"Inteligence":160,"Vitality":80,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":{"$type":"ref","Value":0}}],"Id":"HERO002"}'
+  serializedRow: '{"Name":"Mage","Strength":60,"Intelligence":160,"Vitality":80,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":{"$type":"ref","Value":0}}],"Id":"HERO002"}'
   references:
   - {fileID: 8757290401692025903, guid: 2b4bb08db72ef422883f91820c8e50ad, type: 2}
 --- !u!114 &7143358573701240944
@@ -59,6 +59,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a0cef8d0045424afb8f94c1e6798e096, type: 3}
   m_Name: HERO001
   m_EditorClassIdentifier: 
-  serializedRow: '{"Name":"Warrior","Strength":100,"Inteligence":80,"Vitality":140,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":{"$type":"ref","Value":0}}],"Id":"HERO001"}'
+  serializedRow: '{"Name":"Warrior","Strength":100,"Intelligence":80,"Vitality":140,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":{"$type":"ref","Value":0}}],"Id":"HERO001"}'
   references:
   - {fileID: -1791245553295392676, guid: 2b4bb08db72ef422883f91820c8e50ad, type: 2}
diff --git a/UnityProject/Assets/StreamingAssets/Excel/Heroes.json b/UnityProject/Assets/StreamingAssets/Excel/Heroes.json
@@ -1 +1 @@
-[{"Name":"Warrior","Strength":100,"Inteligence":80,"Vitality":140,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":"ITEM_LVUP001"}],"Id":"HERO001"},{"Name":"Mage","Strength":60,"Inteligence":160,"Vitality":80,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":"ITEM_LVUP002"}],"Id":"HERO002"},{"Name":"Assassin","Strength":140,"Inteligence":100,"Vitality":80,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":"ITEM_LVUP003"}],"Id":"HERO003"}]
+[{"Name":"Warrior","Strength":100,"Intelligence":80,"Vitality":140,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":"ITEM_LVUP001"}],"Id":"HERO001"},{"Name":"Mage","Strength":60,"Intelligence":160,"Vitality":80,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":"ITEM_LVUP002"}],"Id":"HERO002"},{"Name":"Assassin","Strength":140,"Intelligence":100,"Vitality":80,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":"ITEM_LVUP003"}],"Id":"HERO003"}]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"Name":"Warrior","Strength":100,"Inteligence":80,"Vitality":140,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":"ITEM_LVUP001"}],"Id":"HERO001"},{"Name":"Mage","Strength":60,"Inteligence":160,"Vitality":80,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":"ITEM_LVUP002"}],"Id":"HERO002"},{"Name":"Assassin","Strength":140,"Inteligence":100,"Vitality":80,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":"ITEM_LVUP003"}],"Id":"HERO003"}]
		[{"Name":"Warrior","Strength":100,"Intelligence":80,"Vitality":140,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":"ITEM_LVUP001"}],"Id":"HERO001"},{"Name":"Mage","Strength":60,"Intelligence":160,"Vitality":80,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":"ITEM_LVUP002"}],"Id":"HERO002"},{"Name":"Assassin","Strength":140,"Intelligence":100,"Vitality":80,"Arr":[{"StatMultiplier":1.0,"RequiredExp":0,"RequiredItem":null},{"StatMultiplier":1.2,"RequiredExp":10,"RequiredItem":null},{"StatMultiplier":1.4,"RequiredExp":20,"RequiredItem":null},{"StatMultiplier":1.6,"RequiredExp":40,"RequiredItem":null},{"StatMultiplier":2.0,"RequiredExp":100,"RequiredItem":"ITEM_LVUP003"}],"Id":"HERO003"}]