diff --git a/Server/Model/Game/Data/SignInRewardMonth.cs b/Server/Model/Game/Data/SignInRewardMonth.cs new file mode 100644 index 00000000..05f0fb37 --- /dev/null +++ b/Server/Model/Game/Data/SignInRewardMonth.cs @@ -0,0 +1,30 @@ +using ET; +using MongoDB.Bson.Serialization.Attributes; + +namespace Cal.DataTable +{ + [Config] + public partial class SignInRewardMonthCategory : ACategory + { + public static SignInRewardMonthCategory Instance; + public SignInRewardMonthCategory() + { + Instance = this; + } + } + + public partial class SignInRewardMonth:IConfig + { + public partial class Rewards + { + public int _Id; + public long Count; + } + [BsonId] + public long Id { get; set; } + public ushort Year; + public byte Month; + public byte Times; + public Rewards[] RewardsArr; + } +} diff --git a/Tools/ExcelTool/Excel/SignInRewardMonth.xlsx b/Tools/ExcelTool/Excel/SignInRewardMonth.xlsx new file mode 100644 index 00000000..8c95c687 Binary files /dev/null and b/Tools/ExcelTool/Excel/SignInRewardMonth.xlsx differ diff --git a/Unity/Assets/Download/Config/updateNotice.txt b/Unity/Assets/Download/Config/updateNotice.txt new file mode 100644 index 00000000..233571d5 --- /dev/null +++ b/Unity/Assets/Download/Config/updateNotice.txt @@ -0,0 +1,8 @@ +1.新增签到奖励、累积签到奖励(每月刷新)，没有补签。 +2.仓库增加搜索功能，搜索前需要查看所有页，(进入游戏后至少查看次才能提索)。 +3.星魂背包增加属性搜索功能。 +4.星魂增加跑图功能。 +5.寄售购买增加二次确认。 +6.修复上一场战斗buff没有结束再次进入战斗会降低属性的bug。 +7.修复竟技场退出战斗的bug. +8.修复竟技场技能cd错误的bug. \ No newline at end of file diff --git a/Unity/Assets/Download/Config/updateNotice.txt.meta b/Unity/Assets/Download/Config/updateNotice.txt.meta new file mode 100644 index 00000000..7de1aa7d --- /dev/null +++ b/Unity/Assets/Download/Config/updateNotice.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 51dc5db574bd19b4b8f07d5e8344b4d8 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Download/DataTable/SignInRewardMonth.json b/Unity/Assets/Download/DataTable/SignInRewardMonth.json new file mode 100644 index 00000000..093a7c49 --- /dev/null +++ b/Unity/Assets/Download/DataTable/SignInRewardMonth.json @@ -0,0 +1 @@ +eNq11L1qw0AQBODe4HcI2+aK29XfSV1I5SJNkiYIYQwWiYrIIDukCH73nOxApjhYiLKdhO7EB8NMu1617D27my/aDntqLi/00u8masRLfH44jKc3agpHz8N7f6SmcvTYf+6m/fFuiqfaePNEDT0Nr+NmvH653Ln9OUWOtpv51+yDxMv3h48xXuCz686duwIEAaIAuFgiKNOCDAWZIpDwR4F4zus0IEdAngSUphkUCCgUwJIMsjJLC0oUlIpgQQYSfgGFR0GFgiopqExDCAgICsCkCDUKakVgUAT2AIgvKUCwzIBxDZkVgEURGOeQRRFYFIFxDjk9h7VpCDiHnCsAiyIw7iEXisCiCDiHnJ7DuR+GIeAccqUJTKqAg8hBI5h0AReR04s4z4RdDoKTKF4TWLRBcBSFNYJBHQRHUdKjOG+lYQw4ipJpAos6CM6i5Brh3+vQrVffadSRMw== \ No newline at end of file diff --git a/Unity/Assets/Download/DataTable/SignInRewardMonth.json.meta b/Unity/Assets/Download/DataTable/SignInRewardMonth.json.meta new file mode 100644 index 00000000..4d2d6207 --- /dev/null +++ b/Unity/Assets/Download/DataTable/SignInRewardMonth.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1a31c513002d3d941a256ab609340798 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Hotfix/Logic/Behaviour/Game/Handler/Other/M2C_SendActiveInfoHandler.cs.meta b/Unity/Assets/Hotfix/Logic/Behaviour/Game/Handler/Other/M2C_SendActiveInfoHandler.cs.meta new file mode 100644 index 00000000..acb83352 --- /dev/null +++ b/Unity/Assets/Hotfix/Logic/Behaviour/Game/Handler/Other/M2C_SendActiveInfoHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 097876efd0e05274784cc8c3c8cdb117 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Hotfix/Logic/Behaviour/Game/System/ActiveComponentSystem.cs.meta b/Unity/Assets/Hotfix/Logic/Behaviour/Game/System/ActiveComponentSystem.cs.meta new file mode 100644 index 00000000..cef6ede3 --- /dev/null +++ b/Unity/Assets/Hotfix/Logic/Behaviour/Game/System/ActiveComponentSystem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 77d2588e31de0bc4fa211135074597fd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Hotfix/Logic/Model/Game/Common/OpenUI/EventType.OpenNoticeUI.cs b/Unity/Assets/Hotfix/Logic/Model/Game/Common/OpenUI/EventType.OpenNoticeUI.cs new file mode 100644 index 00000000..c0194cc5 --- /dev/null +++ b/Unity/Assets/Hotfix/Logic/Model/Game/Common/OpenUI/EventType.OpenNoticeUI.cs @@ -0,0 +1,7 @@ +namespace ET.EventType +{ + public struct OpenNoticeUI + { + public Scene zoneScene; + } +} \ No newline at end of file diff --git a/Unity/Assets/Hotfix/Logic/Model/Game/Common/OpenUI/EventType.OpenNoticeUI.cs.meta b/Unity/Assets/Hotfix/Logic/Model/Game/Common/OpenUI/EventType.OpenNoticeUI.cs.meta new file mode 100644 index 00000000..96d0b622 --- /dev/null +++ b/Unity/Assets/Hotfix/Logic/Model/Game/Common/OpenUI/EventType.OpenNoticeUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3200c7d1dcd555d46871ba0dd0d26029 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Hotfix/Logic/Model/Game/Entity/Other.meta b/Unity/Assets/Hotfix/Logic/Model/Game/Entity/Other.meta new file mode 100644 index 00000000..252d75a6 --- /dev/null +++ b/Unity/Assets/Hotfix/Logic/Model/Game/Entity/Other.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa552efb0786a5b4eb005483694db759 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Hotfix/Logic/Model/Game/Entity/Other/ActiveComponent.cs.meta b/Unity/Assets/Hotfix/Logic/Model/Game/Entity/Other/ActiveComponent.cs.meta new file mode 100644 index 00000000..aeedbaef --- /dev/null +++ b/Unity/Assets/Hotfix/Logic/Model/Game/Entity/Other/ActiveComponent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 560108d91a09b4c4f9bdc1c6e127cb97 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Hotfix/Logic/Model/Generate/Data/SignInRewardMonthCategory.Custom.cs.meta b/Unity/Assets/Hotfix/Logic/Model/Generate/Data/SignInRewardMonthCategory.Custom.cs.meta new file mode 100644 index 00000000..926951fd --- /dev/null +++ b/Unity/Assets/Hotfix/Logic/Model/Generate/Data/SignInRewardMonthCategory.Custom.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 71eb4b7db9af397468280b04a5412f4f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Hotfix/Logic/Model/Module/Data/DataTable/SignInRewardMonth.cs b/Unity/Assets/Hotfix/Logic/Model/Module/Data/DataTable/SignInRewardMonth.cs new file mode 100644 index 00000000..05f0fb37 --- /dev/null +++ b/Unity/Assets/Hotfix/Logic/Model/Module/Data/DataTable/SignInRewardMonth.cs @@ -0,0 +1,30 @@ +using ET; +using MongoDB.Bson.Serialization.Attributes; + +namespace Cal.DataTable +{ + [Config] + public partial class SignInRewardMonthCategory : ACategory + { + public static SignInRewardMonthCategory Instance; + public SignInRewardMonthCategory() + { + Instance = this; + } + } + + public partial class SignInRewardMonth:IConfig + { + public partial class Rewards + { + public int _Id; + public long Count; + } + [BsonId] + public long Id { get; set; } + public ushort Year; + public byte Month; + public byte Times; + public Rewards[] RewardsArr; + } +} diff --git a/Unity/Assets/Hotfix/Logic/Model/Module/Data/DataTable/SignInRewardMonth.cs.meta b/Unity/Assets/Hotfix/Logic/Model/Module/Data/DataTable/SignInRewardMonth.cs.meta new file mode 100644 index 00000000..ea908d91 --- /dev/null +++ b/Unity/Assets/Hotfix/Logic/Model/Module/Data/DataTable/SignInRewardMonth.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: aea1bca5c0a0fa74a8aac1d742b25449 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/HotfixView/UI/NoticeUI/OpenNoticeUIEvent.cs b/Unity/Assets/HotfixView/UI/NoticeUI/OpenNoticeUIEvent.cs new file mode 100644 index 00000000..337ebab3 --- /dev/null +++ b/Unity/Assets/HotfixView/UI/NoticeUI/OpenNoticeUIEvent.cs @@ -0,0 +1,18 @@ +using ET.EventType; +using System; +using System.Collections.Generic; + +namespace ET +{ + public class OpenNoticeUIEvent : AEvent + { + public override async ETTask Run(ET.EventType.OpenNoticeUI args) + { + NoticeUI ui =await FUIHelper.Open(args.zoneScene, FUIPackage.Dialog_NoticeUI, WindowPos.Center, (_ui)=> + { + //ui.m_Effect.Play(); + }); + await ETTask.CompletedTask; + } + } +} diff --git a/Unity/Assets/HotfixView/UI/NoticeUI/OpenNoticeUIEvent.cs.meta b/Unity/Assets/HotfixView/UI/NoticeUI/OpenNoticeUIEvent.cs.meta new file mode 100644 index 00000000..16cb8a32 --- /dev/null +++ b/Unity/Assets/HotfixView/UI/NoticeUI/OpenNoticeUIEvent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d78f6f9f110c8a547b9710a3845f913f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: