From efb64ce7bc4b5ef4aec2f1b1469b51d9f7ba3cd6 Mon Sep 17 00:00:00 2001 From: BobSong <605277374@qq.com> Date: Thu, 28 Aug 2025 00:20:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Commands/Base.meta | 8 - Assets/Scripts/Commands/Base/CommandArgs.cs | 89 ---------- .../Scripts/Commands/Base/CommandArgs.cs.meta | 3 - .../Scripts/Commands/Base/CommandArgsRule.cs | 9 - .../Commands/Base/CommandArgsRule.cs.meta | 3 - Assets/Scripts/Commands/Base/ICommand.cs | 29 ---- Assets/Scripts/Commands/Base/ICommand.cs.meta | 3 - Assets/Scripts/Commands/Command.cs | 158 ------------------ Assets/Scripts/Commands/Command.cs.meta | 3 - Assets/Scripts/Commands/Task.meta | 3 - Assets/Scripts/Commands/Task/DefRunner.cs | 69 -------- .../Scripts/Commands/Task/DefRunner.cs.meta | 3 - Assets/Scripts/Commands/Task/LoadSceneTask.cs | 64 ------- .../Commands/Task/LoadSceneTask.cs.meta | 3 - Assets/Scripts/Commands/Task/RunFunTask.cs | 21 --- .../Scripts/Commands/Task/RunFunTask.cs.meta | 3 - Assets/Scripts/Commands/Task/TimeStopTask.cs | 45 ----- .../Commands/Task/TimeStopTask.cs.meta | 3 - Assets/Scripts/Fishing2/Entity.meta | 3 + Assets/Scripts/Fishing2/Entity/Data.meta | 3 + .../Fishing2/{Model => Entity/Data}/Map.meta | 0 .../{Model => Entity/Data}/Map/Map.cs | 0 .../{Model => Entity/Data}/Map/Map.cs.meta | 0 .../Fishing2/{Model => Entity/Data}/Move.meta | 0 .../Data}/Move/MoveComponent.cs | 0 .../Data}/Move/MoveComponent.cs.meta | 0 .../Fishing2/{Model => Entity/Data}/Unit.meta | 0 .../{Model => Entity/Data}/Unit/Gear.meta | 0 .../Data}/Unit/Gear/Child.meta | 0 .../Unit/Gear/Child/GearBaitComponent.cs | 0 .../Unit/Gear/Child/GearBaitComponent.cs.meta | 0 .../Unit/Gear/Child/GearBobberComponent.cs | 0 .../Gear/Child/GearBobberComponent.cs.meta | 0 .../Unit/Gear/Child/GearHookComponent.cs | 0 .../Unit/Gear/Child/GearHookComponent.cs.meta | 0 .../Unit/Gear/Child/GearLineComponent.cs | 0 .../Unit/Gear/Child/GearLineComponent.cs.meta | 0 .../Unit/Gear/Child/GearLureComponent.cs | 0 .../Unit/Gear/Child/GearLureComponent.cs.meta | 0 .../Unit/Gear/Child/GearReelComponent.cs | 0 .../Unit/Gear/Child/GearReelComponent.cs.meta | 0 .../Data}/Unit/Gear/Child/GearRodComponent.cs | 0 .../Unit/Gear/Child/GearRodComponent.cs.meta | 0 .../Unit/Gear/Child/GearWeightComponent.cs | 0 .../Gear/Child/GearWeightComponent.cs.meta | 0 .../Data}/Unit/Gear/UnitGearComponent.cs | 0 .../Data}/Unit/Gear/UnitGearComponent.cs.meta | 0 .../{Model => Entity/Data}/Unit/Parts.meta | 0 .../Unit/Parts/UnitFlashlightComponent.cs | 0 .../Parts/UnitFlashlightComponent.cs.meta | 0 .../{Model => Entity/Data}/Unit/Skin.meta | 0 .../Data}/Unit/Skin/UnitSkinComponent.cs | 0 .../Data}/Unit/Skin/UnitSkinComponent.cs.meta | 0 .../{Model => Entity/Data}/Unit/Unit.cs | 0 .../{Model => Entity/Data}/Unit/Unit.cs.meta | 0 .../{Model => Entity/Data}/Unit/UnitBasic.cs | 0 .../Data}/Unit/UnitBasic.cs.meta | 0 .../Data}/Unit/UnitEventType.cs | 0 .../Data}/Unit/UnitEventType.cs.meta | 0 .../Data}/Unit/UnitStateArgs.cs | 0 .../Data}/Unit/UnitStateArgs.cs.meta | 0 Assets/Scripts/Fishing2/Entity/View.meta | 3 + .../Fishing2/{Views => Entity/View}/Unit.meta | 0 .../View}/Unit/UnitHUDComponent.cs | 0 .../View}/Unit/UnitHUDComponent.cs.meta | 0 .../View}/Unit/UnitUnityComponent.cs | 0 .../View}/Unit/UnitUnityComponent.cs.meta | 0 Assets/Scripts/Fishing2/Event.meta | 3 + .../Fishing2/{ => Event}/LoginFinish.cs | 0 .../Fishing2/{ => Event}/LoginFinish.cs.meta | 0 Assets/Scripts/Fishing2/Model.meta | 4 +- Assets/Scripts/{ => Fishing2/Model}/Data.meta | 0 .../{ => Fishing2/Model}/Data/TabListData.cs | 0 .../Model}/Data/TabListData.cs.meta | 0 Assets/Scripts/{ => Fishing2/Model}/Def.meta | 0 .../{ => Fishing2/Model}/Def/GameDef.cs | 0 .../{ => Fishing2/Model}/Def/GameDef.cs.meta | 0 .../{ => Fishing2/Model}/Def/InputDef.cs | 0 .../{ => Fishing2/Model}/Def/InputDef.cs.meta | 0 .../Model}/Def/SelectorRodSetting.cs | 0 .../Model}/Def/SelectorRodSetting.cs.meta | 0 .../{ => Fishing2/Model}/Def/States.cs | 0 .../{ => Fishing2/Model}/Def/States.cs.meta | 0 .../Scripts/{ => Fishing2/Model}/Def/UIDef.cs | 0 .../{ => Fishing2/Model}/Def/UIDef.cs.meta | 0 .../Fishing2/Model/MapManageComponent.cs | 9 + .../Fishing2/Model/MapManageComponent.cs.meta | 3 + Assets/Scripts/Fishing2/Model/Module.meta | 3 + .../Fishing2/Model/Module/Numeric.meta | 3 + .../{ => Module}/Numeric/NumericComponent.cs | 0 .../Numeric/NumericComponent.cs.meta | 0 .../Model/{ => Module}/Numeric/NumericType.cs | 0 .../{ => Module}/Numeric/NumericType.cs.meta | 0 .../Fishing2/Model/Module/ObjectWait.meta | 3 + .../Model/Module/ObjectWait/ObjectWait.cs | 144 ++++++++++++++++ .../Module/ObjectWait/ObjectWait.cs.meta | 3 + Assets/Scripts/{ => Fishing2/Model}/Net.meta | 0 .../{ => Fishing2/Model}/Net/Entity.meta | 0 .../Entity/AuthenticationSelectComponent.cs | 0 .../AuthenticationSelectComponent.cs.meta | 0 .../{ => Fishing2/Model}/Net/Entity/JWT.meta | 0 .../Net/Entity/JWT/JWTParseComponent.cs | 0 .../Net/Entity/JWT/JWTParseComponent.cs.meta | 0 .../{ => Fishing2/Model}/Net/Hotfix.meta | 0 .../{ => Fishing2/Model}/Net/Hotfix/.DS_Store | Bin .../Model}/Net/Hotfix/Handler.meta | 0 .../Hotfix/Handler/G2C_RepeatLoginHandler.cs | 0 .../Handler/G2C_RepeatLoginHandler.cs.meta | 0 .../Model}/Net/Hotfix/System.meta | 0 .../AuthenticationSelectComponentSystem.cs | 0 ...uthenticationSelectComponentSystem.cs.meta | 0 .../Model}/Net/Hotfix/System/JWT.meta | 0 .../System/JWT/JWTParseComponentSystem.cs | 0 .../JWT/JWTParseComponentSystem.cs.meta | 0 .../Model}/Net/Hotfix/System/SessionHelper.cs | 0 .../Net/Hotfix/System/SessionHelper.cs.meta | 0 .../Model}/Net/MessageHandler.meta | 0 .../MessageHandler/Chat2C_MessageHandler.cs | 0 .../Chat2C_MessageHandler.cs.meta | 0 .../MessageHandler/Map2C_ChangeMapHandler.cs | 24 +++ .../Map2C_ChangeMapHandler.cs.meta | 3 + .../Scripts/{ => Fishing2/Model}/Net/Net.cs | 0 .../{ => Fishing2/Model}/Net/Net.cs.meta | 0 .../{ => Fishing2/Model}/Net/NetExtends.cs | 0 .../Model}/Net/NetExtends.cs.meta | 0 Assets/Scripts/Fishing2/Model/Numeric.meta | 3 - Assets/Scripts/Fishing2/OnSceneCreate_Init.cs | 19 +++ .../Fishing2/OnSceneCreate_Init.cs.meta | 3 + .../Fishing2/System/Data/Map/MapHelper.cs | 38 ----- Assets/Scripts/Fishing2/System/Helper.meta | 3 + .../Fishing2/System/Helper/MapHelper.cs | 38 +++++ .../{Data/Map => Helper}/MapHelper.cs.meta | 0 Assets/Scripts/Fishing2/Views.meta | 3 - .../Generate/NetworkProtocol/MapMessage.cs | 26 +++ .../Generate/NetworkProtocol/OuterMessage.cs | 24 --- .../Generate/NetworkProtocol/OuterOpcode.cs | 22 +-- Assets/Scripts/Models.meta | 3 - Assets/Scripts/Models/RoleModel.cs | 25 --- Assets/Scripts/Models/RoleModel.cs.meta | 3 - Assets/Scripts/PhysicsTools.zip | Bin 26601 -> 0 bytes Assets/Scripts/PhysicsTools.zip.meta | 7 - Assets/Scripts/Startup/Init.cs | 2 - Assets/Scripts/Steamworks.NET.meta | 5 - Assets/Scripts/ThirdParty.meta | 3 + .../FirstPersonController.meta | 0 .../FirstPersonController.cs | 0 .../FirstPersonController.cs.meta | 0 .../FirstPersonController/MouseLook.cs | 0 .../FirstPersonController/MouseLook.cs.meta | 0 .../FirstPersonController/Utility.meta | 0 .../Utility/CurveControlledBob.cs | 0 .../Utility/CurveControlledBob.cs.meta | 0 .../FirstPersonController/Utility/FOVKick.cs | 0 .../Utility/FOVKick.cs.meta | 0 .../Utility/LerpControlledBob.cs | 0 .../Utility/LerpControlledBob.cs.meta | 0 .../{ => ThirdParty}/PhysicsTools.meta | 0 .../{ => ThirdParty}/PhysicsTools/Bezier.cs | 0 .../PhysicsTools/Bezier.cs.meta | 0 .../PhysicsTools/BoneSegment.cs | 0 .../PhysicsTools/BoneSegment.cs.meta | 0 .../PhysicsTools/ControlPoint.cs | 0 .../PhysicsTools/ControlPoint.cs.meta | 0 .../{ => ThirdParty}/PhysicsTools/Joint.cs | 0 .../PhysicsTools/Joint.cs.meta | 0 .../PhysicsTools/JointProperties.cs | 0 .../PhysicsTools/JointProperties.cs.meta | 0 .../{ => ThirdParty}/PhysicsTools/LinkMesh.cs | 0 .../PhysicsTools/LinkMesh.cs.meta | 0 .../{ => ThirdParty}/PhysicsTools/PosOri.cs | 0 .../PhysicsTools/PosOri.cs.meta | 0 .../{ => ThirdParty}/PhysicsTools/Rope.cs | 0 .../PhysicsTools/Rope.cs.meta | 0 .../PhysicsTools/SCapsulePos.cs | 0 .../PhysicsTools/SCapsulePos.cs.meta | 0 .../{ => ThirdParty}/PhysicsTools/Segment.cs | 0 .../PhysicsTools/Segment.cs.meta | 0 .../PhysicsTools/SegmentProperties.cs | 0 .../PhysicsTools/SegmentProperties.cs.meta | 0 .../PhysicsTools/SegmentPropertiesBase.cs | 0 .../SegmentPropertiesBase.cs.meta | 0 .../PhysicsTools/SegmentPropertiesBox.cs | 0 .../PhysicsTools/SegmentPropertiesBox.cs.meta | 0 .../PhysicsTools/SegmentPropertiesCylinder.cs | 0 .../SegmentPropertiesCylinder.cs.meta | 0 .../SerializedSoftJointLimitSpring.cs | 0 .../SerializedSoftJointLimitSpring.cs.meta | 0 .../{ => ThirdParty}/PhysicsTools/Utility.cs | 0 .../PhysicsTools/Utility.cs.meta | 0 .../{ => ThirdParty}/PhysicsTools/Winch.cs | 0 .../PhysicsTools/Winch.cs.meta | 0 .../Steamworks.NET.meta} | 2 +- .../Steamworks.NET/SteamManager.cs | 0 .../Steamworks.NET/SteamManager.cs.meta | 0 Assets/Scripts/UI/Loading/Loading.cs | 62 +++---- 195 files changed, 344 insertions(+), 677 deletions(-) delete mode 100644 Assets/Scripts/Commands/Base.meta delete mode 100644 Assets/Scripts/Commands/Base/CommandArgs.cs delete mode 100644 Assets/Scripts/Commands/Base/CommandArgs.cs.meta delete mode 100644 Assets/Scripts/Commands/Base/CommandArgsRule.cs delete mode 100644 Assets/Scripts/Commands/Base/CommandArgsRule.cs.meta delete mode 100644 Assets/Scripts/Commands/Base/ICommand.cs delete mode 100644 Assets/Scripts/Commands/Base/ICommand.cs.meta delete mode 100644 Assets/Scripts/Commands/Command.cs delete mode 100644 Assets/Scripts/Commands/Command.cs.meta delete mode 100644 Assets/Scripts/Commands/Task.meta delete mode 100644 Assets/Scripts/Commands/Task/DefRunner.cs delete mode 100644 Assets/Scripts/Commands/Task/DefRunner.cs.meta delete mode 100644 Assets/Scripts/Commands/Task/LoadSceneTask.cs delete mode 100644 Assets/Scripts/Commands/Task/LoadSceneTask.cs.meta delete mode 100644 Assets/Scripts/Commands/Task/RunFunTask.cs delete mode 100644 Assets/Scripts/Commands/Task/RunFunTask.cs.meta delete mode 100644 Assets/Scripts/Commands/Task/TimeStopTask.cs delete mode 100644 Assets/Scripts/Commands/Task/TimeStopTask.cs.meta create mode 100644 Assets/Scripts/Fishing2/Entity.meta create mode 100644 Assets/Scripts/Fishing2/Entity/Data.meta rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Map.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Map/Map.cs (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Map/Map.cs.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Move.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Move/MoveComponent.cs (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Move/MoveComponent.cs.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/Child.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/Child/GearBaitComponent.cs (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/Child/GearBaitComponent.cs.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/Child/GearBobberComponent.cs (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/Child/GearBobberComponent.cs.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/Child/GearHookComponent.cs (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/Child/GearHookComponent.cs.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/Child/GearLineComponent.cs (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/Child/GearLineComponent.cs.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/Child/GearLureComponent.cs (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/Child/GearLureComponent.cs.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/Child/GearReelComponent.cs (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/Child/GearReelComponent.cs.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/Child/GearRodComponent.cs (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/Child/GearRodComponent.cs.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/Child/GearWeightComponent.cs (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/Child/GearWeightComponent.cs.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/UnitGearComponent.cs (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Gear/UnitGearComponent.cs.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Parts.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Parts/UnitFlashlightComponent.cs (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Parts/UnitFlashlightComponent.cs.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Skin.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Skin/UnitSkinComponent.cs (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Skin/UnitSkinComponent.cs.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Unit.cs (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/Unit.cs.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/UnitBasic.cs (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/UnitBasic.cs.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/UnitEventType.cs (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/UnitEventType.cs.meta (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/UnitStateArgs.cs (100%) rename Assets/Scripts/Fishing2/{Model => Entity/Data}/Unit/UnitStateArgs.cs.meta (100%) create mode 100644 Assets/Scripts/Fishing2/Entity/View.meta rename Assets/Scripts/Fishing2/{Views => Entity/View}/Unit.meta (100%) rename Assets/Scripts/Fishing2/{Views => Entity/View}/Unit/UnitHUDComponent.cs (100%) rename Assets/Scripts/Fishing2/{Views => Entity/View}/Unit/UnitHUDComponent.cs.meta (100%) rename Assets/Scripts/Fishing2/{Views => Entity/View}/Unit/UnitUnityComponent.cs (100%) rename Assets/Scripts/Fishing2/{Views => Entity/View}/Unit/UnitUnityComponent.cs.meta (100%) create mode 100644 Assets/Scripts/Fishing2/Event.meta rename Assets/Scripts/Fishing2/{ => Event}/LoginFinish.cs (100%) rename Assets/Scripts/Fishing2/{ => Event}/LoginFinish.cs.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Data.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Data/TabListData.cs (100%) rename Assets/Scripts/{ => Fishing2/Model}/Data/TabListData.cs.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Def.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Def/GameDef.cs (100%) rename Assets/Scripts/{ => Fishing2/Model}/Def/GameDef.cs.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Def/InputDef.cs (100%) rename Assets/Scripts/{ => Fishing2/Model}/Def/InputDef.cs.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Def/SelectorRodSetting.cs (100%) rename Assets/Scripts/{ => Fishing2/Model}/Def/SelectorRodSetting.cs.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Def/States.cs (100%) rename Assets/Scripts/{ => Fishing2/Model}/Def/States.cs.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Def/UIDef.cs (100%) rename Assets/Scripts/{ => Fishing2/Model}/Def/UIDef.cs.meta (100%) create mode 100644 Assets/Scripts/Fishing2/Model/MapManageComponent.cs create mode 100644 Assets/Scripts/Fishing2/Model/MapManageComponent.cs.meta create mode 100644 Assets/Scripts/Fishing2/Model/Module.meta create mode 100644 Assets/Scripts/Fishing2/Model/Module/Numeric.meta rename Assets/Scripts/Fishing2/Model/{ => Module}/Numeric/NumericComponent.cs (100%) rename Assets/Scripts/Fishing2/Model/{ => Module}/Numeric/NumericComponent.cs.meta (100%) rename Assets/Scripts/Fishing2/Model/{ => Module}/Numeric/NumericType.cs (100%) rename Assets/Scripts/Fishing2/Model/{ => Module}/Numeric/NumericType.cs.meta (100%) create mode 100644 Assets/Scripts/Fishing2/Model/Module/ObjectWait.meta create mode 100644 Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs create mode 100644 Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs.meta rename Assets/Scripts/{ => Fishing2/Model}/Net.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Entity.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Entity/AuthenticationSelectComponent.cs (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Entity/AuthenticationSelectComponent.cs.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Entity/JWT.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Entity/JWT/JWTParseComponent.cs (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Entity/JWT/JWTParseComponent.cs.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Hotfix.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Hotfix/.DS_Store (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Hotfix/Handler.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Hotfix/System.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Hotfix/System/JWT.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Hotfix/System/SessionHelper.cs (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Hotfix/System/SessionHelper.cs.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/MessageHandler.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/MessageHandler/Chat2C_MessageHandler.cs (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/MessageHandler/Chat2C_MessageHandler.cs.meta (100%) create mode 100644 Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs create mode 100644 Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs.meta rename Assets/Scripts/{ => Fishing2/Model}/Net/Net.cs (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/Net.cs.meta (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/NetExtends.cs (100%) rename Assets/Scripts/{ => Fishing2/Model}/Net/NetExtends.cs.meta (100%) delete mode 100644 Assets/Scripts/Fishing2/Model/Numeric.meta create mode 100644 Assets/Scripts/Fishing2/OnSceneCreate_Init.cs create mode 100644 Assets/Scripts/Fishing2/OnSceneCreate_Init.cs.meta delete mode 100644 Assets/Scripts/Fishing2/System/Data/Map/MapHelper.cs create mode 100644 Assets/Scripts/Fishing2/System/Helper.meta create mode 100644 Assets/Scripts/Fishing2/System/Helper/MapHelper.cs rename Assets/Scripts/Fishing2/System/{Data/Map => Helper}/MapHelper.cs.meta (100%) delete mode 100644 Assets/Scripts/Fishing2/Views.meta delete mode 100644 Assets/Scripts/Models.meta delete mode 100644 Assets/Scripts/Models/RoleModel.cs delete mode 100644 Assets/Scripts/Models/RoleModel.cs.meta delete mode 100644 Assets/Scripts/PhysicsTools.zip delete mode 100644 Assets/Scripts/PhysicsTools.zip.meta delete mode 100644 Assets/Scripts/Steamworks.NET.meta create mode 100644 Assets/Scripts/ThirdParty.meta rename Assets/Scripts/{ => ThirdParty}/FirstPersonController.meta (100%) rename Assets/Scripts/{ => ThirdParty}/FirstPersonController/FirstPersonController.cs (100%) rename Assets/Scripts/{ => ThirdParty}/FirstPersonController/FirstPersonController.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/FirstPersonController/MouseLook.cs (100%) rename Assets/Scripts/{ => ThirdParty}/FirstPersonController/MouseLook.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/FirstPersonController/Utility.meta (100%) rename Assets/Scripts/{ => ThirdParty}/FirstPersonController/Utility/CurveControlledBob.cs (100%) rename Assets/Scripts/{ => ThirdParty}/FirstPersonController/Utility/CurveControlledBob.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/FirstPersonController/Utility/FOVKick.cs (100%) rename Assets/Scripts/{ => ThirdParty}/FirstPersonController/Utility/FOVKick.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/FirstPersonController/Utility/LerpControlledBob.cs (100%) rename Assets/Scripts/{ => ThirdParty}/FirstPersonController/Utility/LerpControlledBob.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/Bezier.cs (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/Bezier.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/BoneSegment.cs (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/BoneSegment.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/ControlPoint.cs (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/ControlPoint.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/Joint.cs (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/Joint.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/JointProperties.cs (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/JointProperties.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/LinkMesh.cs (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/LinkMesh.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/PosOri.cs (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/PosOri.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/Rope.cs (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/Rope.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/SCapsulePos.cs (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/SCapsulePos.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/Segment.cs (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/Segment.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/SegmentProperties.cs (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/SegmentProperties.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/SegmentPropertiesBase.cs (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/SegmentPropertiesBase.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/SegmentPropertiesBox.cs (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/SegmentPropertiesBox.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/SegmentPropertiesCylinder.cs (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/SegmentPropertiesCylinder.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/SerializedSoftJointLimitSpring.cs (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/SerializedSoftJointLimitSpring.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/Utility.cs (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/Utility.cs.meta (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/Winch.cs (100%) rename Assets/Scripts/{ => ThirdParty}/PhysicsTools/Winch.cs.meta (100%) rename Assets/Scripts/{Commands.meta => ThirdParty/Steamworks.NET.meta} (77%) rename Assets/Scripts/{ => ThirdParty}/Steamworks.NET/SteamManager.cs (100%) rename Assets/Scripts/{ => ThirdParty}/Steamworks.NET/SteamManager.cs.meta (100%) diff --git a/Assets/Scripts/Commands/Base.meta b/Assets/Scripts/Commands/Base.meta deleted file mode 100644 index 38ccc02de..000000000 --- a/Assets/Scripts/Commands/Base.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b1ed97690b508a34eb0403c02ede8823 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Commands/Base/CommandArgs.cs b/Assets/Scripts/Commands/Base/CommandArgs.cs deleted file mode 100644 index e6964a7d9..000000000 --- a/Assets/Scripts/Commands/Base/CommandArgs.cs +++ /dev/null @@ -1,89 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -namespace NBF -{ - public struct CommandArgsStruct - { - public override bool Equals(object obj) - { - return obj is CommandArgsStruct other && Equals(other); - } - - public override int GetHashCode() - { - return (Value != null ? Value.GetHashCode() : 0); - } - - private string Value { get; set; } - - public CommandArgsStruct(string val = "") - { - Value = val; - } - - public bool Equals(CommandArgsStruct other) - { - return Value == other.Value; - } - - public static bool operator ==(CommandArgsStruct a, CommandArgsStruct b) => a.Value == b.Value; - public static bool operator !=(CommandArgsStruct a, CommandArgsStruct b) => a.Value != b.Value; - - public override string ToString() => Value; - - public int ToInt() - { - return int.TryParse(Value, out var i) ? i : 0; - } - - public float ToFloat() - { - return float.TryParse(Value, out var i) ? i : 0; - } - - public T[] ToArr(string split = ",") where T : IConvertible - { - var arr = Value.Split(split); - return arr.Select(a => (T)Convert.ChangeType(a, typeof(T))).ToArray(); - } - } - - public class CommandArgs - { - public string Command { get; private set; } - - private readonly List _args = new List(); - - - public CommandArgs(string str) - { - _args.Clear(); - var args = str.Split(' '); - for (var i = 0; i < args.Length; i++) - { - if (i == 0) - { - Command = args[i]; - } - else - { - _args.Add(new CommandArgsStruct(args[i])); - } - } - } - - public CommandArgsStruct this[int index] => Get(index); - - public CommandArgsStruct Get(int index) - { - if (index < _args.Count && index >= 0) - { - return _args[index]; - } - - return new CommandArgsStruct(); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Commands/Base/CommandArgs.cs.meta b/Assets/Scripts/Commands/Base/CommandArgs.cs.meta deleted file mode 100644 index e11c454d5..000000000 --- a/Assets/Scripts/Commands/Base/CommandArgs.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: b0a16abd7e144cbf8d1f9fbce9abbedc -timeCreated: 1687225439 \ No newline at end of file diff --git a/Assets/Scripts/Commands/Base/CommandArgsRule.cs b/Assets/Scripts/Commands/Base/CommandArgsRule.cs deleted file mode 100644 index ea4206eca..000000000 --- a/Assets/Scripts/Commands/Base/CommandArgsRule.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace NBF -{ - public struct CommandArgsRule - { - public string Sample; - - public string Tips; - } -} \ No newline at end of file diff --git a/Assets/Scripts/Commands/Base/CommandArgsRule.cs.meta b/Assets/Scripts/Commands/Base/CommandArgsRule.cs.meta deleted file mode 100644 index 629df80ef..000000000 --- a/Assets/Scripts/Commands/Base/CommandArgsRule.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 9d1ccdbc0664467fa7f357204f86ba35 -timeCreated: 1687161149 \ No newline at end of file diff --git a/Assets/Scripts/Commands/Base/ICommand.cs b/Assets/Scripts/Commands/Base/ICommand.cs deleted file mode 100644 index cfa79b40e..000000000 --- a/Assets/Scripts/Commands/Base/ICommand.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Collections.Generic; - -namespace NBF -{ - public interface ICommand - { - /// - /// 名字 - /// - string Name { get; } - - /// - /// 命令 - /// - string Command { get; } - - /// - /// 参数说明 - /// - string ArgsTips { get; } - - - /// - /// 执行 - /// - /// - bool Execute(CommandArgs args); - } -} \ No newline at end of file diff --git a/Assets/Scripts/Commands/Base/ICommand.cs.meta b/Assets/Scripts/Commands/Base/ICommand.cs.meta deleted file mode 100644 index aa6c755ee..000000000 --- a/Assets/Scripts/Commands/Base/ICommand.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: c3245582eb204c4abb7a0aa1eb05a276 -timeCreated: 1687156371 \ No newline at end of file diff --git a/Assets/Scripts/Commands/Command.cs b/Assets/Scripts/Commands/Command.cs deleted file mode 100644 index 01beff4b9..000000000 --- a/Assets/Scripts/Commands/Command.cs +++ /dev/null @@ -1,158 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using NBC; - -namespace NBF -{ - public class Command - { - public enum LogType - { - Info, - Warn, - Error - } - - public struct LogData - { - public string Log; - public LogType Type; - - public LogData(string log, LogType type) - { - Log = log; - Type = type; - } - } - - private static readonly Dictionary _commands = new Dictionary(); - - #region Log - - public static readonly List Logs = new List(); - private const int MaxLog = 1000; - - public static Action OnLogChange; - - public static void LogInfo(string log) - { - AddLog(log, LogType.Info); - } - - public static void LogWarn(string log) - { - AddLog(log, LogType.Warn); - } - - public static void LogError(string log) - { - AddLog(log, LogType.Error); - } - - private static void AddLog(string log, LogType type) - { - if (Logs.Count > MaxLog) - { - var sub = Logs.Count - MaxLog; - for (int i = 0; i < sub; i++) - { - Logs.RemoveAt(0); - } - } - - Logs.Add(new LogData(log, type)); - OnLogChange?.Invoke(); - } - - #endregion - - /// - /// 反射所有GM命令 - /// - public static void Init() - { - try - { - var assembly = AppDomain.CurrentDomain.GetAssemblies() - .First(a => a.GetName().Name == "Assembly-CSharp"); - var type = typeof(ICommand); - var types = assembly.GetTypes(); - Log.Info("command 6"); - var commandTypes = - types.Where(u => type.IsAssignableFrom(u) && u.IsClass && !u.IsAbstract && !u.IsGenericType); - foreach (var c in commandTypes) - { - if (Activator.CreateInstance(c) is ICommand command) - { - _commands[command.Command] = command; - } - } - } - catch (Exception e) - { - Log.Error(e); - } - } - - public static void Open() - { - // UI.Inst.OpenUI(); - } - - public static void Close() - { - // UI.Inst.DestroyUI(); - } - - public static bool Has(string command) - { - return _commands.ContainsKey(command); - } - - /// - /// 获取所有指令实例 - /// - /// - public static List GetAll() - { - return _commands.Values.ToList(); - } - - public static ICommand Get(string command) - { - return _commands.GetValueOrDefault(command); - } - - /// - /// 执行命令 - /// - /// - /// - public static bool Run(string command) - { - var args = new CommandArgs(command); - var inst = Get(args.Command); - return inst?.Execute(args) ?? false; - } - - /// - /// 匹配相识的命令 - /// - /// - /// - public static List Match(string command) - { - var list = new List(); - foreach (var key in _commands.Keys) - { - if (key.Contains(command)) - { - list.Add(_commands[key]); - } - } - - return list; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Commands/Command.cs.meta b/Assets/Scripts/Commands/Command.cs.meta deleted file mode 100644 index 3e7adad64..000000000 --- a/Assets/Scripts/Commands/Command.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 18773de7af9f49208a6ff95a79c012c1 -timeCreated: 1732715884 \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task.meta b/Assets/Scripts/Commands/Task.meta deleted file mode 100644 index dcadb20fa..000000000 --- a/Assets/Scripts/Commands/Task.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: d5d78b5261ae4df48915147b01803839 -timeCreated: 1742568116 \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task/DefRunner.cs b/Assets/Scripts/Commands/Task/DefRunner.cs deleted file mode 100644 index 28ea6d60e..000000000 --- a/Assets/Scripts/Commands/Task/DefRunner.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System; -using System.Collections.Generic; -using NBC; - -namespace NBF -{ - /// - /// 默认任务运行器 - /// - public class DefRunner : Runner - { - private static DefRunner mUpdateRunner; - public static DefRunner Scheduler => mUpdateRunner ??= new DefRunner(); - - private readonly List _updateRoutines = new List(); - - private static bool _pause; - - public event Action OnUpdate; - - /// - /// 暂停运行器 - /// - public static bool Pause - { - get => _pause; - set => _pause = value; - } - - public DefRunner() - { - App.OnUpdate += Update; - StartCoroutine(new RunnerProcess("DefRunner", Coroutines, ReadyTask, FlushingOperation)); - } - - private void StartCoroutine(IProcess process) - { - var routines = _updateRoutines; - if (!routines.Contains(process)) - { - routines.Add(process); - } - } - - private void Update() - { - if (Pause) return; - ExecuteRoutines(_updateRoutines); - OnUpdate?.Invoke(); - } - - private void ExecuteRoutines(List arr) - { - if (arr != null && arr.Count > 0) - { - for (var index = 0; index < arr.Count; index++) - { - var task = arr[index]; - var st = task.Process(); - if (st == NTaskStatus.Success) - { - arr.RemoveAt(index); - index--; - } - } - } - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task/DefRunner.cs.meta b/Assets/Scripts/Commands/Task/DefRunner.cs.meta deleted file mode 100644 index 51788d959..000000000 --- a/Assets/Scripts/Commands/Task/DefRunner.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: b32a3d1556f74b3390f54b8e355199c0 -timeCreated: 1742568119 \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task/LoadSceneTask.cs b/Assets/Scripts/Commands/Task/LoadSceneTask.cs deleted file mode 100644 index 05ce031bb..000000000 --- a/Assets/Scripts/Commands/Task/LoadSceneTask.cs +++ /dev/null @@ -1,64 +0,0 @@ -using System; -using NBC; -using NBC.Asset; -using UnityEngine; -using UnityEngine.SceneManagement; - -namespace NBF -{ - public class LoadSceneTask : NTask - { - public LoadSceneTask(string sceneName, Action addAssetCallback = null) - { - _sceneName = sceneName; - _addAssetCallback = addAssetCallback; - } - - private readonly Action _addAssetCallback; - private readonly string _sceneName; - // private SceneProvider _sceneAsset; - private AsyncOperation _asyncOperation; - - protected override void OnStart() - { - Log.Info($"加载场景=={_sceneName}"); - // var scenePath = $"scene/{_sceneName}"; - _asyncOperation = SceneManager.LoadSceneAsync(_sceneName); - // _sceneAsset = NBC.Asset.Assets.LoadScene(scenePath); - // Assets.StompyRobot.SRDebugger.Scripts.Services.Implementation.ConsoleFilterStateService - } - - protected override NTaskStatus OnProcess() - { - // if (_sceneAsset != null) - // { - // if (_sceneAsset.IsDone) - // { - // if (_addAssetCallback != null) - // { - // _addAssetCallback(_sceneAsset); //加入缓存，以便离开战斗释放 - // } - // - // _addAssetCallback?.Invoke(_sceneAsset); - // return NTaskStatus.Success; - // } - // } - - if (_asyncOperation != null) - { - if (_asyncOperation.isDone) - { - // if (_addAssetCallback != null) - // { - // _addAssetCallback(_sceneAsset); //加入缓存，以便离开战斗释放 - // } - // - // _addAssetCallback?.Invoke(_sceneAsset); - return NTaskStatus.Success; - } - } - - return NTaskStatus.Running; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task/LoadSceneTask.cs.meta b/Assets/Scripts/Commands/Task/LoadSceneTask.cs.meta deleted file mode 100644 index 799e217bd..000000000 --- a/Assets/Scripts/Commands/Task/LoadSceneTask.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: dc1ed1d2970444c2ba57d03aa15ab745 -timeCreated: 1742568127 \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task/RunFunTask.cs b/Assets/Scripts/Commands/Task/RunFunTask.cs deleted file mode 100644 index ea0f4e0d5..000000000 --- a/Assets/Scripts/Commands/Task/RunFunTask.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using NBC; - -namespace NBF -{ - public class RunFunTask : NTask - { - private readonly Action _action; - - public RunFunTask(Action action) - { - _action = action; - } - - protected override void OnStart() - { - _action?.Invoke(); - Finish(); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task/RunFunTask.cs.meta b/Assets/Scripts/Commands/Task/RunFunTask.cs.meta deleted file mode 100644 index df1000af3..000000000 --- a/Assets/Scripts/Commands/Task/RunFunTask.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 16e933b27204495bbb32d82177abb975 -timeCreated: 1742568135 \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task/TimeStopTask.cs b/Assets/Scripts/Commands/Task/TimeStopTask.cs deleted file mode 100644 index 56d03d8e3..000000000 --- a/Assets/Scripts/Commands/Task/TimeStopTask.cs +++ /dev/null @@ -1,45 +0,0 @@ -using NBC; -using UnityEngine; - -namespace NBF -{ - public class TimeStopTask : NTask - { - //public float ProcessTime = 0; - public float EndTime = 0; - - public float StartTime = 0; - - private float _time; - - public TimeStopTask(float time) - { - _time = time; - } - - public override void Reset() - { - // EndTime = 0; - // StartTime = 0; - } - - public override void Stop() - { - // ProcessTime = EndTime; - - EndTime = 0; - StartTime = 0; - } - - protected override void OnStart() - { - StartTime = Time.time; - EndTime = StartTime + _time; - } - - protected override NTaskStatus OnProcess() - { - return Time.time > EndTime ? NTaskStatus.Success : NTaskStatus.Running; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task/TimeStopTask.cs.meta b/Assets/Scripts/Commands/Task/TimeStopTask.cs.meta deleted file mode 100644 index 4d897d1b3..000000000 --- a/Assets/Scripts/Commands/Task/TimeStopTask.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: aeb0973aa0bd4cdf9f025faed8a48959 -timeCreated: 1742568141 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Entity.meta b/Assets/Scripts/Fishing2/Entity.meta new file mode 100644 index 000000000..9f6fe3988 --- /dev/null +++ b/Assets/Scripts/Fishing2/Entity.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 664b8188498e48b7875266cd768c4b23 +timeCreated: 1756305288 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Entity/Data.meta b/Assets/Scripts/Fishing2/Entity/Data.meta new file mode 100644 index 000000000..2461d28c1 --- /dev/null +++ b/Assets/Scripts/Fishing2/Entity/Data.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3aca1b3b8c2e4ef38cb2c4e0759f5620 +timeCreated: 1756305296 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Map.meta b/Assets/Scripts/Fishing2/Entity/Data/Map.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Map.meta rename to Assets/Scripts/Fishing2/Entity/Data/Map.meta diff --git a/Assets/Scripts/Fishing2/Model/Map/Map.cs b/Assets/Scripts/Fishing2/Entity/Data/Map/Map.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Map/Map.cs rename to Assets/Scripts/Fishing2/Entity/Data/Map/Map.cs diff --git a/Assets/Scripts/Fishing2/Model/Map/Map.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Map/Map.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Map/Map.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Map/Map.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Move.meta b/Assets/Scripts/Fishing2/Entity/Data/Move.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Move.meta rename to Assets/Scripts/Fishing2/Entity/Data/Move.meta diff --git a/Assets/Scripts/Fishing2/Model/Move/MoveComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Move/MoveComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Move/MoveComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Move/MoveComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Move/MoveComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Move/MoveComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Move/MoveComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Move/MoveComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBaitComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBaitComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBaitComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBaitComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBaitComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBaitComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBaitComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBaitComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBobberComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBobberComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBobberComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBobberComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBobberComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBobberComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBobberComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBobberComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearHookComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearHookComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearHookComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearHookComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearHookComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearHookComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearHookComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearHookComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLineComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLineComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLineComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLineComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLineComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLineComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLineComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLineComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLureComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLureComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLureComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLureComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLureComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLureComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLureComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLureComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearReelComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearReelComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearReelComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearReelComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearReelComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearReelComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearReelComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearReelComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearRodComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearRodComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearRodComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearRodComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearRodComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearRodComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearRodComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearRodComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearWeightComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearWeightComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearWeightComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearWeightComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearWeightComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearWeightComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearWeightComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearWeightComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/UnitGearComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/UnitGearComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/UnitGearComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/UnitGearComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/UnitGearComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/UnitGearComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/UnitGearComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/UnitGearComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Parts.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Parts.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Parts.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Parts.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Parts/UnitFlashlightComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Parts/UnitFlashlightComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Parts/UnitFlashlightComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Parts/UnitFlashlightComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Parts/UnitFlashlightComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Parts/UnitFlashlightComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Parts/UnitFlashlightComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Parts/UnitFlashlightComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Skin.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Skin.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Skin.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Skin.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Skin/UnitSkinComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Skin/UnitSkinComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Skin/UnitSkinComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Skin/UnitSkinComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Skin/UnitSkinComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Skin/UnitSkinComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Skin/UnitSkinComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Skin/UnitSkinComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Unit.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Unit.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Unit.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Unit.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Unit.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Unit.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Unit.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Unit.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/UnitBasic.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitBasic.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/UnitBasic.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/UnitBasic.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/UnitBasic.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitBasic.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/UnitBasic.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/UnitBasic.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/UnitEventType.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitEventType.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/UnitEventType.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/UnitEventType.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/UnitEventType.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitEventType.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/UnitEventType.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/UnitEventType.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/UnitStateArgs.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitStateArgs.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/UnitStateArgs.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/UnitStateArgs.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/UnitStateArgs.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitStateArgs.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/UnitStateArgs.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/UnitStateArgs.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/View.meta b/Assets/Scripts/Fishing2/Entity/View.meta new file mode 100644 index 000000000..80f84625c --- /dev/null +++ b/Assets/Scripts/Fishing2/Entity/View.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 944bb9e5d3fe4517bc6d12f723f98f87 +timeCreated: 1756305300 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Views/Unit.meta b/Assets/Scripts/Fishing2/Entity/View/Unit.meta similarity index 100% rename from Assets/Scripts/Fishing2/Views/Unit.meta rename to Assets/Scripts/Fishing2/Entity/View/Unit.meta diff --git a/Assets/Scripts/Fishing2/Views/Unit/UnitHUDComponent.cs b/Assets/Scripts/Fishing2/Entity/View/Unit/UnitHUDComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Views/Unit/UnitHUDComponent.cs rename to Assets/Scripts/Fishing2/Entity/View/Unit/UnitHUDComponent.cs diff --git a/Assets/Scripts/Fishing2/Views/Unit/UnitHUDComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/View/Unit/UnitHUDComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Views/Unit/UnitHUDComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/View/Unit/UnitHUDComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs b/Assets/Scripts/Fishing2/Entity/View/Unit/UnitUnityComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs rename to Assets/Scripts/Fishing2/Entity/View/Unit/UnitUnityComponent.cs diff --git a/Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/View/Unit/UnitUnityComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/View/Unit/UnitUnityComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Event.meta b/Assets/Scripts/Fishing2/Event.meta new file mode 100644 index 000000000..8e64e000f --- /dev/null +++ b/Assets/Scripts/Fishing2/Event.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 958c7de8b9234f129e1ce439a961d540 +timeCreated: 1756305421 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/LoginFinish.cs b/Assets/Scripts/Fishing2/Event/LoginFinish.cs similarity index 100% rename from Assets/Scripts/Fishing2/LoginFinish.cs rename to Assets/Scripts/Fishing2/Event/LoginFinish.cs diff --git a/Assets/Scripts/Fishing2/LoginFinish.cs.meta b/Assets/Scripts/Fishing2/Event/LoginFinish.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/LoginFinish.cs.meta rename to Assets/Scripts/Fishing2/Event/LoginFinish.cs.meta diff --git a/Assets/Scripts/Fishing2/Model.meta b/Assets/Scripts/Fishing2/Model.meta index 49aaa69d4..c5446964f 100644 --- a/Assets/Scripts/Fishing2/Model.meta +++ b/Assets/Scripts/Fishing2/Model.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: fe99d0fb1bfc4912a205bb00911c1132 -timeCreated: 1756047069 \ No newline at end of file +guid: 78d510036c864fc6a7840f354a743ce0 +timeCreated: 1756305355 \ No newline at end of file diff --git a/Assets/Scripts/Data.meta b/Assets/Scripts/Fishing2/Model/Data.meta similarity index 100% rename from Assets/Scripts/Data.meta rename to Assets/Scripts/Fishing2/Model/Data.meta diff --git a/Assets/Scripts/Data/TabListData.cs b/Assets/Scripts/Fishing2/Model/Data/TabListData.cs similarity index 100% rename from Assets/Scripts/Data/TabListData.cs rename to Assets/Scripts/Fishing2/Model/Data/TabListData.cs diff --git a/Assets/Scripts/Data/TabListData.cs.meta b/Assets/Scripts/Fishing2/Model/Data/TabListData.cs.meta similarity index 100% rename from Assets/Scripts/Data/TabListData.cs.meta rename to Assets/Scripts/Fishing2/Model/Data/TabListData.cs.meta diff --git a/Assets/Scripts/Def.meta b/Assets/Scripts/Fishing2/Model/Def.meta similarity index 100% rename from Assets/Scripts/Def.meta rename to Assets/Scripts/Fishing2/Model/Def.meta diff --git a/Assets/Scripts/Def/GameDef.cs b/Assets/Scripts/Fishing2/Model/Def/GameDef.cs similarity index 100% rename from Assets/Scripts/Def/GameDef.cs rename to Assets/Scripts/Fishing2/Model/Def/GameDef.cs diff --git a/Assets/Scripts/Def/GameDef.cs.meta b/Assets/Scripts/Fishing2/Model/Def/GameDef.cs.meta similarity index 100% rename from Assets/Scripts/Def/GameDef.cs.meta rename to Assets/Scripts/Fishing2/Model/Def/GameDef.cs.meta diff --git a/Assets/Scripts/Def/InputDef.cs b/Assets/Scripts/Fishing2/Model/Def/InputDef.cs similarity index 100% rename from Assets/Scripts/Def/InputDef.cs rename to Assets/Scripts/Fishing2/Model/Def/InputDef.cs diff --git a/Assets/Scripts/Def/InputDef.cs.meta b/Assets/Scripts/Fishing2/Model/Def/InputDef.cs.meta similarity index 100% rename from Assets/Scripts/Def/InputDef.cs.meta rename to Assets/Scripts/Fishing2/Model/Def/InputDef.cs.meta diff --git a/Assets/Scripts/Def/SelectorRodSetting.cs b/Assets/Scripts/Fishing2/Model/Def/SelectorRodSetting.cs similarity index 100% rename from Assets/Scripts/Def/SelectorRodSetting.cs rename to Assets/Scripts/Fishing2/Model/Def/SelectorRodSetting.cs diff --git a/Assets/Scripts/Def/SelectorRodSetting.cs.meta b/Assets/Scripts/Fishing2/Model/Def/SelectorRodSetting.cs.meta similarity index 100% rename from Assets/Scripts/Def/SelectorRodSetting.cs.meta rename to Assets/Scripts/Fishing2/Model/Def/SelectorRodSetting.cs.meta diff --git a/Assets/Scripts/Def/States.cs b/Assets/Scripts/Fishing2/Model/Def/States.cs similarity index 100% rename from Assets/Scripts/Def/States.cs rename to Assets/Scripts/Fishing2/Model/Def/States.cs diff --git a/Assets/Scripts/Def/States.cs.meta b/Assets/Scripts/Fishing2/Model/Def/States.cs.meta similarity index 100% rename from Assets/Scripts/Def/States.cs.meta rename to Assets/Scripts/Fishing2/Model/Def/States.cs.meta diff --git a/Assets/Scripts/Def/UIDef.cs b/Assets/Scripts/Fishing2/Model/Def/UIDef.cs similarity index 100% rename from Assets/Scripts/Def/UIDef.cs rename to Assets/Scripts/Fishing2/Model/Def/UIDef.cs diff --git a/Assets/Scripts/Def/UIDef.cs.meta b/Assets/Scripts/Fishing2/Model/Def/UIDef.cs.meta similarity index 100% rename from Assets/Scripts/Def/UIDef.cs.meta rename to Assets/Scripts/Fishing2/Model/Def/UIDef.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/MapManageComponent.cs b/Assets/Scripts/Fishing2/Model/MapManageComponent.cs new file mode 100644 index 000000000..40aa0b937 --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/MapManageComponent.cs @@ -0,0 +1,9 @@ +using NBC.Entitas; + +namespace NBF.Fishing2 +{ + public class MapManageComponent : Entity + { + + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/MapManageComponent.cs.meta b/Assets/Scripts/Fishing2/Model/MapManageComponent.cs.meta new file mode 100644 index 000000000..ce673d40d --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/MapManageComponent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 226c840e80f840ae8a4ff54bc7c6645a +timeCreated: 1756304063 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Module.meta b/Assets/Scripts/Fishing2/Model/Module.meta new file mode 100644 index 000000000..8b0973fa8 --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/Module.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e4e83bf905244f99b0c583bf307cdbca +timeCreated: 1756310423 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Module/Numeric.meta b/Assets/Scripts/Fishing2/Model/Module/Numeric.meta new file mode 100644 index 000000000..74cf16c94 --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/Module/Numeric.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ddc41e806352498aad45983600bdce6d +timeCreated: 1756310441 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Numeric/NumericComponent.cs b/Assets/Scripts/Fishing2/Model/Module/Numeric/NumericComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Numeric/NumericComponent.cs rename to Assets/Scripts/Fishing2/Model/Module/Numeric/NumericComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Numeric/NumericComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Module/Numeric/NumericComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Numeric/NumericComponent.cs.meta rename to Assets/Scripts/Fishing2/Model/Module/Numeric/NumericComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Numeric/NumericType.cs b/Assets/Scripts/Fishing2/Model/Module/Numeric/NumericType.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Numeric/NumericType.cs rename to Assets/Scripts/Fishing2/Model/Module/Numeric/NumericType.cs diff --git a/Assets/Scripts/Fishing2/Model/Numeric/NumericType.cs.meta b/Assets/Scripts/Fishing2/Model/Module/Numeric/NumericType.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Numeric/NumericType.cs.meta rename to Assets/Scripts/Fishing2/Model/Module/Numeric/NumericType.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Module/ObjectWait.meta b/Assets/Scripts/Fishing2/Model/Module/ObjectWait.meta new file mode 100644 index 000000000..7d2c4b2de --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/Module/ObjectWait.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3c2510352b1145bcaedaddbce324c10d +timeCreated: 1756310429 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs b/Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs new file mode 100644 index 000000000..705e457dd --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs @@ -0,0 +1,144 @@ +using System; +using System.Collections.Generic; +using NBC; +using NBC.Entitas; +using NBC.Entitas.Interface; + +namespace NBF.Fishing2 +{ + public static class WaitTypeError + { + public const int Success = 0; + public const int Destroy = 1; + public const int Cancel = 2; + public const int Timeout = 3; + } + + public interface IWaitType + { + int Error { get; set; } + } + + + public class ObjectWait : Entity + { + public Dictionary> tcsDict = new(); + } + + + public static class ObjectWaitSystem + { + public class ObjectWaitAwakeSystem : AwakeSystem + { + protected override void Awake(ObjectWait self) + { + self.tcsDict.Clear(); + } + } + + public class ObjectWaitDestroySystem : DestroySystem + { + protected override void Destroy(ObjectWait self) + { + foreach (var p in self.tcsDict) + { + foreach (object v in p.Value) + { + ((IDestroyRun)v).SetResult(); + } + } + + self.tcsDict.Clear(); + } + } + + private interface IDestroyRun + { + void SetResult(); + } + + private class ResultCallback : IDestroyRun where K : struct, IWaitType + { + private FTask tcs; + + public ResultCallback() + { + this.tcs = FTask.Create(true); + } + + public bool IsDisposed + { + get { return this.tcs == null; } + } + + public FTask Task => this.tcs; + + public void SetResult(K k) + { + var t = tcs; + this.tcs = null; + t.SetResult(k); + } + + public void SetResult() + { + var t = tcs; + this.tcs = null; + t.SetResult(new K() { Error = WaitTypeError.Destroy }); + } + } + + public static async FTask Wait(this ObjectWait self) where T : struct, IWaitType + { + ResultCallback tcs = new ResultCallback(); + FCancellationToken cancellationToken = FCancellationToken.ToKen; + self.Add(typeof(T), tcs); + + T ret; + try + { + cancellationToken?.Add(CancelAction); + ret = await tcs.Task; + } + finally + { + cancellationToken?.Remove(CancelAction); + } + + return ret; + + void CancelAction() + { + self.Notify(new T() { Error = WaitTypeError.Cancel }); + } + } + + public static void Notify(this ObjectWait self, T obj) where T : struct, IWaitType + { + Type type = typeof(T); + if (!self.tcsDict.TryGetValue(type, out var tcsList) || tcsList.Count == 0) + { + return; + } + + foreach (var tcs in tcsList) + { + ((ResultCallback)tcs).SetResult(obj); + } + + tcsList.Clear(); + } + + private static void Add(this ObjectWait self, Type type, object obj) + { + if (self.tcsDict.TryGetValue(type, out var list)) + { + list.Add(obj); + } + else + { + self.tcsDict.Add(type, new List { obj }); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs.meta b/Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs.meta new file mode 100644 index 000000000..604fa5e86 --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a79150f39b424a1c82eef6b04bc0a7c1 +timeCreated: 1756310098 \ No newline at end of file diff --git a/Assets/Scripts/Net.meta b/Assets/Scripts/Fishing2/Model/Net.meta similarity index 100% rename from Assets/Scripts/Net.meta rename to Assets/Scripts/Fishing2/Model/Net.meta diff --git a/Assets/Scripts/Net/Entity.meta b/Assets/Scripts/Fishing2/Model/Net/Entity.meta similarity index 100% rename from Assets/Scripts/Net/Entity.meta rename to Assets/Scripts/Fishing2/Model/Net/Entity.meta diff --git a/Assets/Scripts/Net/Entity/AuthenticationSelectComponent.cs b/Assets/Scripts/Fishing2/Model/Net/Entity/AuthenticationSelectComponent.cs similarity index 100% rename from Assets/Scripts/Net/Entity/AuthenticationSelectComponent.cs rename to Assets/Scripts/Fishing2/Model/Net/Entity/AuthenticationSelectComponent.cs diff --git a/Assets/Scripts/Net/Entity/AuthenticationSelectComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Net/Entity/AuthenticationSelectComponent.cs.meta similarity index 100% rename from Assets/Scripts/Net/Entity/AuthenticationSelectComponent.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/Entity/AuthenticationSelectComponent.cs.meta diff --git a/Assets/Scripts/Net/Entity/JWT.meta b/Assets/Scripts/Fishing2/Model/Net/Entity/JWT.meta similarity index 100% rename from Assets/Scripts/Net/Entity/JWT.meta rename to Assets/Scripts/Fishing2/Model/Net/Entity/JWT.meta diff --git a/Assets/Scripts/Net/Entity/JWT/JWTParseComponent.cs b/Assets/Scripts/Fishing2/Model/Net/Entity/JWT/JWTParseComponent.cs similarity index 100% rename from Assets/Scripts/Net/Entity/JWT/JWTParseComponent.cs rename to Assets/Scripts/Fishing2/Model/Net/Entity/JWT/JWTParseComponent.cs diff --git a/Assets/Scripts/Net/Entity/JWT/JWTParseComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Net/Entity/JWT/JWTParseComponent.cs.meta similarity index 100% rename from Assets/Scripts/Net/Entity/JWT/JWTParseComponent.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/Entity/JWT/JWTParseComponent.cs.meta diff --git a/Assets/Scripts/Net/Hotfix.meta b/Assets/Scripts/Fishing2/Model/Net/Hotfix.meta similarity index 100% rename from Assets/Scripts/Net/Hotfix.meta rename to Assets/Scripts/Fishing2/Model/Net/Hotfix.meta diff --git a/Assets/Scripts/Net/Hotfix/.DS_Store b/Assets/Scripts/Fishing2/Model/Net/Hotfix/.DS_Store similarity index 100% rename from Assets/Scripts/Net/Hotfix/.DS_Store rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/.DS_Store diff --git a/Assets/Scripts/Net/Hotfix/Handler.meta b/Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler.meta similarity index 100% rename from Assets/Scripts/Net/Hotfix/Handler.meta rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler.meta diff --git a/Assets/Scripts/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs b/Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs similarity index 100% rename from Assets/Scripts/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs diff --git a/Assets/Scripts/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs.meta b/Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs.meta similarity index 100% rename from Assets/Scripts/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs.meta diff --git a/Assets/Scripts/Net/Hotfix/System.meta b/Assets/Scripts/Fishing2/Model/Net/Hotfix/System.meta similarity index 100% rename from Assets/Scripts/Net/Hotfix/System.meta rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/System.meta diff --git a/Assets/Scripts/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs b/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs similarity index 100% rename from Assets/Scripts/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs diff --git a/Assets/Scripts/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs.meta b/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs.meta similarity index 100% rename from Assets/Scripts/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs.meta diff --git a/Assets/Scripts/Net/Hotfix/System/JWT.meta b/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT.meta similarity index 100% rename from Assets/Scripts/Net/Hotfix/System/JWT.meta rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT.meta diff --git a/Assets/Scripts/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs b/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs similarity index 100% rename from Assets/Scripts/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs diff --git a/Assets/Scripts/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs.meta b/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs.meta similarity index 100% rename from Assets/Scripts/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs.meta diff --git a/Assets/Scripts/Net/Hotfix/System/SessionHelper.cs b/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/SessionHelper.cs similarity index 100% rename from Assets/Scripts/Net/Hotfix/System/SessionHelper.cs rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/System/SessionHelper.cs diff --git a/Assets/Scripts/Net/Hotfix/System/SessionHelper.cs.meta b/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/SessionHelper.cs.meta similarity index 100% rename from Assets/Scripts/Net/Hotfix/System/SessionHelper.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/System/SessionHelper.cs.meta diff --git a/Assets/Scripts/Net/MessageHandler.meta b/Assets/Scripts/Fishing2/Model/Net/MessageHandler.meta similarity index 100% rename from Assets/Scripts/Net/MessageHandler.meta rename to Assets/Scripts/Fishing2/Model/Net/MessageHandler.meta diff --git a/Assets/Scripts/Net/MessageHandler/Chat2C_MessageHandler.cs b/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Chat2C_MessageHandler.cs similarity index 100% rename from Assets/Scripts/Net/MessageHandler/Chat2C_MessageHandler.cs rename to Assets/Scripts/Fishing2/Model/Net/MessageHandler/Chat2C_MessageHandler.cs diff --git a/Assets/Scripts/Net/MessageHandler/Chat2C_MessageHandler.cs.meta b/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Chat2C_MessageHandler.cs.meta similarity index 100% rename from Assets/Scripts/Net/MessageHandler/Chat2C_MessageHandler.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/MessageHandler/Chat2C_MessageHandler.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs b/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs new file mode 100644 index 000000000..70b04c1b4 --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs @@ -0,0 +1,24 @@ +using NBC; +using NBC.Network; +using NBC.Network.Interface; +using NBF.Fishing2; + +namespace NBF +{ + public class Map2C_ChangeMapHandler : Message + { + protected override async FTask Run(Session session, Map2C_ChangeMap message) + { + Log.Info($"收到地图切换消息=={message.MapId}"); + await MapHelper.CreateRoomTest(message.MapId); + } + } + // public class Map2C_ChangeMapHandler : Message + // { + // protected override async FTask Run(Session session, Map2C_ChangeMap message) + // { + // Log.Info($"收到地图切换消息=={message.MapId}"); + // await MapHelper.CreateRoomTest(message.MapId); + // } + // } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs.meta b/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs.meta new file mode 100644 index 000000000..c1776a44f --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9aca13592484450582e818dd128a23c2 +timeCreated: 1756301493 \ No newline at end of file diff --git a/Assets/Scripts/Net/Net.cs b/Assets/Scripts/Fishing2/Model/Net/Net.cs similarity index 100% rename from Assets/Scripts/Net/Net.cs rename to Assets/Scripts/Fishing2/Model/Net/Net.cs diff --git a/Assets/Scripts/Net/Net.cs.meta b/Assets/Scripts/Fishing2/Model/Net/Net.cs.meta similarity index 100% rename from Assets/Scripts/Net/Net.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/Net.cs.meta diff --git a/Assets/Scripts/Net/NetExtends.cs b/Assets/Scripts/Fishing2/Model/Net/NetExtends.cs similarity index 100% rename from Assets/Scripts/Net/NetExtends.cs rename to Assets/Scripts/Fishing2/Model/Net/NetExtends.cs diff --git a/Assets/Scripts/Net/NetExtends.cs.meta b/Assets/Scripts/Fishing2/Model/Net/NetExtends.cs.meta similarity index 100% rename from Assets/Scripts/Net/NetExtends.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/NetExtends.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Numeric.meta b/Assets/Scripts/Fishing2/Model/Numeric.meta deleted file mode 100644 index 04782f7a4..000000000 --- a/Assets/Scripts/Fishing2/Model/Numeric.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 2859b0361c964635b4ea58be3b903b6a -timeCreated: 1756115131 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/OnSceneCreate_Init.cs b/Assets/Scripts/Fishing2/OnSceneCreate_Init.cs new file mode 100644 index 000000000..1aa5b0379 --- /dev/null +++ b/Assets/Scripts/Fishing2/OnSceneCreate_Init.cs @@ -0,0 +1,19 @@ +using NBC; +using NBC.Event; + +namespace NBF.Fishing2 +{ + public class OnSceneCreate_Init : AsyncEventSystem + { + protected override async FTask Handler(OnCreateScene self) + { + var scene = self.Scene; + if (scene.SceneRuntimeType == SceneRuntimeType.Root) + { + Log.Info("OnSceneCreate_Init=== root"); + scene.AddComponent(); + scene.AddComponent(); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/OnSceneCreate_Init.cs.meta b/Assets/Scripts/Fishing2/OnSceneCreate_Init.cs.meta new file mode 100644 index 000000000..e6a23bb56 --- /dev/null +++ b/Assets/Scripts/Fishing2/OnSceneCreate_Init.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c155820b018048fab4bcdb1aa3b7442a +timeCreated: 1756310186 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Data/Map/MapHelper.cs b/Assets/Scripts/Fishing2/System/Data/Map/MapHelper.cs deleted file mode 100644 index 3f020075e..000000000 --- a/Assets/Scripts/Fishing2/System/Data/Map/MapHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using NBC; - -namespace NBF.Fishing2 -{ - public static class MapHelper - { - /// - /// 开始进入地图 - /// - public static async FTask Enter(int mapId, long roomId = 0) - { - var response = (Map2C_EnterMapResponse)await Net.Call(new C2Map_EnterMapRequest() - { - MapId = mapId, - RoomId = roomId - }); - Log.Info($"创建房间请求返回={response.MapId}"); - - if (response.MapId > 0) - { - var roomResponse = (Map2C_CreateRoomResponse)await Net.Call(new C2Map_CreateRoomRequest() - { - MapId = response.MapId - }); - Log.Info($"创建房间返回 Code={roomResponse.RoomCode} 房间玩家数量={roomResponse.Units.Count}"); - - //执行进入房间 - var roomResponse2 = (G2C_EnterRoomResponse)await Net.Call(new C2G_EnterRoomRequest() - { - RoomCode = roomResponse.RoomCode - }); - Log.Info($"进入房间返回 Code={roomResponse2.RoomCode} 房间玩家数量={roomResponse2.Units.Count}"); - } - - await FTask.CompletedTask; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Helper.meta b/Assets/Scripts/Fishing2/System/Helper.meta new file mode 100644 index 000000000..d8f9d4b56 --- /dev/null +++ b/Assets/Scripts/Fishing2/System/Helper.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8de8645248d34ebfaf351bc67a8b8a45 +timeCreated: 1756309950 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Helper/MapHelper.cs b/Assets/Scripts/Fishing2/System/Helper/MapHelper.cs new file mode 100644 index 000000000..1b06e3f1a --- /dev/null +++ b/Assets/Scripts/Fishing2/System/Helper/MapHelper.cs @@ -0,0 +1,38 @@ +using NBC; + +namespace NBF.Fishing2 +{ + public static class MapHelper + { + /// + /// 开始进入地图 + /// + public static async FTask Enter(int mapId, long roomId = 0) + { + var response = (Map2C_EnterMapResponse)await Net.Call(new C2Map_EnterMapRequest() + { + MapId = mapId, + RoomId = roomId + }); + Log.Info($"进入房间请求返回={response.ErrorCode}"); + + await FTask.CompletedTask; + } + + public static async FTask CreateRoomTest(int mapId) + { + // var roomResponse = (Map2C_CreateRoomResponse)await Net.Call(new C2Map_CreateRoomRequest() + // { + // MapId = mapId + // }); + // Log.Info($"创建房间返回 Code={roomResponse.RoomCode} 房间玩家数量={roomResponse.Units.Count}"); + // + // //执行进入房间 + // var roomResponse2 = (G2C_EnterRoomResponse)await Net.Call(new C2G_EnterRoomRequest() + // { + // RoomCode = roomResponse.RoomCode + // }); + // Log.Info($"进入房间返回 Code={roomResponse2.RoomCode} 房间玩家数量={roomResponse2.Units.Count}"); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Data/Map/MapHelper.cs.meta b/Assets/Scripts/Fishing2/System/Helper/MapHelper.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/System/Data/Map/MapHelper.cs.meta rename to Assets/Scripts/Fishing2/System/Helper/MapHelper.cs.meta diff --git a/Assets/Scripts/Fishing2/Views.meta b/Assets/Scripts/Fishing2/Views.meta deleted file mode 100644 index 7e5375042..000000000 --- a/Assets/Scripts/Fishing2/Views.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: fb1bae7c41874855957fe654dec2dee5 -timeCreated: 1755792325 \ No newline at end of file diff --git a/Assets/Scripts/Generate/NetworkProtocol/MapMessage.cs b/Assets/Scripts/Generate/NetworkProtocol/MapMessage.cs index 9d982cebb..be73a13ab 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/MapMessage.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/MapMessage.cs @@ -201,4 +201,30 @@ namespace NBC [ProtoMember(1)] public uint ErrorCode { get; set; } } + /// + /// 通知客户端切换地图 + /// + [ProtoContract] + public partial class Map2C_ChangeMap : AMessage, ICustomRouteMessage, IProto + { + public static Map2C_ChangeMap Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + MapId = default; + Node = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Map2C_ChangeMap; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.MapRoute; + [ProtoMember(1)] + public int MapId { get; set; } + [ProtoMember(2)] + public int Node { get; set; } + } } diff --git a/Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs b/Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs index 92539d361..d893fbd31 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs @@ -121,30 +121,6 @@ namespace NBC } public uint OpCode() { return OuterOpcode.G2C_RepeatLogin; } } - /// - /// 通知客户端切换地图 - /// - [ProtoContract] - public partial class G2C_ChangeMap : AMessage, IMessage, IProto - { - public static G2C_ChangeMap Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - MapId = default; - Node = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - public uint OpCode() { return OuterOpcode.G2C_ChangeMap; } - [ProtoMember(1)] - public int MapId { get; set; } - [ProtoMember(2)] - public int Node { get; set; } - } [ProtoContract] public partial class C2Game_GetRoleInfoRequest : AMessage, ICustomRouteRequest, IProto { diff --git a/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs b/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs index 0936072f1..99f79130d 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs @@ -10,37 +10,37 @@ namespace Fantasy public const uint G2C_ExitRoomResponse = 402663186; public const uint C2Map_EnterMapRequest = 2281711378; public const uint Map2C_EnterMapResponse = 2415929106; + public const uint Map2C_ChangeMap = 2147493649; public const uint C2A_LoginRequest = 268445459; public const uint A2C_LoginResponse = 402663187; public const uint C2G_LoginRequest = 268445460; public const uint G2C_LoginResponse = 402663188; public const uint G2C_RepeatLogin = 134227729; - public const uint G2C_ChangeMap = 134227730; public const uint C2Game_GetRoleInfoRequest = 2281711379; public const uint Game2C_GetRoleInfoResponse = 2415929107; public const uint C2Map_EnterRoomRequest = 2281711380; public const uint Map2C_EnterRoomResponse = 2415929108; - public const uint C2Map_Move = 2147493649; - public const uint Map2C_RoleEnterMapNotify = 2147493650; - public const uint Map2C_RoleExitMapNotify = 2147493651; - public const uint Map2C_RoleStateNotify = 2147493652; - public const uint Map2C_RoleGearStateNotify = 2147493653; - public const uint Map2C_RoleGearChangeNotify = 2147493654; + public const uint C2Map_Move = 2147493650; + public const uint Map2C_RoleEnterMapNotify = 2147493651; + public const uint Map2C_RoleExitMapNotify = 2147493652; + public const uint Map2C_RoleStateNotify = 2147493653; + public const uint Map2C_RoleGearStateNotify = 2147493654; + public const uint Map2C_RoleGearChangeNotify = 2147493655; public const uint C2S_GetConversationsRequest = 2281711381; public const uint S2C_GetConversationsResponse = 2415929109; public const uint C2S_SendMailRequest = 2281711382; public const uint S2C_SendMailResponse = 2415929110; public const uint C2S_DeleteMailRequest = 2281711383; public const uint S2C_DeleteMailResponse = 2415929111; - public const uint S2C_HaveMail = 2147493655; - public const uint S2C_MailState = 2147493656; + public const uint S2C_HaveMail = 2147493656; + public const uint S2C_MailState = 2147493657; public const uint C2S_CreateChannelRequest = 2281711384; public const uint S2C_CreateChannelResponse = 2415929112; public const uint C2S_JoinChannelRequest = 2281711385; public const uint S2C_JoinChannelResponse = 2415929113; public const uint C2S_SendMessageRequest = 2281711386; public const uint S2C_SendMessageResponse = 2415929114; - public const uint S2C_Message = 2147493657; + public const uint S2C_Message = 2147493658; public const uint C2S_CreateClubRequest = 2281711387; public const uint S2C_CreateClubResponse = 2415929115; public const uint C2S_GetClubInfoRequest = 2281711388; @@ -57,6 +57,6 @@ namespace Fantasy public const uint S2C_DissolveClubResponse = 2415929121; public const uint C2S_DisposeJoinRequest = 2281711394; public const uint S2C_DisposeJoinResponse = 2415929122; - public const uint S2C_ClubChange = 2147493658; + public const uint S2C_ClubChange = 2147493659; } } diff --git a/Assets/Scripts/Models.meta b/Assets/Scripts/Models.meta deleted file mode 100644 index 584945cf8..000000000 --- a/Assets/Scripts/Models.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: da30585f90994af6ae4bd327c567c7c6 -timeCreated: 1744118103 \ No newline at end of file diff --git a/Assets/Scripts/Models/RoleModel.cs b/Assets/Scripts/Models/RoleModel.cs deleted file mode 100644 index 0a1dbfd49..000000000 --- a/Assets/Scripts/Models/RoleModel.cs +++ /dev/null @@ -1,25 +0,0 @@ -using NBC; - -namespace NBF -{ - public class GameModel - { - public static int RoleID = 100; - - private static GameModel _inst; - - public static GameModel Inst => _inst ??= new GameModel(); - - public void Init() - { - } - - public void Clear() - { - } - - public void Destroy() - { - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Models/RoleModel.cs.meta b/Assets/Scripts/Models/RoleModel.cs.meta deleted file mode 100644 index 1014d88da..000000000 --- a/Assets/Scripts/Models/RoleModel.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 1a78e8aaa28b4c309c266b9166f21103 -timeCreated: 1744118125 \ No newline at end of file diff --git a/Assets/Scripts/PhysicsTools.zip b/Assets/Scripts/PhysicsTools.zip deleted file mode 100644 index 29fb9c40aae9b27df83ebc07ceb75a893d28b78e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26601 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 z 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 T>8u8g0m&O52}%FP*(); // if (inventoryManager == null) // { diff --git a/Assets/Scripts/Steamworks.NET.meta b/Assets/Scripts/Steamworks.NET.meta deleted file mode 100644 index bbf13f6de..000000000 --- a/Assets/Scripts/Steamworks.NET.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 62ddefd95a62cbc4ea1a2aabc009a378 -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Scripts/ThirdParty.meta b/Assets/Scripts/ThirdParty.meta new file mode 100644 index 000000000..3a2509145 --- /dev/null +++ b/Assets/Scripts/ThirdParty.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0d5240b076704b1bbb038b3b63867968 +timeCreated: 1756305119 \ No newline at end of file diff --git a/Assets/Scripts/FirstPersonController.meta b/Assets/Scripts/ThirdParty/FirstPersonController.meta similarity index 100% rename from Assets/Scripts/FirstPersonController.meta rename to Assets/Scripts/ThirdParty/FirstPersonController.meta diff --git a/Assets/Scripts/FirstPersonController/FirstPersonController.cs b/Assets/Scripts/ThirdParty/FirstPersonController/FirstPersonController.cs similarity index 100% rename from Assets/Scripts/FirstPersonController/FirstPersonController.cs rename to Assets/Scripts/ThirdParty/FirstPersonController/FirstPersonController.cs diff --git a/Assets/Scripts/FirstPersonController/FirstPersonController.cs.meta b/Assets/Scripts/ThirdParty/FirstPersonController/FirstPersonController.cs.meta similarity index 100% rename from Assets/Scripts/FirstPersonController/FirstPersonController.cs.meta rename to Assets/Scripts/ThirdParty/FirstPersonController/FirstPersonController.cs.meta diff --git a/Assets/Scripts/FirstPersonController/MouseLook.cs b/Assets/Scripts/ThirdParty/FirstPersonController/MouseLook.cs similarity index 100% rename from Assets/Scripts/FirstPersonController/MouseLook.cs rename to Assets/Scripts/ThirdParty/FirstPersonController/MouseLook.cs diff --git a/Assets/Scripts/FirstPersonController/MouseLook.cs.meta b/Assets/Scripts/ThirdParty/FirstPersonController/MouseLook.cs.meta similarity index 100% rename from Assets/Scripts/FirstPersonController/MouseLook.cs.meta rename to Assets/Scripts/ThirdParty/FirstPersonController/MouseLook.cs.meta diff --git a/Assets/Scripts/FirstPersonController/Utility.meta b/Assets/Scripts/ThirdParty/FirstPersonController/Utility.meta similarity index 100% rename from Assets/Scripts/FirstPersonController/Utility.meta rename to Assets/Scripts/ThirdParty/FirstPersonController/Utility.meta diff --git a/Assets/Scripts/FirstPersonController/Utility/CurveControlledBob.cs b/Assets/Scripts/ThirdParty/FirstPersonController/Utility/CurveControlledBob.cs similarity index 100% rename from Assets/Scripts/FirstPersonController/Utility/CurveControlledBob.cs rename to Assets/Scripts/ThirdParty/FirstPersonController/Utility/CurveControlledBob.cs diff --git a/Assets/Scripts/FirstPersonController/Utility/CurveControlledBob.cs.meta b/Assets/Scripts/ThirdParty/FirstPersonController/Utility/CurveControlledBob.cs.meta similarity index 100% rename from Assets/Scripts/FirstPersonController/Utility/CurveControlledBob.cs.meta rename to Assets/Scripts/ThirdParty/FirstPersonController/Utility/CurveControlledBob.cs.meta diff --git a/Assets/Scripts/FirstPersonController/Utility/FOVKick.cs b/Assets/Scripts/ThirdParty/FirstPersonController/Utility/FOVKick.cs similarity index 100% rename from Assets/Scripts/FirstPersonController/Utility/FOVKick.cs rename to Assets/Scripts/ThirdParty/FirstPersonController/Utility/FOVKick.cs diff --git a/Assets/Scripts/FirstPersonController/Utility/FOVKick.cs.meta b/Assets/Scripts/ThirdParty/FirstPersonController/Utility/FOVKick.cs.meta similarity index 100% rename from Assets/Scripts/FirstPersonController/Utility/FOVKick.cs.meta rename to Assets/Scripts/ThirdParty/FirstPersonController/Utility/FOVKick.cs.meta diff --git a/Assets/Scripts/FirstPersonController/Utility/LerpControlledBob.cs b/Assets/Scripts/ThirdParty/FirstPersonController/Utility/LerpControlledBob.cs similarity index 100% rename from Assets/Scripts/FirstPersonController/Utility/LerpControlledBob.cs rename to Assets/Scripts/ThirdParty/FirstPersonController/Utility/LerpControlledBob.cs diff --git a/Assets/Scripts/FirstPersonController/Utility/LerpControlledBob.cs.meta b/Assets/Scripts/ThirdParty/FirstPersonController/Utility/LerpControlledBob.cs.meta similarity index 100% rename from Assets/Scripts/FirstPersonController/Utility/LerpControlledBob.cs.meta rename to Assets/Scripts/ThirdParty/FirstPersonController/Utility/LerpControlledBob.cs.meta diff --git a/Assets/Scripts/PhysicsTools.meta b/Assets/Scripts/ThirdParty/PhysicsTools.meta similarity index 100% rename from Assets/Scripts/PhysicsTools.meta rename to Assets/Scripts/ThirdParty/PhysicsTools.meta diff --git a/Assets/Scripts/PhysicsTools/Bezier.cs b/Assets/Scripts/ThirdParty/PhysicsTools/Bezier.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/Bezier.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/Bezier.cs diff --git a/Assets/Scripts/PhysicsTools/Bezier.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/Bezier.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/Bezier.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/Bezier.cs.meta diff --git a/Assets/Scripts/PhysicsTools/BoneSegment.cs b/Assets/Scripts/ThirdParty/PhysicsTools/BoneSegment.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/BoneSegment.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/BoneSegment.cs diff --git a/Assets/Scripts/PhysicsTools/BoneSegment.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/BoneSegment.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/BoneSegment.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/BoneSegment.cs.meta diff --git a/Assets/Scripts/PhysicsTools/ControlPoint.cs b/Assets/Scripts/ThirdParty/PhysicsTools/ControlPoint.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/ControlPoint.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/ControlPoint.cs diff --git a/Assets/Scripts/PhysicsTools/ControlPoint.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/ControlPoint.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/ControlPoint.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/ControlPoint.cs.meta diff --git a/Assets/Scripts/PhysicsTools/Joint.cs b/Assets/Scripts/ThirdParty/PhysicsTools/Joint.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/Joint.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/Joint.cs diff --git a/Assets/Scripts/PhysicsTools/Joint.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/Joint.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/Joint.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/Joint.cs.meta diff --git a/Assets/Scripts/PhysicsTools/JointProperties.cs b/Assets/Scripts/ThirdParty/PhysicsTools/JointProperties.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/JointProperties.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/JointProperties.cs diff --git a/Assets/Scripts/PhysicsTools/JointProperties.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/JointProperties.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/JointProperties.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/JointProperties.cs.meta diff --git a/Assets/Scripts/PhysicsTools/LinkMesh.cs b/Assets/Scripts/ThirdParty/PhysicsTools/LinkMesh.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/LinkMesh.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/LinkMesh.cs diff --git a/Assets/Scripts/PhysicsTools/LinkMesh.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/LinkMesh.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/LinkMesh.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/LinkMesh.cs.meta diff --git a/Assets/Scripts/PhysicsTools/PosOri.cs b/Assets/Scripts/ThirdParty/PhysicsTools/PosOri.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/PosOri.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/PosOri.cs diff --git a/Assets/Scripts/PhysicsTools/PosOri.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/PosOri.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/PosOri.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/PosOri.cs.meta diff --git a/Assets/Scripts/PhysicsTools/Rope.cs b/Assets/Scripts/ThirdParty/PhysicsTools/Rope.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/Rope.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/Rope.cs diff --git a/Assets/Scripts/PhysicsTools/Rope.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/Rope.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/Rope.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/Rope.cs.meta diff --git a/Assets/Scripts/PhysicsTools/SCapsulePos.cs b/Assets/Scripts/ThirdParty/PhysicsTools/SCapsulePos.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/SCapsulePos.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/SCapsulePos.cs diff --git a/Assets/Scripts/PhysicsTools/SCapsulePos.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/SCapsulePos.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/SCapsulePos.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/SCapsulePos.cs.meta diff --git a/Assets/Scripts/PhysicsTools/Segment.cs b/Assets/Scripts/ThirdParty/PhysicsTools/Segment.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/Segment.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/Segment.cs diff --git a/Assets/Scripts/PhysicsTools/Segment.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/Segment.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/Segment.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/Segment.cs.meta diff --git a/Assets/Scripts/PhysicsTools/SegmentProperties.cs b/Assets/Scripts/ThirdParty/PhysicsTools/SegmentProperties.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/SegmentProperties.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/SegmentProperties.cs diff --git a/Assets/Scripts/PhysicsTools/SegmentProperties.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/SegmentProperties.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/SegmentProperties.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/SegmentProperties.cs.meta diff --git a/Assets/Scripts/PhysicsTools/SegmentPropertiesBase.cs b/Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesBase.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/SegmentPropertiesBase.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesBase.cs diff --git a/Assets/Scripts/PhysicsTools/SegmentPropertiesBase.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesBase.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/SegmentPropertiesBase.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesBase.cs.meta diff --git a/Assets/Scripts/PhysicsTools/SegmentPropertiesBox.cs b/Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesBox.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/SegmentPropertiesBox.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesBox.cs diff --git a/Assets/Scripts/PhysicsTools/SegmentPropertiesBox.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesBox.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/SegmentPropertiesBox.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesBox.cs.meta diff --git a/Assets/Scripts/PhysicsTools/SegmentPropertiesCylinder.cs b/Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesCylinder.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/SegmentPropertiesCylinder.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesCylinder.cs diff --git a/Assets/Scripts/PhysicsTools/SegmentPropertiesCylinder.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesCylinder.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/SegmentPropertiesCylinder.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesCylinder.cs.meta diff --git a/Assets/Scripts/PhysicsTools/SerializedSoftJointLimitSpring.cs b/Assets/Scripts/ThirdParty/PhysicsTools/SerializedSoftJointLimitSpring.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/SerializedSoftJointLimitSpring.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/SerializedSoftJointLimitSpring.cs diff --git a/Assets/Scripts/PhysicsTools/SerializedSoftJointLimitSpring.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/SerializedSoftJointLimitSpring.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/SerializedSoftJointLimitSpring.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/SerializedSoftJointLimitSpring.cs.meta diff --git a/Assets/Scripts/PhysicsTools/Utility.cs b/Assets/Scripts/ThirdParty/PhysicsTools/Utility.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/Utility.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/Utility.cs diff --git a/Assets/Scripts/PhysicsTools/Utility.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/Utility.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/Utility.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/Utility.cs.meta diff --git a/Assets/Scripts/PhysicsTools/Winch.cs b/Assets/Scripts/ThirdParty/PhysicsTools/Winch.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/Winch.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/Winch.cs diff --git a/Assets/Scripts/PhysicsTools/Winch.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/Winch.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/Winch.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/Winch.cs.meta diff --git a/Assets/Scripts/Commands.meta b/Assets/Scripts/ThirdParty/Steamworks.NET.meta similarity index 77% rename from Assets/Scripts/Commands.meta rename to Assets/Scripts/ThirdParty/Steamworks.NET.meta index f2c0d0a19..e892a2aae 100644 --- a/Assets/Scripts/Commands.meta +++ b/Assets/Scripts/ThirdParty/Steamworks.NET.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1cf04fd3e4bfe814d8ec9c601994a942 +guid: 62ddefd95a62cbc4ea1a2aabc009a378 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Steamworks.NET/SteamManager.cs b/Assets/Scripts/ThirdParty/Steamworks.NET/SteamManager.cs similarity index 100% rename from Assets/Scripts/Steamworks.NET/SteamManager.cs rename to Assets/Scripts/ThirdParty/Steamworks.NET/SteamManager.cs diff --git a/Assets/Scripts/Steamworks.NET/SteamManager.cs.meta b/Assets/Scripts/ThirdParty/Steamworks.NET/SteamManager.cs.meta similarity index 100% rename from Assets/Scripts/Steamworks.NET/SteamManager.cs.meta rename to Assets/Scripts/ThirdParty/Steamworks.NET/SteamManager.cs.meta diff --git a/Assets/Scripts/UI/Loading/Loading.cs b/Assets/Scripts/UI/Loading/Loading.cs index 199d42514..9afa2dfb3 100644 --- a/Assets/Scripts/UI/Loading/Loading.cs +++ b/Assets/Scripts/UI/Loading/Loading.cs @@ -4,36 +4,36 @@ namespace NBF { public static class Loading { - /// - /// 显示loading - /// - /// 加载任务链 - /// 样式 - /// 开始进度 - public static void Show(NTask task = null, int style = 0, int startProgress = 0) - { - if (task != null) - { - //如果传入了任务进度 - LoadingPanel.LoadingTask.Add(task); - } - else - { - var waitTask = new LoadingWaitTask(); - waitTask.Run(DefRunner.Scheduler); - LoadingPanel.LoadingTask.Add(waitTask); - } - - var panel = App.UI.GetUI(); - if (panel is not { IsShowing: true }) - { - LoadingPanel.Show(new LoadingShowParam(style, startProgress)); - } - } - - public static void Hide() - { - LoadingPanel.LoadingTask.TryEnd(); - } + // /// + // /// 显示loading + // /// + // /// 加载任务链 + // /// 样式 + // /// 开始进度 + // public static void Show(NTask task = null, int style = 0, int startProgress = 0) + // { + // if (task != null) + // { + // //如果传入了任务进度 + // LoadingPanel.LoadingTask.Add(task); + // } + // else + // { + // var waitTask = new LoadingWaitTask(); + // waitTask.Run(DefRunner.Scheduler); + // LoadingPanel.LoadingTask.Add(waitTask); + // } + // + // var panel = App.UI.GetUI(); + // if (panel is not { IsShowing: true }) + // { + // LoadingPanel.Show(new LoadingShowParam(style, startProgress)); + // } + // } + // + // public static void Hide() + // { + // LoadingPanel.LoadingTask.TryEnd(); + // } } } \ No newline at end of file