Skip to content

Commit

Permalink
1.0.17 新增F8Framework.F8ExcelDataClass和F8Framework.Launcher程序集,配置表生成的F…
Browse files Browse the repository at this point in the history
…8Framework.F8ExcelDataClass可用于HybridCLR热更,增加导表后脚本编译完成,再打包AB步骤,重新加载C#域后,AssetDatabase.Refresh需要增加delayCall延迟执行,完善热更文档,F8Framework.Tests程序集增加宏定义不参与打包
  • Loading branch information
TippingGame committed Jun 20, 2024
1 parent 028f969 commit e058144
Show file tree
Hide file tree
Showing 57 changed files with 694 additions and 288 deletions.
2 changes: 1 addition & 1 deletion AssetMap/Resources/AssetBundleMap.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"2852":{"AbName":"audio/2852","AssetPath":["assets/assetbundles/audio/2852.wav"],"Version":"1.0.0","Size":"5328","MD5":"13b86da06a7db926e88afc306c3081a9","Package":"","Updated":""},"button1":{"AbName":"audio/button1","AssetPath":["assets/assetbundles/audio/button1.wav"],"Version":"1.0.0","Size":"15567","MD5":"a818c3ecef6f0dad489e3351a3a09485","Package":"","Updated":""},"\u5927\u98CE-WQ20070525":{"AbName":"audio/\u5927\u98CE-wq20070525","AssetPath":["assets/assetbundles/audio/\u5927\u98CE-wq20070525.mp3"],"Version":"1.0.0","Size":"559199","MD5":"0f826f53d47e04a0a5f095fe3814ea25","Package":"","Updated":""},"\u7B1B\u5B501-mcx20070508":{"AbName":"audio/\u7B1B\u5B501-mcx20070508","AssetPath":["assets/assetbundles/audio/\u7B1B\u5B501-mcx20070508.wav"],"Version":"1.0.0","Size":"9759","MD5":"eba3243db88378c73f230c78262c8425","Package":"","Updated":""},"HotUpdate":{"AbName":"code/hotupdate","AssetPath":["assets/assetbundles/code/hotupdate.bytes"],"Version":"1.0.0","Size":"4132","MD5":"0ad08eba0551c7341a0c416bc4527437","Package":"","Updated":""},"00029-3980031510mat":{"AbName":"materials/00029-3980031510mat","AssetPath":["assets/assetbundles/materials/00029-3980031510mat.mat"],"Version":"1.0.0","Size":"148099","MD5":"04c0074f0f84c290f51ea433fc33a70b","Package":"","Updated":""},"00031-1829375853mat":{"AbName":"materials/00031-1829375853mat","AssetPath":["assets/assetbundles/materials/00031-1829375853mat.mat"],"Version":"1.0.0","Size":"343362","MD5":"36711d5c4122c0a0d136f5e171532554","Package":"","Updated":""},"uibg":{"AbName":"package_0/uibg","AssetPath":["assets/assetbundles/package_0/uibg.mat"],"Version":"1.0.0","Size":"19073","MD5":"f26d78dd64848ba3974746e86d0f221d","Package":"0","Updated":""},"uibg 1":{"AbName":"package_1/uibg 1","AssetPath":["assets/assetbundles/package_1/uibg 1.mat"],"Version":"1.0.0","Size":"19061","MD5":"00668a40d64cf36bc99c455f6887822b","Package":"1","Updated":""},"Cube":{"AbName":"prefabs/pf2/cube2sdfwe","AssetPath":["assets/assetbundles/prefabs/cube.prefab"],"Version":"1.0.0","Size":"45910","MD5":"eb3bd9afd239cce91e12d0d78c7b05a7","Package":"","Updated":""},"Cube1":{"AbName":"prefabs/pf2/cube2sdfwe","AssetPath":["assets/assetbundles/prefabs/cube1.prefab"],"Version":"1.0.0","Size":"45910","MD5":"eb3bd9afd239cce91e12d0d78c7b05a7","Package":"","Updated":""},"Cube2":{"AbName":"prefabs/pf2/cube2sdfwe","AssetPath":["assets/assetbundles/prefabs/cube2.prefab"],"Version":"1.0.0","Size":"45910","MD5":"eb3bd9afd239cce91e12d0d78c7b05a7","Package":"","Updated":""},"00023-3589759801":{"AbName":"textures/00023-3589759801","AssetPath":["assets/assetbundles/textures/00023-3589759801.png"],"Version":"1.0.0","Size":"48503","MD5":"12c0064ab5941707445888ff526af03d","Package":"","Updated":""},"00029-3980031510":{"AbName":"textures/00029-3980031510","AssetPath":["assets/assetbundles/textures/00029-3980031510.png"],"Version":"1.0.0","Size":"109897","MD5":"3e3841a65b3af8dd1588145ec9be01cc","Package":"","Updated":""},"00031-1829375853":{"AbName":"textures/00031-1829375853","AssetPath":["assets/assetbundles/textures/00031-1829375853.png"],"Version":"1.0.0","Size":"305231","MD5":"9680d5ff52fa854e97c6a9355f78d943","Package":"","Updated":""},"UIPanel":{"AbName":"ui/uipanel","AssetPath":["assets/assetbundles/ui/uipanel.prefab"],"Version":"1.0.0","Size":"24650","MD5":"1c91d9f7aff2ffd31cb31c3e37173ff7","Package":"","Updated":""},"LocalizedStrings":{"AbName":"config/binconfigdata/localizedstrings","AssetPath":["assets/assetbundles/config/binconfigdata/localizedstrings.bytes"],"Version":"1.0.0","Size":"4229","MD5":"dc9248fedf7eae92be50faf813e2aeb5","Package":"","Updated":""},"Sheet1":{"AbName":"config/binconfigdata/sheet1","AssetPath":["assets/assetbundles/config/binconfigdata/sheet1.bytes"],"Version":"1.0.0","Size":"1873","MD5":"568c0ae8f2707d57d61cd5920d25a34b","Package":"","Updated":""},"Sheet2":{"AbName":"config/binconfigdata/sheet2","AssetPath":["assets/assetbundles/config/binconfigdata/sheet2.bytes"],"Version":"1.0.0","Size":"1948","MD5":"b98fccd188e1241e9a1b5e478c3f3612","Package":"","Updated":""},"Cube1fsdf":{"AbName":"prefabs/pf2/cube2sdfwe","AssetPath":["assets/assetbundles/prefabs/pf2/cube1fsdf.prefab"],"Version":"1.0.0","Size":"45910","MD5":"eb3bd9afd239cce91e12d0d78c7b05a7","Package":"","Updated":""},"Cube2sdfwe":{"AbName":"prefabs/pf2/cube2sdfwe","AssetPath":["assets/assetbundles/prefabs/pf2/cube2sdfwe.prefab"],"Version":"1.0.0","Size":"45910","MD5":"eb3bd9afd239cce91e12d0d78c7b05a7","Package":"","Updated":""},"Cubeljk":{"AbName":"prefabs/pf2/cube2sdfwe","AssetPath":["assets/assetbundles/prefabs/pf2/cubeljk.prefab"],"Version":"1.0.0","Size":"45910","MD5":"eb3bd9afd239cce91e12d0d78c7b05a7","Package":"","Updated":""},"Audio":{"AbName":"audio","AssetPath":["assets/assetbundles/audio/2852.wav","assets/assetbundles/audio/button1.wav","assets/assetbundles/audio/\u5927\u98CE-wq20070525.mp3","assets/assetbundles/audio/\u7B1B\u5B501-mcx20070508.wav"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"Code":{"AbName":"code","AssetPath":["assets/assetbundles/code/hotupdate.bytes"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"Config":{"AbName":"config","AssetPath":[],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"Materials":{"AbName":"materials","AssetPath":["assets/assetbundles/materials/00029-3980031510mat.mat","assets/assetbundles/materials/00031-1829375853mat.mat"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"Package_0":{"AbName":"package_0","AssetPath":["assets/assetbundles/package_0/uibg.mat"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"Package_1":{"AbName":"package_1","AssetPath":["assets/assetbundles/package_1/uibg 1.mat"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"Prefabs":{"AbName":"prefabs","AssetPath":["assets/assetbundles/prefabs/cube.prefab","assets/assetbundles/prefabs/cube1.prefab","assets/assetbundles/prefabs/cube2.prefab"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"Textures":{"AbName":"textures","AssetPath":["assets/assetbundles/textures/00023-3589759801.png","assets/assetbundles/textures/00029-3980031510.png","assets/assetbundles/textures/00031-1829375853.png"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"UI":{"AbName":"ui","AssetPath":["assets/assetbundles/ui/uipanel.prefab"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"BinConfigData":{"AbName":"config/binconfigdata","AssetPath":["assets/assetbundles/config/binconfigdata/localizedstrings.bytes","assets/assetbundles/config/binconfigdata/sheet1.bytes","assets/assetbundles/config/binconfigdata/sheet2.bytes"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"pf2":{"AbName":"prefabs/pf2","AssetPath":["assets/assetbundles/prefabs/pf2/cube1fsdf.prefab","assets/assetbundles/prefabs/pf2/cube2sdfwe.prefab","assets/assetbundles/prefabs/pf2/cubeljk.prefab"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"Windows":{"AbName":"Windows","AssetPath":[],"Version":"1.0.0","Size":"2239","MD5":"ac9a288bb32e1db47f16f08ba8df12ce","Package":"","Updated":""}}
{"2852":{"AbName":"audio/2852","AssetPath":["assets/assetbundles/audio/2852.wav"],"Version":"1.0.0","Size":"5328","MD5":"13b86da06a7db926e88afc306c3081a9","Package":"","Updated":""},"button1":{"AbName":"audio/button1","AssetPath":["assets/assetbundles/audio/button1.wav"],"Version":"1.0.0","Size":"15567","MD5":"a818c3ecef6f0dad489e3351a3a09485","Package":"","Updated":""},"\u5927\u98CE-WQ20070525":{"AbName":"audio/\u5927\u98CE-wq20070525","AssetPath":["assets/assetbundles/audio/\u5927\u98CE-wq20070525.mp3"],"Version":"1.0.0","Size":"559199","MD5":"0f826f53d47e04a0a5f095fe3814ea25","Package":"","Updated":""},"\u7B1B\u5B501-mcx20070508":{"AbName":"audio/\u7B1B\u5B501-mcx20070508","AssetPath":["assets/assetbundles/audio/\u7B1B\u5B501-mcx20070508.wav"],"Version":"1.0.0","Size":"9759","MD5":"eba3243db88378c73f230c78262c8425","Package":"","Updated":""},"F8Framework.F8ExcelDataClass":{"AbName":"code/f8framework.f8exceldataclass","AssetPath":["assets/assetbundles/code/f8framework.f8exceldataclass.bytes"],"Version":"1.0.0","Size":"7078","MD5":"3a09bde3081206fcababacdb9d7bbce6","Package":"","Updated":""},"F8Framework.Launcher":{"AbName":"code/f8framework.launcher","AssetPath":["assets/assetbundles/code/f8framework.launcher.bytes"],"Version":"1.0.0","Size":"6016","MD5":"e6b4a42e4d337f5da62a0522eb94407b","Package":"","Updated":""},"00029-3980031510mat":{"AbName":"materials/00029-3980031510mat","AssetPath":["assets/assetbundles/materials/00029-3980031510mat.mat"],"Version":"1.0.0","Size":"148099","MD5":"04c0074f0f84c290f51ea433fc33a70b","Package":"","Updated":""},"00031-1829375853mat":{"AbName":"materials/00031-1829375853mat","AssetPath":["assets/assetbundles/materials/00031-1829375853mat.mat"],"Version":"1.0.0","Size":"343362","MD5":"36711d5c4122c0a0d136f5e171532554","Package":"","Updated":""},"uibg":{"AbName":"package_0/uibg","AssetPath":["assets/assetbundles/package_0/uibg.mat"],"Version":"1.0.0","Size":"19073","MD5":"f26d78dd64848ba3974746e86d0f221d","Package":"0","Updated":""},"uibg 1":{"AbName":"package_1/uibg 1","AssetPath":["assets/assetbundles/package_1/uibg 1.mat"],"Version":"1.0.0","Size":"19061","MD5":"00668a40d64cf36bc99c455f6887822b","Package":"1","Updated":""},"Cube":{"AbName":"prefabs/cube","AssetPath":["assets/assetbundles/prefabs/cube.prefab"],"Version":"1.0.0","Size":"3451","MD5":"0bc24c2bd3837acb51ded6864a768e71","Package":"","Updated":""},"Cube1":{"AbName":"prefabs/cube1","AssetPath":["assets/assetbundles/prefabs/cube1.prefab"],"Version":"1.0.0","Size":"3487","MD5":"974da21064a3e2adc97e7980854534ae","Package":"","Updated":""},"Cube2":{"AbName":"prefabs/cube2","AssetPath":["assets/assetbundles/prefabs/cube2.prefab"],"Version":"1.0.0","Size":"43676","MD5":"a3a0f0d78c559fac7de9bd120f423be3","Package":"","Updated":""},"00023-3589759801":{"AbName":"textures/00023-3589759801","AssetPath":["assets/assetbundles/textures/00023-3589759801.png"],"Version":"1.0.0","Size":"48503","MD5":"12c0064ab5941707445888ff526af03d","Package":"","Updated":""},"00029-3980031510":{"AbName":"textures/00029-3980031510","AssetPath":["assets/assetbundles/textures/00029-3980031510.png"],"Version":"1.0.0","Size":"109897","MD5":"3e3841a65b3af8dd1588145ec9be01cc","Package":"","Updated":""},"00031-1829375853":{"AbName":"textures/00031-1829375853","AssetPath":["assets/assetbundles/textures/00031-1829375853.png"],"Version":"1.0.0","Size":"305231","MD5":"9680d5ff52fa854e97c6a9355f78d943","Package":"","Updated":""},"UIPanel":{"AbName":"ui/uipanel","AssetPath":["assets/assetbundles/ui/uipanel.prefab"],"Version":"1.0.0","Size":"24667","MD5":"cacfa47a722c73f6f84e209953a427d4","Package":"","Updated":""},"LocalizedStrings":{"AbName":"config/binconfigdata/localizedstrings","AssetPath":["assets/assetbundles/config/binconfigdata/localizedstrings.bytes"],"Version":"1.0.0","Size":"4352","MD5":"cac53dbbdf08cbdd30090fd749482b70","Package":"","Updated":""},"Sheet1":{"AbName":"config/binconfigdata/sheet1","AssetPath":["assets/assetbundles/config/binconfigdata/sheet1.bytes"],"Version":"1.0.0","Size":"1878","MD5":"fa03774274bd31ad6016853b0c0f6f7c","Package":"","Updated":""},"Sheet2":{"AbName":"config/binconfigdata/sheet2","AssetPath":["assets/assetbundles/config/binconfigdata/sheet2.bytes"],"Version":"1.0.0","Size":"1948","MD5":"713d3ee718ebb22fa6286a75f288823a","Package":"","Updated":""},"Cube1fsdf":{"AbName":"prefabs/pf2/cube1fsdf","AssetPath":["assets/assetbundles/prefabs/pf2/cube1fsdf.prefab"],"Version":"1.0.0","Size":"3441","MD5":"8521162c9bec5ea8904efb35abf5a931","Package":"","Updated":""},"Cube2sdfwe":{"AbName":"prefabs/pf2/cube2sdfwe","AssetPath":["assets/assetbundles/prefabs/pf2/cube2sdfwe.prefab"],"Version":"1.0.0","Size":"43493","MD5":"5f18e02b5cced466e08198ddf9aeb945","Package":"","Updated":""},"Cubeljk":{"AbName":"prefabs/pf2/cubeljk","AssetPath":["assets/assetbundles/prefabs/pf2/cubeljk.prefab"],"Version":"1.0.0","Size":"3446","MD5":"12d60bad95667f89fb5d96443aa8ee23","Package":"","Updated":""},"Audio":{"AbName":"audio","AssetPath":["assets/assetbundles/audio/2852.wav","assets/assetbundles/audio/button1.wav","assets/assetbundles/audio/\u5927\u98CE-wq20070525.mp3","assets/assetbundles/audio/\u7B1B\u5B501-mcx20070508.wav"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"Code":{"AbName":"code","AssetPath":["assets/assetbundles/code/f8framework.f8exceldataclass.bytes","assets/assetbundles/code/f8framework.launcher.bytes"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"Config":{"AbName":"config","AssetPath":[],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"Materials":{"AbName":"materials","AssetPath":["assets/assetbundles/materials/00029-3980031510mat.mat","assets/assetbundles/materials/00031-1829375853mat.mat"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"Package_0":{"AbName":"package_0","AssetPath":["assets/assetbundles/package_0/uibg.mat"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"Package_1":{"AbName":"package_1","AssetPath":["assets/assetbundles/package_1/uibg 1.mat"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"Prefabs":{"AbName":"prefabs","AssetPath":["assets/assetbundles/prefabs/cube.prefab","assets/assetbundles/prefabs/cube1.prefab","assets/assetbundles/prefabs/cube2.prefab"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"Textures":{"AbName":"textures","AssetPath":["assets/assetbundles/textures/00023-3589759801.png","assets/assetbundles/textures/00029-3980031510.png","assets/assetbundles/textures/00031-1829375853.png"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"UI":{"AbName":"ui","AssetPath":["assets/assetbundles/ui/uipanel.prefab"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"BinConfigData":{"AbName":"config/binconfigdata","AssetPath":["assets/assetbundles/config/binconfigdata/localizedstrings.bytes","assets/assetbundles/config/binconfigdata/sheet1.bytes","assets/assetbundles/config/binconfigdata/sheet2.bytes"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"pf2":{"AbName":"prefabs/pf2","AssetPath":["assets/assetbundles/prefabs/pf2/cube1fsdf.prefab","assets/assetbundles/prefabs/pf2/cube2sdfwe.prefab","assets/assetbundles/prefabs/pf2/cubeljk.prefab"],"Version":"1.0.0","Size":"","MD5":"","Package":"","Updated":""},"Windows":{"AbName":"Windows","AssetPath":[],"Version":"1.0.0","Size":"2455","MD5":"99881a0c284a02417e52a31bde2177b8","Package":"","Updated":""}}
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [1.0.17] - 2024-06-21
1.新增F8Framework.F8ExcelDataClass和F8Framework.Launcher程序集
2.配置表生成的F8Framework.F8ExcelDataClass可用于HybridCLR热更
3.增加导表后脚本编译完成,再打包AB步骤
4.重新加载C#域后,AssetDatabase.Refresh需要增加delayCall延迟执行
5.完善热更文档
6.F8Framework.Tests程序集增加宏定义不参与打包

## [1.0.16] - 2024-05-26
1.优化资产管理代码
2.优化UI界面传入参数
Expand Down
3 changes: 0 additions & 3 deletions ConfigData/F8DataManager/F8DataManager.asmref

This file was deleted.

4 changes: 2 additions & 2 deletions ConfigData/F8DataManager/F8DataManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
using System.IO;
using F8Framework.F8ExcelDataClass;
using LitJson;
using F8Framework.Core;

namespace F8Framework.Core
namespace F8Framework.F8ExcelDataClass
{
public class F8DataManager : ModuleSingleton<F8DataManager>, IModule
{
Expand Down
2 changes: 1 addition & 1 deletion ConfigData/F8DataManager/F8DataManager.cs.meta

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

Binary file not shown.
33 changes: 0 additions & 33 deletions ConfigData/F8ExcelDataClass/F8Framework.F8ExcelDataClass.dll.meta

This file was deleted.

23 changes: 23 additions & 0 deletions ConfigData/F8ExcelDataClass/LocalizedStrings.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*Auto create
Don't Edit it*/

using System;
using System.Collections.Generic;

namespace F8Framework.F8ExcelDataClass
{
[Serializable]
public class LocalizedStringsItem
{
public int id;
public string TextID;
public string ChineseSimplified;
public string English;
}

[Serializable]
public class LocalizedStrings
{
public Dictionary<int, LocalizedStringsItem> Dict = new Dictionary<int, LocalizedStringsItem>();
}
}
11 changes: 11 additions & 0 deletions ConfigData/F8ExcelDataClass/LocalizedStrings.cs.meta

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

26 changes: 26 additions & 0 deletions ConfigData/F8ExcelDataClass/Sheet1.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*Auto create
Don't Edit it*/

using System;
using System.Collections.Generic;

namespace F8Framework.F8ExcelDataClass
{
[Serializable]
public class Sheet1Item
{
public int id;
public string name;
public float[] price;
public int fddfd;
public float aaasd;
public int[] dfdfd;
public string[] gggaa;
}

[Serializable]
public class Sheet1
{
public Dictionary<int, Sheet1Item> Dict = new Dictionary<int, Sheet1Item>();
}
}
11 changes: 11 additions & 0 deletions ConfigData/F8ExcelDataClass/Sheet1.cs.meta

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

26 changes: 26 additions & 0 deletions ConfigData/F8ExcelDataClass/Sheet2.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*Auto create
Don't Edit it*/

using System;
using System.Collections.Generic;

namespace F8Framework.F8ExcelDataClass
{
[Serializable]
public class Sheet2Item
{
public int id;
public string name;
public float[] price;
public int fddfd;
public float aaasd;
public int[] dfdfd;
public string[] gggaa;
}

[Serializable]
public class Sheet2
{
public Dictionary<int, Sheet2Item> Dict = new Dictionary<int, Sheet2Item>();
}
}
11 changes: 11 additions & 0 deletions ConfigData/F8ExcelDataClass/Sheet2.cs.meta

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

16 changes: 16 additions & 0 deletions ConfigData/F8Framework.F8ExcelDataClass.asmdef
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "F8Framework.F8ExcelDataClass",
"references": [
"F8Framework.Core",
"LitJson"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": false,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}

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

Loading

0 comments on commit e058144

Please sign in to comment.