diff --git a/Forest/Assets/Config/Data/stringcfg_stringconfig.json b/Forest/Assets/Config/Data/stringcfg_stringconfig.json index bc32a88..f19bad2 100644 --- a/Forest/Assets/Config/Data/stringcfg_stringconfig.json +++ b/Forest/Assets/Config/Data/stringcfg_stringconfig.json @@ -92,14 +92,14 @@ { "ID": 116, "Key": "Score_Rate", - "Value": "请给我们评分吧!", + "Value": "请给我们评分吧!", "Value_En": "Please rate us!" }, { "ID": 117, "Key": "Score_Like", - "Value": "喜欢“小木匠”吗?", - "Value_En": "Do you like \"Avery\"?" + "Value": "喜欢“森旅”吗?", + "Value_En": "Do you like \"Forest Journey\"?" }, { "ID": 118, @@ -116,7 +116,7 @@ { "ID": 120, "Key": "Tip_Confirm", - "Value": "确定退出账户吗?", + "Value": "确定退出账户吗?", "Value_En": "Sure you want to quit your account?" }, { @@ -134,8 +134,8 @@ { "ID": 123, "Key": "Agreement_Link", - "Value": "服务协议\n\n详情链接", - "Value_En": "Service Agreements\n\nDetailed Link" + "Value": "服务协议\n详情链接", + "Value_En": "Service Agreements\nDetailed Link" }, { "ID": 124, @@ -152,31 +152,31 @@ { "ID": 126, "Key": "Shop_Own", - "Value": "拥有金币:{0}", + "Value": "拥有金币:{0}", "Value_En": "Own Coins: {0}" }, { "ID": 127, "Key": "Prop_Undo", - "Value": "是否使用金币撤回移动?", + "Value": "是否使用金币撤回移动?", "Value_En": "Use coins to undo a move?" }, { "ID": 128, "Key": "Prop_AddTime", - "Value": "是否使用金币增加30秒?", + "Value": "是否使用金币增加30秒?", "Value_En": "Use coins to add 30 seconds?" }, { "ID": 129, "Key": "Prop_OpenHole", - "Value": "是否使用金币打孔?", + "Value": "是否使用金币打孔?", "Value_En": "Use coins to open a new hole?" }, { "ID": 130, "Key": "Tip_Reset_Confirm", - "Value": "确定重置关卡吗?", + "Value": "确定重置关卡吗?", "Value_En": "Sure you want to reset the level?" }, { @@ -224,7 +224,7 @@ { "ID": 138, "Key": "AD_WinProp", - "Value": "观看视频赢得随机道具并开启关卡!", + "Value": "观看视频赢得随机道具并开启关卡!", "Value_En": "Watch the video to win random props and open the level!" }, { @@ -272,7 +272,7 @@ { "ID": 146, "Key": "Tip_Sync_Data", - "Value": "云端:金币 {0} / 关卡{1}\n本地:金币 {2} / 关卡{3}", + "Value": "云端: 金币 {0} / 关卡{1}\n本地: 金币 {2} / 关卡{3}", "Value_En": "Cloud: Gold {0} / level {1}\nLocal: Gold {2} / level {3}" }, { @@ -326,19 +326,19 @@ { "ID": 155, "Key": "Login_Fail", - "Value": "登录失败!\n请检查网络或重试", + "Value": "登录失败!\n请检查网络或重试", "Value_En": "Login Failure!\nPlease check the network or retry" }, { "ID": 156, "Key": "Save_Nonet", - "Value": "当前无网络连接!", + "Value": "当前无网络连接!", "Value_En": "No internet connection!" }, { "ID": 157, "Key": "Save_Success", - "Value": "当前已与 {0} 账号同步至最新,是否确定退出账号?", + "Value": "当前已与 {0} 账号同步至最新,是否确定退出账号?", "Value_En": "Synced with {0} account, Confirm log out?" } ] \ No newline at end of file diff --git a/Forest/Assets/Scripts/Gameplay/DataTable/ADCfg.meta b/Forest/Assets/Scripts/Gameplay/DataTable/ADCfg.meta deleted file mode 100644 index c46b32a..0000000 --- a/Forest/Assets/Scripts/Gameplay/DataTable/ADCfg.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5a2455ba7220ce244b211d37defc6b07 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Scripts/Gameplay/DataTable/PropCfg.meta b/Forest/Assets/Scripts/Gameplay/DataTable/PropCfg.meta deleted file mode 100644 index 67d5c92..0000000 --- a/Forest/Assets/Scripts/Gameplay/DataTable/PropCfg.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9d4c2e8c65c785b498334a231398d8db -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Tool/Luban/.cache.meta b/Tool/Luban/.cache.meta index e9dcacc..c409719 100644 --- a/Tool/Luban/.cache.meta +++ b/Tool/Luban/.cache.meta @@ -1,20 +1,20 @@ -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/ad_adconfig.json,9BB1353E825B5AAF725BD1F57B1F230,1082,1718684155006 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1718684155006 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,85E9C2AD8896A3441BF987DAC8ADBE0,7239,1718684155006 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1718684155006 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1718684155006 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1718684155006 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1718684155006 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1718684155006 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1718684155006 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1718684155006 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1718684155006 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1718684155006 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1718684155006 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,9F517A5B82261C51F83097C8AC1519,1963,1718684155006 -/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__beans__.xlsx,FBF2DDFEE7FB39A727F2C3ACA7E228E,11821,1716280035769 -/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__enums__.xlsx,9966F8C0BCDDD717667BB975C9862F80,12651,1716280035769 -/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__tables__.xlsx,AF34F79C23336475A93B5ACEE819B6A,10886,1716280035769 -/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/AD.xlsx,3B47B6CD7D8EC7CFFBC64B4F43A88C3,10025,1716280035769 -/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/Prop.xlsx,518794514E27F37BF9D0B6BA712533A5,10050,1718684128280 -/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/StringConfig.xlsx,3B533D5CAD26A4C6BF2AD5306889DA5,13069,1717052808415 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/ad_adconfig.json,9BB1353E825B5AAF725BD1F57B1F230,1082,1718878128193 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1718878128193 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,1155F8B7229A0EDC2722EB85C264B,7215,1718878128193 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1718878128192 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1718878128193 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1718878128192 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1718878128193 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1718878128193 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1718878128193 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1718878128192 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1718878128193 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1718878128192 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1718878128193 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,9F517A5B82261C51F83097C8AC1519,1963,1718878128192 +/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__beans__.xlsx,FBF2DDFEE7FB39A727F2C3ACA7E228E,11821,1718685908733 +/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__enums__.xlsx,9966F8C0BCDDD717667BB975C9862F80,12651,1718685908733 +/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__tables__.xlsx,AF34F79C23336475A93B5ACEE819B6A,10886,1718685908734 +/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/AD.xlsx,3B47B6CD7D8EC7CFFBC64B4F43A88C3,10025,1718685908733 +/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/Prop.xlsx,518794514E27F37BF9D0B6BA712533A5,10050,1718685908733 +/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/StringConfig.xlsx,730DAD8B4CBAA3BE3E9A953A2B90,12880,1718878112539 diff --git a/Tool/Luban/Datas/StringConfig.xlsx b/Tool/Luban/Datas/StringConfig.xlsx index 6d8fb3e..aa6668d 100644 Binary files a/Tool/Luban/Datas/StringConfig.xlsx and b/Tool/Luban/Datas/StringConfig.xlsx differ