From e41fd7dd2df85bde6b93c38501f78a6b5cfde0ee Mon Sep 17 00:00:00 2001 From: BobSong <605277374@qq.com> Date: Mon, 25 Aug 2025 00:10:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=9B=B8=E5=85=B3=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9=E5=92=8C=E7=BB=84=E4=BB=B6=E5=AE=9A?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/config/ConfigAssets.asset | 377 ------------------ Assets/Scripts/Configs/Gen.meta | 4 +- .../Scripts/Configs/Gen/ConfigAssets.Gen.cs | 111 +++--- .../Configs/Gen/ConfigAssets.Gen.cs.meta | 3 +- Assets/Scripts/Configs/Gen/Warps.meta | 4 +- .../{GameFloatsWarp.cs => BaitConfigWarp.cs} | 24 +- .../Configs/Gen/Warps/BaitConfigWarp.cs.meta | 2 + ...GameFeedersWarp.cs => BobberConfigWarp.cs} | 24 +- .../Gen/Warps/BobberConfigWarp.cs.meta | 2 + .../Configs/Gen/Warps/FeederConfigWarp.cs | 65 +++ .../Gen/Warps/FeederConfigWarp.cs.meta | 2 + ...meLinesWarp.cs => FishAcceptConfigWarp.cs} | 24 +- .../Gen/Warps/FishAcceptConfigWarp.cs.meta | 2 + .../{GameHooksWarp.cs => FishConfigWarp.cs} | 24 +- .../Configs/Gen/Warps/FishConfigWarp.cs.meta | 2 + .../Configs/Gen/Warps/GameBaitsWarp.cs.meta | 2 - .../Configs/Gen/Warps/GameFeedersWarp.cs.meta | 2 - .../Configs/Gen/Warps/GameFishAcceptsWarp.cs | 65 --- .../Gen/Warps/GameFishAcceptsWarp.cs.meta | 2 - .../Configs/Gen/Warps/GameFishWarp.cs.meta | 2 - .../Configs/Gen/Warps/GameFloatsWarp.cs.meta | 2 - .../Configs/Gen/Warps/GameHooksWarp.cs.meta | 2 - .../Configs/Gen/Warps/GameLeadersWarp.cs | 65 --- .../Configs/Gen/Warps/GameLeadersWarp.cs.meta | 2 - .../Configs/Gen/Warps/GameLinesWarp.cs.meta | 2 - .../Configs/Gen/Warps/GameLuresWarp.cs | 65 --- .../Configs/Gen/Warps/GameLuresWarp.cs.meta | 2 - .../Configs/Gen/Warps/GameReelsWarp.cs | 65 --- .../Configs/Gen/Warps/GameReelsWarp.cs.meta | 2 - .../Configs/Gen/Warps/GameRingsWarp.cs | 65 --- .../Configs/Gen/Warps/GameRingsWarp.cs.meta | 2 - .../Configs/Gen/Warps/GameRodsWarp.cs.meta | 2 - .../Configs/Gen/Warps/GameWeightsWarp.cs | 65 --- .../Configs/Gen/Warps/GameWeightsWarp.cs.meta | 2 - .../{GameFishWarp.cs => HookConfigWarp.cs} | 24 +- .../Configs/Gen/Warps/HookConfigWarp.cs.meta | 2 + .../{GameRodsWarp.cs => LeadersConfigWarp.cs} | 24 +- .../Gen/Warps/LeadersConfigWarp.cs.meta | 2 + .../Configs/Gen/Warps/LineConfigWarp.cs | 65 +++ .../Configs/Gen/Warps/LineConfigWarp.cs.meta | 2 + .../Configs/Gen/Warps/LureConfigWarp.cs | 65 +++ .../Configs/Gen/Warps/LureConfigWarp.cs.meta | 2 + .../Configs/Gen/Warps/ReelConfigWarp.cs | 65 +++ .../Configs/Gen/Warps/ReelConfigWarp.cs.meta | 2 + .../Configs/Gen/Warps/RingConfigWarp.cs | 65 +++ .../Configs/Gen/Warps/RingConfigWarp.cs.meta | 2 + .../{GameBaitsWarp.cs => RodConfigWarp.cs} | 24 +- .../Configs/Gen/Warps/RodConfigWarp.cs.meta | 2 + .../Configs/Gen/Warps/UnitConfigWarp.cs | 65 +++ .../Configs/Gen/Warps/UnitConfigWarp.cs.meta | 2 + .../Configs/Gen/Warps/WeightConfigWarp.cs | 65 +++ .../Gen/Warps/WeightConfigWarp.cs.meta | 2 + .../Mem/{GameBaits.cs => BaitConfig.cs} | 10 +- .../{GameBaits.cs.meta => BaitConfig.cs.meta} | 0 .../Mem/{GameFloats.cs => BobberConfig.cs} | 2 +- ...ameFloats.cs.meta => BobberConfig.cs.meta} | 0 .../Mem/{GameFeeders.cs => FeederConfig.cs} | 2 +- ...meFeeders.cs.meta => FeederConfig.cs.meta} | 0 ...GameFishAccepts.cs => FishAcceptConfig.cs} | 2 +- ...cepts.cs.meta => FishAcceptConfig.cs.meta} | 0 .../Mem/{GameFish.cs => FishConfig.cs} | 4 +- .../{GameFish.cs.meta => FishConfig.cs.meta} | 0 .../Mem/{GameHooks.cs => HookConfig.cs} | 2 +- .../{GameHooks.cs.meta => HookConfig.cs.meta} | 0 .../Mem/{GameLeaders.cs => LeadersConfig.cs} | 12 +- ...eLeaders.cs.meta => LeadersConfig.cs.meta} | 0 .../Mem/{GameLines.cs => LineConfig.cs} | 2 +- .../{GameLines.cs.meta => LineConfig.cs.meta} | 0 .../Mem/{GameLures.cs => LureConfig.cs} | 4 +- .../{GameLures.cs.meta => LureConfig.cs.meta} | 0 .../Mem/{GameReels.cs => ReelConfig.cs} | 2 +- .../{GameReels.cs.meta => ReelConfig.cs.meta} | 0 .../Mem/{GameRings.cs => RingConfig.cs} | 2 +- .../{GameRings.cs.meta => RingConfig.cs.meta} | 0 .../Configs/Mem/{GameRods.cs => RodConfig.cs} | 2 +- .../{GameRods.cs.meta => RodConfig.cs.meta} | 0 .../UnitType.cs => Configs/Mem/UnitConfig.cs} | 8 +- Assets/Scripts/Configs/Mem/UnitConfig.cs.meta | 3 + .../Mem/{GameWeights.cs => WeightConfig.cs} | 2 +- ...meWeights.cs.meta => WeightConfig.cs.meta} | 0 Assets/Scripts/Fishing2/Data.meta | 4 +- Assets/Scripts/Fishing2/Data/Carrier.meta | 3 + .../Scripts/Fishing2/Data/Gear/Configs.meta | 3 - Assets/Scripts/Fishing2/Data/Map.meta | 3 + Assets/Scripts/Fishing2/Data/Map/Map.cs | 19 + Assets/Scripts/Fishing2/Data/Map/Map.cs.meta | 3 + .../Fishing2/Data/{ => Unit}/Gear.meta | 0 .../Fishing2/Data/Unit/Gear/Child.meta | 3 + .../Data/Unit/Gear/Child/GearBaitComponent.cs | 9 + .../Unit/Gear/Child/GearBaitComponent.cs.meta | 3 + .../Unit/Gear/Child/GearBobberComponent.cs | 9 + .../Gear/Child/GearBobberComponent.cs.meta | 3 + .../Data/Unit/Gear/Child/GearHookComponent.cs | 9 + .../Unit/Gear/Child/GearHookComponent.cs.meta | 3 + .../Data/Unit/Gear/Child/GearLineComponent.cs | 9 + .../Unit/Gear/Child/GearLineComponent.cs.meta | 3 + .../Data/Unit/Gear/Child/GearLureComponent.cs | 9 + .../Unit/Gear/Child/GearLureComponent.cs.meta | 3 + .../Data/Unit/Gear/Child/GearReelComponent.cs | 9 + .../Unit/Gear/Child/GearReelComponent.cs.meta | 3 + .../Data/Unit/Gear/Child/GearRodComponent.cs | 9 + .../Unit/Gear/Child/GearRodComponent.cs.meta | 3 + .../Unit/Gear/Child/GearWeightComponent.cs | 9 + .../Gear/Child/GearWeightComponent.cs.meta | 3 + .../Data/{ => Unit}/Gear/UnitGearComponent.cs | 7 +- .../{ => Unit}/Gear/UnitGearComponent.cs.meta | 0 Assets/Scripts/Fishing2/Data/Unit/Parts.meta | 3 + .../Unit/Parts/UnitFlashlightComponent.cs | 15 + .../Parts/UnitFlashlightComponent.cs.meta | 3 + Assets/Scripts/Fishing2/Data/Unit/Skin.meta | 3 + .../Data/Unit/Skin/UnitSkinComponent.cs | 11 + .../Data/Unit/Skin/UnitSkinComponent.cs.meta | 3 + Assets/Scripts/Fishing2/Data/Unit/Unit.cs | 3 + .../Fishing2/Data/Unit/UnitType.cs.meta | 3 - Assets/Scripts/Fishing2/System.meta | 3 + Assets/Scripts/Fishing2/System/Data.meta | 3 + .../Scripts/Fishing2/System/Data/MapSystem.cs | 43 ++ .../Fishing2/System/Data/MapSystem.cs.meta | 3 + .../Fishing2/System/Data/UnitSystem.cs | 15 + .../Fishing2/System/Data/UnitSystem.cs.meta | 3 + Assets/Scripts/Fishing2/System/Views.meta | 3 + .../System/Views/UnitUnityComponentSystem.cs | 35 ++ .../Views/UnitUnityComponentSystem.cs.meta | 3 + .../Fishing2/{Player.meta => Views.meta} | 0 .../Fishing2/{Player => Views}/Unit.meta | 0 .../Unit/UnitHUDComponent.cs | 0 .../Unit/UnitHUDComponent.cs.meta | 0 .../Unit/UnitUnityComponent.cs | 7 +- .../Unit/UnitUnityComponent.cs.meta | 0 Assets/Scripts/UI/Login/LoginHelper.cs | 3 + Assets/Scripts/UI/Login/LoginPanel.cs | 9 +- Config/fish-鱼.xlsx | Bin 34122 -> 34218 bytes Config/fishing gear-渔具.xlsx | Bin 61975 -> 64945 bytes Config/unit - 单位.xlsx | Bin 0 -> 34051 bytes Fishing2.sln.DotSettings.user | 1 + ProjectSettings/QualitySettings.asset | 2 +- 136 files changed, 962 insertions(+), 981 deletions(-) rename Assets/Scripts/Configs/Gen/Warps/{GameFloatsWarp.cs => BaitConfigWarp.cs} (54%) create mode 100644 Assets/Scripts/Configs/Gen/Warps/BaitConfigWarp.cs.meta rename Assets/Scripts/Configs/Gen/Warps/{GameFeedersWarp.cs => BobberConfigWarp.cs} (52%) create mode 100644 Assets/Scripts/Configs/Gen/Warps/BobberConfigWarp.cs.meta create mode 100644 Assets/Scripts/Configs/Gen/Warps/FeederConfigWarp.cs create mode 100644 Assets/Scripts/Configs/Gen/Warps/FeederConfigWarp.cs.meta rename Assets/Scripts/Configs/Gen/Warps/{GameLinesWarp.cs => FishAcceptConfigWarp.cs} (50%) create mode 100644 Assets/Scripts/Configs/Gen/Warps/FishAcceptConfigWarp.cs.meta rename Assets/Scripts/Configs/Gen/Warps/{GameHooksWarp.cs => FishConfigWarp.cs} (53%) create mode 100644 Assets/Scripts/Configs/Gen/Warps/FishConfigWarp.cs.meta delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameBaitsWarp.cs.meta delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameFeedersWarp.cs.meta delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameFishAcceptsWarp.cs delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameFishAcceptsWarp.cs.meta delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameFishWarp.cs.meta delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameFloatsWarp.cs.meta delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameHooksWarp.cs.meta delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameLeadersWarp.cs delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameLeadersWarp.cs.meta delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameLinesWarp.cs.meta delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameLuresWarp.cs delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameLuresWarp.cs.meta delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameReelsWarp.cs delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameReelsWarp.cs.meta delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameRingsWarp.cs delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameRingsWarp.cs.meta delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameRodsWarp.cs.meta delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameWeightsWarp.cs delete mode 100644 Assets/Scripts/Configs/Gen/Warps/GameWeightsWarp.cs.meta rename Assets/Scripts/Configs/Gen/Warps/{GameFishWarp.cs => HookConfigWarp.cs} (53%) create mode 100644 Assets/Scripts/Configs/Gen/Warps/HookConfigWarp.cs.meta rename Assets/Scripts/Configs/Gen/Warps/{GameRodsWarp.cs => LeadersConfigWarp.cs} (52%) create mode 100644 Assets/Scripts/Configs/Gen/Warps/LeadersConfigWarp.cs.meta create mode 100644 Assets/Scripts/Configs/Gen/Warps/LineConfigWarp.cs create mode 100644 Assets/Scripts/Configs/Gen/Warps/LineConfigWarp.cs.meta create mode 100644 Assets/Scripts/Configs/Gen/Warps/LureConfigWarp.cs create mode 100644 Assets/Scripts/Configs/Gen/Warps/LureConfigWarp.cs.meta create mode 100644 Assets/Scripts/Configs/Gen/Warps/ReelConfigWarp.cs create mode 100644 Assets/Scripts/Configs/Gen/Warps/ReelConfigWarp.cs.meta create mode 100644 Assets/Scripts/Configs/Gen/Warps/RingConfigWarp.cs create mode 100644 Assets/Scripts/Configs/Gen/Warps/RingConfigWarp.cs.meta rename Assets/Scripts/Configs/Gen/Warps/{GameBaitsWarp.cs => RodConfigWarp.cs} (54%) create mode 100644 Assets/Scripts/Configs/Gen/Warps/RodConfigWarp.cs.meta create mode 100644 Assets/Scripts/Configs/Gen/Warps/UnitConfigWarp.cs create mode 100644 Assets/Scripts/Configs/Gen/Warps/UnitConfigWarp.cs.meta create mode 100644 Assets/Scripts/Configs/Gen/Warps/WeightConfigWarp.cs create mode 100644 Assets/Scripts/Configs/Gen/Warps/WeightConfigWarp.cs.meta rename Assets/Scripts/Configs/Mem/{GameBaits.cs => BaitConfig.cs} (92%) rename Assets/Scripts/Configs/Mem/{GameBaits.cs.meta => BaitConfig.cs.meta} (100%) rename Assets/Scripts/Configs/Mem/{GameFloats.cs => BobberConfig.cs} (89%) rename Assets/Scripts/Configs/Mem/{GameFloats.cs.meta => BobberConfig.cs.meta} (100%) rename Assets/Scripts/Configs/Mem/{GameFeeders.cs => FeederConfig.cs} (86%) rename Assets/Scripts/Configs/Mem/{GameFeeders.cs.meta => FeederConfig.cs.meta} (100%) rename Assets/Scripts/Configs/Mem/{GameFishAccepts.cs => FishAcceptConfig.cs} (72%) rename Assets/Scripts/Configs/Mem/{GameFishAccepts.cs.meta => FishAcceptConfig.cs.meta} (100%) rename Assets/Scripts/Configs/Mem/{GameFish.cs => FishConfig.cs} (96%) rename Assets/Scripts/Configs/Mem/{GameFish.cs.meta => FishConfig.cs.meta} (100%) rename Assets/Scripts/Configs/Mem/{GameHooks.cs => HookConfig.cs} (98%) rename Assets/Scripts/Configs/Mem/{GameHooks.cs.meta => HookConfig.cs.meta} (100%) rename Assets/Scripts/Configs/Mem/{GameLeaders.cs => LeadersConfig.cs} (56%) rename Assets/Scripts/Configs/Mem/{GameLeaders.cs.meta => LeadersConfig.cs.meta} (100%) rename Assets/Scripts/Configs/Mem/{GameLines.cs => LineConfig.cs} (89%) rename Assets/Scripts/Configs/Mem/{GameLines.cs.meta => LineConfig.cs.meta} (100%) rename Assets/Scripts/Configs/Mem/{GameLures.cs => LureConfig.cs} (96%) rename Assets/Scripts/Configs/Mem/{GameLures.cs.meta => LureConfig.cs.meta} (100%) rename Assets/Scripts/Configs/Mem/{GameReels.cs => ReelConfig.cs} (90%) rename Assets/Scripts/Configs/Mem/{GameReels.cs.meta => ReelConfig.cs.meta} (100%) rename Assets/Scripts/Configs/Mem/{GameRings.cs => RingConfig.cs} (53%) rename Assets/Scripts/Configs/Mem/{GameRings.cs.meta => RingConfig.cs.meta} (100%) rename Assets/Scripts/Configs/Mem/{GameRods.cs => RodConfig.cs} (92%) rename Assets/Scripts/Configs/Mem/{GameRods.cs.meta => RodConfig.cs.meta} (100%) rename Assets/Scripts/{Fishing2/Data/Unit/UnitType.cs => Configs/Mem/UnitConfig.cs} (72%) create mode 100644 Assets/Scripts/Configs/Mem/UnitConfig.cs.meta rename Assets/Scripts/Configs/Mem/{GameWeights.cs => WeightConfig.cs} (88%) rename Assets/Scripts/Configs/Mem/{GameWeights.cs.meta => WeightConfig.cs.meta} (100%) create mode 100644 Assets/Scripts/Fishing2/Data/Carrier.meta delete mode 100644 Assets/Scripts/Fishing2/Data/Gear/Configs.meta create mode 100644 Assets/Scripts/Fishing2/Data/Map.meta create mode 100644 Assets/Scripts/Fishing2/Data/Map/Map.cs create mode 100644 Assets/Scripts/Fishing2/Data/Map/Map.cs.meta rename Assets/Scripts/Fishing2/Data/{ => Unit}/Gear.meta (100%) create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Gear/Child.meta create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs.meta create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs.meta create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs.meta create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs.meta create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs.meta create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs.meta create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs.meta create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs.meta rename Assets/Scripts/Fishing2/Data/{ => Unit}/Gear/UnitGearComponent.cs (81%) rename Assets/Scripts/Fishing2/Data/{ => Unit}/Gear/UnitGearComponent.cs.meta (100%) create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Parts.meta create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs.meta create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Skin.meta create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs create mode 100644 Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs.meta delete mode 100644 Assets/Scripts/Fishing2/Data/Unit/UnitType.cs.meta create mode 100644 Assets/Scripts/Fishing2/System.meta create mode 100644 Assets/Scripts/Fishing2/System/Data.meta create mode 100644 Assets/Scripts/Fishing2/System/Data/MapSystem.cs create mode 100644 Assets/Scripts/Fishing2/System/Data/MapSystem.cs.meta create mode 100644 Assets/Scripts/Fishing2/System/Data/UnitSystem.cs create mode 100644 Assets/Scripts/Fishing2/System/Data/UnitSystem.cs.meta create mode 100644 Assets/Scripts/Fishing2/System/Views.meta create mode 100644 Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs create mode 100644 Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs.meta rename Assets/Scripts/Fishing2/{Player.meta => Views.meta} (100%) rename Assets/Scripts/Fishing2/{Player => Views}/Unit.meta (100%) rename Assets/Scripts/Fishing2/{Player => Views}/Unit/UnitHUDComponent.cs (100%) rename Assets/Scripts/Fishing2/{Player => Views}/Unit/UnitHUDComponent.cs.meta (100%) rename Assets/Scripts/Fishing2/{Player => Views}/Unit/UnitUnityComponent.cs (70%) rename Assets/Scripts/Fishing2/{Player => Views}/Unit/UnitUnityComponent.cs.meta (100%) create mode 100644 Config/unit - 单位.xlsx diff --git a/Assets/Resources/config/ConfigAssets.asset b/Assets/Resources/config/ConfigAssets.asset index b89006ec7..a1f78b2ce 100644 --- a/Assets/Resources/config/ConfigAssets.asset +++ b/Assets/Resources/config/ConfigAssets.asset @@ -12,380 +12,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3d8691ef03f74aedb6cfd67e53cf664f, type: 3} m_Name: ConfigAssets m_EditorClassIdentifier: - GameBaitsArr: - - name: NAME_50001 - id: 500001 - modelPath: baits/worm_01/worm_01 - group: 0 - type: 0 - acceptFish: - weightFishAccept: {x: 0, y: 3} - weight: 2.5 - lenght: 0 - amount: 1 - Level: 1 - - name: NAME_50001 - id: 500002 - modelPath: baits/fly/fly - group: 0 - type: 0 - acceptFish: - weightFishAccept: {x: 0, y: 3} - weight: 2.5 - lenght: 0 - amount: 1 - Level: 1 - - name: NAME_50001 - id: 500003 - modelPath: baits/black_leech/black_leech - group: 0 - type: 0 - acceptFish: - weightFishAccept: {x: 0, y: 3} - weight: 2.5 - lenght: 0 - amount: 1 - Level: 1 - - name: NAME_50001 - id: 500004 - modelPath: baits/bread/bread - group: 0 - type: 0 - acceptFish: - weightFishAccept: {x: 0, y: 3} - weight: 2.5 - lenght: 0 - amount: 1 - Level: 1 - GameFeedersArr: - - name: NAME_90001 - id: 900001 - modelPath: Feeders/Feeder 1/FeedTrash 1 - group: 0 - type: 0 - weight: 5 - capacity: 100 - Level: 1 - amount: 1 - GameFishAcceptsArr: - - name: - id: 2100001 - bait: 500189 - min: 0.3 - max: 26 - - name: - id: 2100001 - bait: 500135 - min: 0.3 - max: 25 - GameFishArr: - - name: NAME_900001 - id: 210001 - speciesName: 10 - isEnabled: 1 - type: 0 - maxWeight: 34 - speciesCoins: 4 - rankingPoint: 1 - modelPath: - - Burbot_B - imagePath: [] - modelTrophyPath: [] - weightLenghtValues: [] - weightLengthCurve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - acceptFishBaits: [] - acceptFishLures: [] - - name: NAME_900002 - id: 210002 - speciesName: 11 - isEnabled: 1 - type: 0 - maxWeight: 40 - speciesCoins: 4 - rankingPoint: 1 - modelPath: - - CarpCommon_B - imagePath: [] - modelTrophyPath: [] - weightLenghtValues: [] - weightLengthCurve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - acceptFishBaits: [] - acceptFishLures: [] - - name: NAME_900003 - id: 210003 - speciesName: 14 - isEnabled: 1 - type: 0 - maxWeight: 45 - speciesCoins: 4 - rankingPoint: 1 - modelPath: - - CarpGrass_B - imagePath: [] - modelTrophyPath: [] - weightLenghtValues: [] - weightLengthCurve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - acceptFishBaits: [] - acceptFishLures: [] - - name: NAME_900004 - id: 210004 - speciesName: 16 - isEnabled: 1 - type: 0 - maxWeight: 3 - speciesCoins: 4 - rankingPoint: 1 - modelPath: - - CarpCrucian_B - imagePath: [] - modelTrophyPath: [] - weightLenghtValues: [] - weightLengthCurve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - acceptFishBaits: [] - acceptFishLures: [] - GameFloatsArr: - - name: NAME_30001 - id: 300001 - modelPath: bobbers/expressfishing/bob_25003/bob_25003 - group: 0 - type: 2 - weight: 0.5 - displacement: 3 - isNightLight: 0 - Level: 1 - amount: 1 - - name: NAME_30002 - id: 300002 - modelPath: bobbers/expressfishing/bob_25162_25163/bob_25162 - group: 0 - type: 0 - weight: 0.8 - displacement: 3 - isNightLight: 0 - Level: 1 - amount: 1 - - name: NAME_30003 - id: 300003 - modelPath: bobbers/expressfishing/bob_25166_25167/bob_25166 - group: 0 - type: 0 - weight: 0.8 - displacement: 3 - isNightLight: 0 - Level: 1 - amount: 1 - - name: NAME_30003 - id: 300004 - modelPath: bobbers/expressfishing/bob_25001/bob_25001 - group: 0 - type: 0 - weight: 0.8 - displacement: 3 - isNightLight: 0 - Level: 1 - amount: 1 - GameHooksArr: - - name: HOOK_NAME_70001 - id: 700001 - modelPath: hooks/alliance/c_hook_20789_20794/c_hook_20789 - group: 0 - color: Nickel - type: 1 - zadzior: 1 - size: 1 - amount: 1 - Level: 1 - - name: HOOK_NAME_71001 - id: 700102 - modelPath: hooks/berserk_hooks/triple_20569_20577/triple_20569 - group: 0 - color: Nickel - type: 1 - zadzior: 1 - size: 1 - amount: 1 - Level: 1 - GameLeadersArr: - - name: "UFA\xA9 Leader 0.14/3kg" - id: 0 - modelPath: Leaders/Leader 2/ - group: 0 - type: 0 - strength: 2.5 - size: 0.15 - Level: 1 - amount: 1 - - name: "UFA\xA9 Leader 0.18/4kg" - id: 1 - modelPath: Leaders/Leader 3/ - group: 0 - type: 2 - strength: 5 - size: 0.18 - Level: 4 - amount: 1 - - name: "UFA\xA9 Leader 0.2/10kg" - id: 2 - modelPath: Leaders/Leader 1/ - group: 0 - type: 0 - strength: 8 - size: 0.2 - Level: 7 - amount: 1 - GameLinesArr: - - name: NAME_40001 - id: 400001 - modelPath: Lines/UFE Mono/UFE monoClear - group: 0 - type: 0 - length: 75 - strength: 1.51 - size: 0.12 - Level: 1 - - name: NAME_40002 - id: 400002 - modelPath: Lines/UFE Mono/UFE monoClear - group: 0 - type: 0 - length: 75 - strength: 2.51 - size: 0.16 - Level: 1 - GameLuresArr: - - name: NAME_60001 - id: 600001 - modelPath: lures/express_fishing/crankbaits_1/775/crankbaits_775 - group: 0 - type: 0 - acceptFish: - weightFishAccept: {x: 0, y: 3} - weight: 5.3 - lenght: 80 - amount: 0 - Level: 1 - hook: c6ae0a00 - - name: NAME_60001 - id: 600002 - modelPath: lures/express_fishing/poppers_1/poppers_590/poppers_590 - group: 0 - type: 0 - acceptFish: - weightFishAccept: {x: 0, y: 3} - weight: 5.3 - lenght: 80 - amount: 0 - Level: 1 - hook: c6ae0a00 - - name: NAME_60001 - id: 600003 - modelPath: lures/express_fishing/softplastic/ef_supergrab_6/softplastic_g_1622 - group: 0 - type: 0 - acceptFish: - weightFishAccept: {x: 0, y: 3} - weight: 5.3 - lenght: 80 - amount: 0 - Level: 1 - hook: - - name: NAME_60001 - id: 600004 - modelPath: lures/express_fishing/softplastic/ef_superminnow_6/softplastic_m_1634 - group: 0 - type: 0 - acceptFish: - weightFishAccept: {x: 0, y: 3} - weight: 5.3 - lenght: 80 - amount: 0 - Level: 1 - hook: - GameReelsArr: - - name: NAME_20001 - id: 200001 - modelPath: reels/syberia/spin_5002/spin_5002 - group: 0 - type: 0 - strength: 3 - gearRatio: {x: 6.2, y: 1} - size: 2000 - Level: 1 - - name: NAME_20002 - id: 200002 - modelPath: reels/syberia/spin_5036/spin_5036 - group: 0 - type: 0 - strength: 4.5 - gearRatio: {x: 6.2, y: 1} - size: 2000 - Level: 1 - GameRingsArr: - - name: NAME_110001 - id: 1100001 - modelPath: rod_rings/rumoi/rumoi_oxiline_spin - group: 0 - - name: NAME_110002 - id: 1100002 - modelPath: rod_rings/smt/smt_pure_ceramic_bolo - group: 0 - GameRodsArr: - - name: NAME_10001 - id: 100001 - modelPath: rods/syberia/tele_10037/tele_10037_t13 - group: 0 - type: 1 - length: 3,7 - weight: 250 - strength: 40.82 - maxRange: 67 - ring: 0 - - name: NAME_10002 - id: 100002 - modelPath: rods/syberia/bolo_10021/bolo_10021_LB400 - group: 0 - type: 0 - length: 2,5 - weight: 120 - strength: 1.59 - maxRange: 30 - ring: 1100002 - - name: NAME_10003 - id: 100003 - modelPath: rods/syberia/spin_10034/spin_10034_S60H - group: 0 - type: 0 - length: 2,5 - weight: 120 - strength: 1.59 - maxRange: 30 - ring: 1100001 - GameWeightsArr: - - name: NAME_80001 - id: 800001 - modelPath: Weights/Weight2_5g - group: 0 - type: 0 - weight: 3 - Level: 1 - amount: 1 diff --git a/Assets/Scripts/Configs/Gen.meta b/Assets/Scripts/Configs/Gen.meta index fc407a550..0dc52f34e 100644 --- a/Assets/Scripts/Configs/Gen.meta +++ b/Assets/Scripts/Configs/Gen.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: cdd407e78a9044de9d73e25de68285ba -timeCreated: 1742999805 \ No newline at end of file +guid: 0eceaba126fb407583191d01e32bb735 +timeCreated: 1756050728 \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/ConfigAssets.Gen.cs b/Assets/Scripts/Configs/Gen/ConfigAssets.Gen.cs index 3b436ebd2..63afd189c 100644 --- a/Assets/Scripts/Configs/Gen/ConfigAssets.Gen.cs +++ b/Assets/Scripts/Configs/Gen/ConfigAssets.Gen.cs @@ -10,106 +10,113 @@ namespace NBF { public partial class ConfigAssets { - public List GameBaitsArr; - public List GameFeedersArr; - public List GameFishAcceptsArr; - public List GameFishArr; - public List GameFloatsArr; - public List GameHooksArr; - public List GameLeadersArr; - public List GameLinesArr; - public List GameLuresArr; - public List GameReelsArr; - public List GameRingsArr; - public List GameRodsArr; - public List GameWeightsArr; + public List BaitConfigArr; + public List BobberConfigArr; + public List FeederConfigArr; + public List FishAcceptConfigArr; + public List FishConfigArr; + public List HookConfigArr; + public List LeadersConfigArr; + public List LineConfigArr; + public List LureConfigArr; + public List ReelConfigArr; + public List RingConfigArr; + public List RodConfigArr; + public List UnitConfigArr; + public List WeightConfigArr; public void Parse(JToken[] arr, Type type) { var tableNameAttribute = type.GetCustomAttribute(); if (tableNameAttribute == null) return; - if (type == typeof(GameBaits)) + if (type == typeof(BaitConfig)) { - GameBaitsArr = ParseLine(arr, tableNameAttribute); + BaitConfigArr = ParseLine(arr, tableNameAttribute); } - if (type == typeof(GameFeeders)) + if (type == typeof(BobberConfig)) { - GameFeedersArr = ParseLine(arr, tableNameAttribute); + BobberConfigArr = ParseLine(arr, tableNameAttribute); } - if (type == typeof(GameFishAccepts)) + if (type == typeof(FeederConfig)) { - GameFishAcceptsArr = ParseLine(arr, tableNameAttribute); + FeederConfigArr = ParseLine(arr, tableNameAttribute); } - if (type == typeof(GameFish)) + if (type == typeof(FishAcceptConfig)) { - GameFishArr = ParseLine(arr, tableNameAttribute); + FishAcceptConfigArr = ParseLine(arr, tableNameAttribute); } - if (type == typeof(GameFloats)) + if (type == typeof(FishConfig)) { - GameFloatsArr = ParseLine(arr, tableNameAttribute); + FishConfigArr = ParseLine(arr, tableNameAttribute); } - if (type == typeof(GameHooks)) + if (type == typeof(HookConfig)) { - GameHooksArr = ParseLine(arr, tableNameAttribute); + HookConfigArr = ParseLine(arr, tableNameAttribute); } - if (type == typeof(GameLeaders)) + if (type == typeof(LeadersConfig)) { - GameLeadersArr = ParseLine(arr, tableNameAttribute); + LeadersConfigArr = ParseLine(arr, tableNameAttribute); } - if (type == typeof(GameLines)) + if (type == typeof(LineConfig)) { - GameLinesArr = ParseLine(arr, tableNameAttribute); + LineConfigArr = ParseLine(arr, tableNameAttribute); } - if (type == typeof(GameLures)) + if (type == typeof(LureConfig)) { - GameLuresArr = ParseLine(arr, tableNameAttribute); + LureConfigArr = ParseLine(arr, tableNameAttribute); } - if (type == typeof(GameReels)) + if (type == typeof(ReelConfig)) { - GameReelsArr = ParseLine(arr, tableNameAttribute); + ReelConfigArr = ParseLine(arr, tableNameAttribute); } - if (type == typeof(GameRings)) + if (type == typeof(RingConfig)) { - GameRingsArr = ParseLine(arr, tableNameAttribute); + RingConfigArr = ParseLine(arr, tableNameAttribute); } - if (type == typeof(GameRods)) + if (type == typeof(RodConfig)) { - GameRodsArr = ParseLine(arr, tableNameAttribute); + RodConfigArr = ParseLine(arr, tableNameAttribute); } - if (type == typeof(GameWeights)) + if (type == typeof(UnitConfig)) { - GameWeightsArr = ParseLine(arr, tableNameAttribute); + UnitConfigArr = ParseLine(arr, tableNameAttribute); + } + + if (type == typeof(WeightConfig)) + { + WeightConfigArr = ParseLine(arr, tableNameAttribute); } } public void AssociationContexts() { - new ConfigContext().Association(GameBaitsArr); - new ConfigContext().Association(GameFeedersArr); - new ConfigContext().Association(GameFishAcceptsArr); - new ConfigContext().Association(GameFishArr); - new ConfigContext().Association(GameFloatsArr); - new ConfigContext().Association(GameHooksArr); - new ConfigContext().Association(GameLeadersArr); - new ConfigContext().Association(GameLinesArr); - new ConfigContext().Association(GameLuresArr); - new ConfigContext().Association(GameReelsArr); - new ConfigContext().Association(GameRingsArr); - new ConfigContext().Association(GameRodsArr); - new ConfigContext().Association(GameWeightsArr); + new ConfigContext().Association(BaitConfigArr); + new ConfigContext().Association(BobberConfigArr); + new ConfigContext().Association(FeederConfigArr); + new ConfigContext().Association(FishAcceptConfigArr); + new ConfigContext().Association(FishConfigArr); + new ConfigContext().Association(HookConfigArr); + new ConfigContext().Association(LeadersConfigArr); + new ConfigContext().Association(LineConfigArr); + new ConfigContext().Association(LureConfigArr); + new ConfigContext().Association(ReelConfigArr); + new ConfigContext().Association(RingConfigArr); + new ConfigContext().Association(RodConfigArr); + new ConfigContext().Association(UnitConfigArr); + new ConfigContext().Association(WeightConfigArr); } } } diff --git a/Assets/Scripts/Configs/Gen/ConfigAssets.Gen.cs.meta b/Assets/Scripts/Configs/Gen/ConfigAssets.Gen.cs.meta index eb5f30808..ed730e0fd 100644 --- a/Assets/Scripts/Configs/Gen/ConfigAssets.Gen.cs.meta +++ b/Assets/Scripts/Configs/Gen/ConfigAssets.Gen.cs.meta @@ -1,3 +1,2 @@ fileFormatVersion: 2 -guid: bd9bbc8f86e64a928533f493e39813ed -timeCreated: 1742999819 \ No newline at end of file +guid: bd9bbc8f86e64a928533f493e39813ed \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps.meta b/Assets/Scripts/Configs/Gen/Warps.meta index d7e11fe0b..15944082b 100644 --- a/Assets/Scripts/Configs/Gen/Warps.meta +++ b/Assets/Scripts/Configs/Gen/Warps.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: fd8931b9ac4c462b9e85fa625e300cee -timeCreated: 1743000570 \ No newline at end of file +guid: 98e70a75b52b4728aec1e5b7f506695c +timeCreated: 1756050753 \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameFloatsWarp.cs b/Assets/Scripts/Configs/Gen/Warps/BaitConfigWarp.cs similarity index 54% rename from Assets/Scripts/Configs/Gen/Warps/GameFloatsWarp.cs rename to Assets/Scripts/Configs/Gen/Warps/BaitConfigWarp.cs index 68a79b4c2..78fbf6fbf 100644 --- a/Assets/Scripts/Configs/Gen/Warps/GameFloatsWarp.cs +++ b/Assets/Scripts/Configs/Gen/Warps/BaitConfigWarp.cs @@ -5,38 +5,38 @@ using System.Collections.Generic; namespace NBF { [Serializable] - public partial class GameFloats + public partial class BaitConfig { - private static ConfigContext _context; + private static ConfigContext _context; - private static ConfigContext Context => _context ??= Configs.Table(); + private static ConfigContext Context => _context ??= Configs.Table(); - public static GameFloats Get(int key) + public static BaitConfig Get(int key) { return Context.Get(key); } - public static GameFloats Get(Predicate match) + public static BaitConfig Get(Predicate match) { return Context.Get(match); } - public static GameFloats Fist() + public static BaitConfig Fist() { return Context.Fist(); } - public static GameFloats Last() + public static BaitConfig Last() { return Context.Last(); } - public static GameFloats Fist(Predicate match) + public static BaitConfig Fist(Predicate match) { return Context.Fist(match); } - public static GameFloats Last(Predicate match) + public static BaitConfig Last(Predicate match) { return Context.Last(match); } @@ -46,18 +46,18 @@ namespace NBF return Context.Count(); } - public static int Count(Func predicate) + public static int Count(Func predicate) { return Context.Count(predicate); } - public static List GetList() + public static List GetList() { return Context.GetList(); } - public static List GetList(Predicate match) + public static List GetList(Predicate match) { return Context.GetList(match); } diff --git a/Assets/Scripts/Configs/Gen/Warps/BaitConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/BaitConfigWarp.cs.meta new file mode 100644 index 000000000..62c32df08 --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/BaitConfigWarp.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5c6bdb0bae4da2a4da6aacaf58a1abc0 \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameFeedersWarp.cs b/Assets/Scripts/Configs/Gen/Warps/BobberConfigWarp.cs similarity index 52% rename from Assets/Scripts/Configs/Gen/Warps/GameFeedersWarp.cs rename to Assets/Scripts/Configs/Gen/Warps/BobberConfigWarp.cs index 1b201760c..b6d3fac39 100644 --- a/Assets/Scripts/Configs/Gen/Warps/GameFeedersWarp.cs +++ b/Assets/Scripts/Configs/Gen/Warps/BobberConfigWarp.cs @@ -5,38 +5,38 @@ using System.Collections.Generic; namespace NBF { [Serializable] - public partial class GameFeeders + public partial class BobberConfig { - private static ConfigContext _context; + private static ConfigContext _context; - private static ConfigContext Context => _context ??= Configs.Table(); + private static ConfigContext Context => _context ??= Configs.Table(); - public static GameFeeders Get(int key) + public static BobberConfig Get(int key) { return Context.Get(key); } - public static GameFeeders Get(Predicate match) + public static BobberConfig Get(Predicate match) { return Context.Get(match); } - public static GameFeeders Fist() + public static BobberConfig Fist() { return Context.Fist(); } - public static GameFeeders Last() + public static BobberConfig Last() { return Context.Last(); } - public static GameFeeders Fist(Predicate match) + public static BobberConfig Fist(Predicate match) { return Context.Fist(match); } - public static GameFeeders Last(Predicate match) + public static BobberConfig Last(Predicate match) { return Context.Last(match); } @@ -46,18 +46,18 @@ namespace NBF return Context.Count(); } - public static int Count(Func predicate) + public static int Count(Func predicate) { return Context.Count(predicate); } - public static List GetList() + public static List GetList() { return Context.GetList(); } - public static List GetList(Predicate match) + public static List GetList(Predicate match) { return Context.GetList(match); } diff --git a/Assets/Scripts/Configs/Gen/Warps/BobberConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/BobberConfigWarp.cs.meta new file mode 100644 index 000000000..53cac01ed --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/BobberConfigWarp.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 99b64c24f2bad454086ac41dd6aa7ffc \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/FeederConfigWarp.cs b/Assets/Scripts/Configs/Gen/Warps/FeederConfigWarp.cs new file mode 100644 index 000000000..bb2f54b52 --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/FeederConfigWarp.cs @@ -0,0 +1,65 @@ +/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/ +using System; +using System.Collections.Generic; + +namespace NBF +{ + [Serializable] + public partial class FeederConfig + { + private static ConfigContext _context; + + private static ConfigContext Context => _context ??= Configs.Table(); + + public static FeederConfig Get(int key) + { + return Context.Get(key); + } + + public static FeederConfig Get(Predicate match) + { + return Context.Get(match); + } + + public static FeederConfig Fist() + { + return Context.Fist(); + } + + public static FeederConfig Last() + { + return Context.Last(); + } + + public static FeederConfig Fist(Predicate match) + { + return Context.Fist(match); + } + + public static FeederConfig Last(Predicate match) + { + return Context.Last(match); + } + + public static int Count() + { + return Context.Count(); + } + + public static int Count(Func predicate) + { + return Context.Count(predicate); + } + + + public static List GetList() + { + return Context.GetList(); + } + + public static List GetList(Predicate match) + { + return Context.GetList(match); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/FeederConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/FeederConfigWarp.cs.meta new file mode 100644 index 000000000..8bd74b4f9 --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/FeederConfigWarp.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: dc082eda2a5880148843ce9c21ed4eed \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameLinesWarp.cs b/Assets/Scripts/Configs/Gen/Warps/FishAcceptConfigWarp.cs similarity index 50% rename from Assets/Scripts/Configs/Gen/Warps/GameLinesWarp.cs rename to Assets/Scripts/Configs/Gen/Warps/FishAcceptConfigWarp.cs index fb3cf2b56..b8081592e 100644 --- a/Assets/Scripts/Configs/Gen/Warps/GameLinesWarp.cs +++ b/Assets/Scripts/Configs/Gen/Warps/FishAcceptConfigWarp.cs @@ -5,38 +5,38 @@ using System.Collections.Generic; namespace NBF { [Serializable] - public partial class GameLines + public partial class FishAcceptConfig { - private static ConfigContext _context; + private static ConfigContext _context; - private static ConfigContext Context => _context ??= Configs.Table(); + private static ConfigContext Context => _context ??= Configs.Table(); - public static GameLines Get(int key) + public static FishAcceptConfig Get(int key) { return Context.Get(key); } - public static GameLines Get(Predicate match) + public static FishAcceptConfig Get(Predicate match) { return Context.Get(match); } - public static GameLines Fist() + public static FishAcceptConfig Fist() { return Context.Fist(); } - public static GameLines Last() + public static FishAcceptConfig Last() { return Context.Last(); } - public static GameLines Fist(Predicate match) + public static FishAcceptConfig Fist(Predicate match) { return Context.Fist(match); } - public static GameLines Last(Predicate match) + public static FishAcceptConfig Last(Predicate match) { return Context.Last(match); } @@ -46,18 +46,18 @@ namespace NBF return Context.Count(); } - public static int Count(Func predicate) + public static int Count(Func predicate) { return Context.Count(predicate); } - public static List GetList() + public static List GetList() { return Context.GetList(); } - public static List GetList(Predicate match) + public static List GetList(Predicate match) { return Context.GetList(match); } diff --git a/Assets/Scripts/Configs/Gen/Warps/FishAcceptConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/FishAcceptConfigWarp.cs.meta new file mode 100644 index 000000000..e06497024 --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/FishAcceptConfigWarp.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 23d45122e487d8f439bf063a4df7a4b7 \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameHooksWarp.cs b/Assets/Scripts/Configs/Gen/Warps/FishConfigWarp.cs similarity index 53% rename from Assets/Scripts/Configs/Gen/Warps/GameHooksWarp.cs rename to Assets/Scripts/Configs/Gen/Warps/FishConfigWarp.cs index e50e1216f..6ea97f0fc 100644 --- a/Assets/Scripts/Configs/Gen/Warps/GameHooksWarp.cs +++ b/Assets/Scripts/Configs/Gen/Warps/FishConfigWarp.cs @@ -5,38 +5,38 @@ using System.Collections.Generic; namespace NBF { [Serializable] - public partial class GameHooks + public partial class FishConfig { - private static ConfigContext _context; + private static ConfigContext _context; - private static ConfigContext Context => _context ??= Configs.Table(); + private static ConfigContext Context => _context ??= Configs.Table(); - public static GameHooks Get(int key) + public static FishConfig Get(int key) { return Context.Get(key); } - public static GameHooks Get(Predicate match) + public static FishConfig Get(Predicate match) { return Context.Get(match); } - public static GameHooks Fist() + public static FishConfig Fist() { return Context.Fist(); } - public static GameHooks Last() + public static FishConfig Last() { return Context.Last(); } - public static GameHooks Fist(Predicate match) + public static FishConfig Fist(Predicate match) { return Context.Fist(match); } - public static GameHooks Last(Predicate match) + public static FishConfig Last(Predicate match) { return Context.Last(match); } @@ -46,18 +46,18 @@ namespace NBF return Context.Count(); } - public static int Count(Func predicate) + public static int Count(Func predicate) { return Context.Count(predicate); } - public static List GetList() + public static List GetList() { return Context.GetList(); } - public static List GetList(Predicate match) + public static List GetList(Predicate match) { return Context.GetList(match); } diff --git a/Assets/Scripts/Configs/Gen/Warps/FishConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/FishConfigWarp.cs.meta new file mode 100644 index 000000000..81486f4f3 --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/FishConfigWarp.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d60d97e94b1432c4e985a5469fd01409 \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameBaitsWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameBaitsWarp.cs.meta deleted file mode 100644 index 60c0c7052..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameBaitsWarp.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 4fd681fc90fb5f2409c0fc68207c77d4 \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameFeedersWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameFeedersWarp.cs.meta deleted file mode 100644 index 1a8e5576d..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameFeedersWarp.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 77a5cad97b10e4447afb56f513908506 \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameFishAcceptsWarp.cs b/Assets/Scripts/Configs/Gen/Warps/GameFishAcceptsWarp.cs deleted file mode 100644 index e7ca2cb9b..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameFishAcceptsWarp.cs +++ /dev/null @@ -1,65 +0,0 @@ -/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/ -using System; -using System.Collections.Generic; - -namespace NBF -{ - [Serializable] - public partial class GameFishAccepts - { - private static ConfigContext _context; - - private static ConfigContext Context => _context ??= Configs.Table(); - - public static GameFishAccepts Get(int key) - { - return Context.Get(key); - } - - public static GameFishAccepts Get(Predicate match) - { - return Context.Get(match); - } - - public static GameFishAccepts Fist() - { - return Context.Fist(); - } - - public static GameFishAccepts Last() - { - return Context.Last(); - } - - public static GameFishAccepts Fist(Predicate match) - { - return Context.Fist(match); - } - - public static GameFishAccepts Last(Predicate match) - { - return Context.Last(match); - } - - public static int Count() - { - return Context.Count(); - } - - public static int Count(Func predicate) - { - return Context.Count(predicate); - } - - - public static List GetList() - { - return Context.GetList(); - } - - public static List GetList(Predicate match) - { - return Context.GetList(match); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameFishAcceptsWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameFishAcceptsWarp.cs.meta deleted file mode 100644 index e76b874cb..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameFishAcceptsWarp.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 57149d0eff60b15489ba1edc669fca38 \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameFishWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameFishWarp.cs.meta deleted file mode 100644 index 5fa866fd5..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameFishWarp.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: ed51b5aea87f3364e8aa7eaca4e89348 \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameFloatsWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameFloatsWarp.cs.meta deleted file mode 100644 index fe3b805fe..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameFloatsWarp.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: cb2e64d338bf02543aad65973e43b011 \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameHooksWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameHooksWarp.cs.meta deleted file mode 100644 index 3faf8a506..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameHooksWarp.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 0defd614f8bdb5043868fb08e64c94c6 \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameLeadersWarp.cs b/Assets/Scripts/Configs/Gen/Warps/GameLeadersWarp.cs deleted file mode 100644 index e970333d8..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameLeadersWarp.cs +++ /dev/null @@ -1,65 +0,0 @@ -/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/ -using System; -using System.Collections.Generic; - -namespace NBF -{ - [Serializable] - public partial class GameLeaders - { - private static ConfigContext _context; - - private static ConfigContext Context => _context ??= Configs.Table(); - - public static GameLeaders Get(int key) - { - return Context.Get(key); - } - - public static GameLeaders Get(Predicate match) - { - return Context.Get(match); - } - - public static GameLeaders Fist() - { - return Context.Fist(); - } - - public static GameLeaders Last() - { - return Context.Last(); - } - - public static GameLeaders Fist(Predicate match) - { - return Context.Fist(match); - } - - public static GameLeaders Last(Predicate match) - { - return Context.Last(match); - } - - public static int Count() - { - return Context.Count(); - } - - public static int Count(Func predicate) - { - return Context.Count(predicate); - } - - - public static List GetList() - { - return Context.GetList(); - } - - public static List GetList(Predicate match) - { - return Context.GetList(match); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameLeadersWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameLeadersWarp.cs.meta deleted file mode 100644 index ce5219a6d..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameLeadersWarp.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: de88b2f351313f74c8889a63265bc4ec \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameLinesWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameLinesWarp.cs.meta deleted file mode 100644 index 4314b6627..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameLinesWarp.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 386a66a581fb2894481a8f43d1d086c8 \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameLuresWarp.cs b/Assets/Scripts/Configs/Gen/Warps/GameLuresWarp.cs deleted file mode 100644 index 4fea33aff..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameLuresWarp.cs +++ /dev/null @@ -1,65 +0,0 @@ -/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/ -using System; -using System.Collections.Generic; - -namespace NBF -{ - [Serializable] - public partial class GameLures - { - private static ConfigContext _context; - - private static ConfigContext Context => _context ??= Configs.Table(); - - public static GameLures Get(int key) - { - return Context.Get(key); - } - - public static GameLures Get(Predicate match) - { - return Context.Get(match); - } - - public static GameLures Fist() - { - return Context.Fist(); - } - - public static GameLures Last() - { - return Context.Last(); - } - - public static GameLures Fist(Predicate match) - { - return Context.Fist(match); - } - - public static GameLures Last(Predicate match) - { - return Context.Last(match); - } - - public static int Count() - { - return Context.Count(); - } - - public static int Count(Func predicate) - { - return Context.Count(predicate); - } - - - public static List GetList() - { - return Context.GetList(); - } - - public static List GetList(Predicate match) - { - return Context.GetList(match); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameLuresWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameLuresWarp.cs.meta deleted file mode 100644 index 8e02ba816..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameLuresWarp.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 8cbbbb9861ce4c849a25d434c578a716 \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameReelsWarp.cs b/Assets/Scripts/Configs/Gen/Warps/GameReelsWarp.cs deleted file mode 100644 index 08d27e2dc..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameReelsWarp.cs +++ /dev/null @@ -1,65 +0,0 @@ -/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/ -using System; -using System.Collections.Generic; - -namespace NBF -{ - [Serializable] - public partial class GameReels - { - private static ConfigContext _context; - - private static ConfigContext Context => _context ??= Configs.Table(); - - public static GameReels Get(int key) - { - return Context.Get(key); - } - - public static GameReels Get(Predicate match) - { - return Context.Get(match); - } - - public static GameReels Fist() - { - return Context.Fist(); - } - - public static GameReels Last() - { - return Context.Last(); - } - - public static GameReels Fist(Predicate match) - { - return Context.Fist(match); - } - - public static GameReels Last(Predicate match) - { - return Context.Last(match); - } - - public static int Count() - { - return Context.Count(); - } - - public static int Count(Func predicate) - { - return Context.Count(predicate); - } - - - public static List GetList() - { - return Context.GetList(); - } - - public static List GetList(Predicate match) - { - return Context.GetList(match); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameReelsWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameReelsWarp.cs.meta deleted file mode 100644 index 933234057..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameReelsWarp.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: e08ef6d5f3b5f0049bc67ced9737c43e \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameRingsWarp.cs b/Assets/Scripts/Configs/Gen/Warps/GameRingsWarp.cs deleted file mode 100644 index 708ec6af5..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameRingsWarp.cs +++ /dev/null @@ -1,65 +0,0 @@ -/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/ -using System; -using System.Collections.Generic; - -namespace NBF -{ - [Serializable] - public partial class GameRings - { - private static ConfigContext _context; - - private static ConfigContext Context => _context ??= Configs.Table(); - - public static GameRings Get(int key) - { - return Context.Get(key); - } - - public static GameRings Get(Predicate match) - { - return Context.Get(match); - } - - public static GameRings Fist() - { - return Context.Fist(); - } - - public static GameRings Last() - { - return Context.Last(); - } - - public static GameRings Fist(Predicate match) - { - return Context.Fist(match); - } - - public static GameRings Last(Predicate match) - { - return Context.Last(match); - } - - public static int Count() - { - return Context.Count(); - } - - public static int Count(Func predicate) - { - return Context.Count(predicate); - } - - - public static List GetList() - { - return Context.GetList(); - } - - public static List GetList(Predicate match) - { - return Context.GetList(match); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameRingsWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameRingsWarp.cs.meta deleted file mode 100644 index 5e92911c2..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameRingsWarp.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 848422be852cc5c498683477a97bf52c \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameRodsWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameRodsWarp.cs.meta deleted file mode 100644 index 918635c4b..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameRodsWarp.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 9eb1fcd4c3c31e645b093a6e7bdf6f1d \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameWeightsWarp.cs b/Assets/Scripts/Configs/Gen/Warps/GameWeightsWarp.cs deleted file mode 100644 index 1bab0e147..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameWeightsWarp.cs +++ /dev/null @@ -1,65 +0,0 @@ -/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/ -using System; -using System.Collections.Generic; - -namespace NBF -{ - [Serializable] - public partial class GameWeights - { - private static ConfigContext _context; - - private static ConfigContext Context => _context ??= Configs.Table(); - - public static GameWeights Get(int key) - { - return Context.Get(key); - } - - public static GameWeights Get(Predicate match) - { - return Context.Get(match); - } - - public static GameWeights Fist() - { - return Context.Fist(); - } - - public static GameWeights Last() - { - return Context.Last(); - } - - public static GameWeights Fist(Predicate match) - { - return Context.Fist(match); - } - - public static GameWeights Last(Predicate match) - { - return Context.Last(match); - } - - public static int Count() - { - return Context.Count(); - } - - public static int Count(Func predicate) - { - return Context.Count(predicate); - } - - - public static List GetList() - { - return Context.GetList(); - } - - public static List GetList(Predicate match) - { - return Context.GetList(match); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameWeightsWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameWeightsWarp.cs.meta deleted file mode 100644 index c12b08e1e..000000000 --- a/Assets/Scripts/Configs/Gen/Warps/GameWeightsWarp.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: db1dedf7e1b7a894b8800575e45e0b8b \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameFishWarp.cs b/Assets/Scripts/Configs/Gen/Warps/HookConfigWarp.cs similarity index 53% rename from Assets/Scripts/Configs/Gen/Warps/GameFishWarp.cs rename to Assets/Scripts/Configs/Gen/Warps/HookConfigWarp.cs index 40d11d089..c03d22af3 100644 --- a/Assets/Scripts/Configs/Gen/Warps/GameFishWarp.cs +++ b/Assets/Scripts/Configs/Gen/Warps/HookConfigWarp.cs @@ -5,38 +5,38 @@ using System.Collections.Generic; namespace NBF { [Serializable] - public partial class GameFish + public partial class HookConfig { - private static ConfigContext _context; + private static ConfigContext _context; - private static ConfigContext Context => _context ??= Configs.Table(); + private static ConfigContext Context => _context ??= Configs.Table(); - public static GameFish Get(int key) + public static HookConfig Get(int key) { return Context.Get(key); } - public static GameFish Get(Predicate match) + public static HookConfig Get(Predicate match) { return Context.Get(match); } - public static GameFish Fist() + public static HookConfig Fist() { return Context.Fist(); } - public static GameFish Last() + public static HookConfig Last() { return Context.Last(); } - public static GameFish Fist(Predicate match) + public static HookConfig Fist(Predicate match) { return Context.Fist(match); } - public static GameFish Last(Predicate match) + public static HookConfig Last(Predicate match) { return Context.Last(match); } @@ -46,18 +46,18 @@ namespace NBF return Context.Count(); } - public static int Count(Func predicate) + public static int Count(Func predicate) { return Context.Count(predicate); } - public static List GetList() + public static List GetList() { return Context.GetList(); } - public static List GetList(Predicate match) + public static List GetList(Predicate match) { return Context.GetList(match); } diff --git a/Assets/Scripts/Configs/Gen/Warps/HookConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/HookConfigWarp.cs.meta new file mode 100644 index 000000000..a48eb7900 --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/HookConfigWarp.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: fc38b93ab46f1bd4a83f81f1cd3b3e4c \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameRodsWarp.cs b/Assets/Scripts/Configs/Gen/Warps/LeadersConfigWarp.cs similarity index 52% rename from Assets/Scripts/Configs/Gen/Warps/GameRodsWarp.cs rename to Assets/Scripts/Configs/Gen/Warps/LeadersConfigWarp.cs index d4b7f741a..ad4c8a8af 100644 --- a/Assets/Scripts/Configs/Gen/Warps/GameRodsWarp.cs +++ b/Assets/Scripts/Configs/Gen/Warps/LeadersConfigWarp.cs @@ -5,38 +5,38 @@ using System.Collections.Generic; namespace NBF { [Serializable] - public partial class GameRods + public partial class LeadersConfig { - private static ConfigContext _context; + private static ConfigContext _context; - private static ConfigContext Context => _context ??= Configs.Table(); + private static ConfigContext Context => _context ??= Configs.Table(); - public static GameRods Get(int key) + public static LeadersConfig Get(int key) { return Context.Get(key); } - public static GameRods Get(Predicate match) + public static LeadersConfig Get(Predicate match) { return Context.Get(match); } - public static GameRods Fist() + public static LeadersConfig Fist() { return Context.Fist(); } - public static GameRods Last() + public static LeadersConfig Last() { return Context.Last(); } - public static GameRods Fist(Predicate match) + public static LeadersConfig Fist(Predicate match) { return Context.Fist(match); } - public static GameRods Last(Predicate match) + public static LeadersConfig Last(Predicate match) { return Context.Last(match); } @@ -46,18 +46,18 @@ namespace NBF return Context.Count(); } - public static int Count(Func predicate) + public static int Count(Func predicate) { return Context.Count(predicate); } - public static List GetList() + public static List GetList() { return Context.GetList(); } - public static List GetList(Predicate match) + public static List GetList(Predicate match) { return Context.GetList(match); } diff --git a/Assets/Scripts/Configs/Gen/Warps/LeadersConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/LeadersConfigWarp.cs.meta new file mode 100644 index 000000000..f11b68d93 --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/LeadersConfigWarp.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7911fb1cf4470014eadb4d9db5db5861 \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/LineConfigWarp.cs b/Assets/Scripts/Configs/Gen/Warps/LineConfigWarp.cs new file mode 100644 index 000000000..7ae22d3ab --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/LineConfigWarp.cs @@ -0,0 +1,65 @@ +/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/ +using System; +using System.Collections.Generic; + +namespace NBF +{ + [Serializable] + public partial class LineConfig + { + private static ConfigContext _context; + + private static ConfigContext Context => _context ??= Configs.Table(); + + public static LineConfig Get(int key) + { + return Context.Get(key); + } + + public static LineConfig Get(Predicate match) + { + return Context.Get(match); + } + + public static LineConfig Fist() + { + return Context.Fist(); + } + + public static LineConfig Last() + { + return Context.Last(); + } + + public static LineConfig Fist(Predicate match) + { + return Context.Fist(match); + } + + public static LineConfig Last(Predicate match) + { + return Context.Last(match); + } + + public static int Count() + { + return Context.Count(); + } + + public static int Count(Func predicate) + { + return Context.Count(predicate); + } + + + public static List GetList() + { + return Context.GetList(); + } + + public static List GetList(Predicate match) + { + return Context.GetList(match); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/LineConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/LineConfigWarp.cs.meta new file mode 100644 index 000000000..48a663dea --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/LineConfigWarp.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1acb019fe35da324cb5a26e45c54532d \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/LureConfigWarp.cs b/Assets/Scripts/Configs/Gen/Warps/LureConfigWarp.cs new file mode 100644 index 000000000..e26f0145e --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/LureConfigWarp.cs @@ -0,0 +1,65 @@ +/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/ +using System; +using System.Collections.Generic; + +namespace NBF +{ + [Serializable] + public partial class LureConfig + { + private static ConfigContext _context; + + private static ConfigContext Context => _context ??= Configs.Table(); + + public static LureConfig Get(int key) + { + return Context.Get(key); + } + + public static LureConfig Get(Predicate match) + { + return Context.Get(match); + } + + public static LureConfig Fist() + { + return Context.Fist(); + } + + public static LureConfig Last() + { + return Context.Last(); + } + + public static LureConfig Fist(Predicate match) + { + return Context.Fist(match); + } + + public static LureConfig Last(Predicate match) + { + return Context.Last(match); + } + + public static int Count() + { + return Context.Count(); + } + + public static int Count(Func predicate) + { + return Context.Count(predicate); + } + + + public static List GetList() + { + return Context.GetList(); + } + + public static List GetList(Predicate match) + { + return Context.GetList(match); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/LureConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/LureConfigWarp.cs.meta new file mode 100644 index 000000000..33df3e2ef --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/LureConfigWarp.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 74aae733a506d0840a1a7cc2623ed5fd \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/ReelConfigWarp.cs b/Assets/Scripts/Configs/Gen/Warps/ReelConfigWarp.cs new file mode 100644 index 000000000..e7cb60301 --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/ReelConfigWarp.cs @@ -0,0 +1,65 @@ +/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/ +using System; +using System.Collections.Generic; + +namespace NBF +{ + [Serializable] + public partial class ReelConfig + { + private static ConfigContext _context; + + private static ConfigContext Context => _context ??= Configs.Table(); + + public static ReelConfig Get(int key) + { + return Context.Get(key); + } + + public static ReelConfig Get(Predicate match) + { + return Context.Get(match); + } + + public static ReelConfig Fist() + { + return Context.Fist(); + } + + public static ReelConfig Last() + { + return Context.Last(); + } + + public static ReelConfig Fist(Predicate match) + { + return Context.Fist(match); + } + + public static ReelConfig Last(Predicate match) + { + return Context.Last(match); + } + + public static int Count() + { + return Context.Count(); + } + + public static int Count(Func predicate) + { + return Context.Count(predicate); + } + + + public static List GetList() + { + return Context.GetList(); + } + + public static List GetList(Predicate match) + { + return Context.GetList(match); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/ReelConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/ReelConfigWarp.cs.meta new file mode 100644 index 000000000..30120eb5a --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/ReelConfigWarp.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6bfa9f163eb97be418e04f1f62c607de \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/RingConfigWarp.cs b/Assets/Scripts/Configs/Gen/Warps/RingConfigWarp.cs new file mode 100644 index 000000000..209da8dfb --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/RingConfigWarp.cs @@ -0,0 +1,65 @@ +/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/ +using System; +using System.Collections.Generic; + +namespace NBF +{ + [Serializable] + public partial class RingConfig + { + private static ConfigContext _context; + + private static ConfigContext Context => _context ??= Configs.Table(); + + public static RingConfig Get(int key) + { + return Context.Get(key); + } + + public static RingConfig Get(Predicate match) + { + return Context.Get(match); + } + + public static RingConfig Fist() + { + return Context.Fist(); + } + + public static RingConfig Last() + { + return Context.Last(); + } + + public static RingConfig Fist(Predicate match) + { + return Context.Fist(match); + } + + public static RingConfig Last(Predicate match) + { + return Context.Last(match); + } + + public static int Count() + { + return Context.Count(); + } + + public static int Count(Func predicate) + { + return Context.Count(predicate); + } + + + public static List GetList() + { + return Context.GetList(); + } + + public static List GetList(Predicate match) + { + return Context.GetList(match); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/RingConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/RingConfigWarp.cs.meta new file mode 100644 index 000000000..8a778e233 --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/RingConfigWarp.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a52a98969f4fae44ba19533cb1ae552e \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/GameBaitsWarp.cs b/Assets/Scripts/Configs/Gen/Warps/RodConfigWarp.cs similarity index 54% rename from Assets/Scripts/Configs/Gen/Warps/GameBaitsWarp.cs rename to Assets/Scripts/Configs/Gen/Warps/RodConfigWarp.cs index 014010b1c..280781968 100644 --- a/Assets/Scripts/Configs/Gen/Warps/GameBaitsWarp.cs +++ b/Assets/Scripts/Configs/Gen/Warps/RodConfigWarp.cs @@ -5,38 +5,38 @@ using System.Collections.Generic; namespace NBF { [Serializable] - public partial class GameBaits + public partial class RodConfig { - private static ConfigContext _context; + private static ConfigContext _context; - private static ConfigContext Context => _context ??= Configs.Table(); + private static ConfigContext Context => _context ??= Configs.Table(); - public static GameBaits Get(int key) + public static RodConfig Get(int key) { return Context.Get(key); } - public static GameBaits Get(Predicate match) + public static RodConfig Get(Predicate match) { return Context.Get(match); } - public static GameBaits Fist() + public static RodConfig Fist() { return Context.Fist(); } - public static GameBaits Last() + public static RodConfig Last() { return Context.Last(); } - public static GameBaits Fist(Predicate match) + public static RodConfig Fist(Predicate match) { return Context.Fist(match); } - public static GameBaits Last(Predicate match) + public static RodConfig Last(Predicate match) { return Context.Last(match); } @@ -46,18 +46,18 @@ namespace NBF return Context.Count(); } - public static int Count(Func predicate) + public static int Count(Func predicate) { return Context.Count(predicate); } - public static List GetList() + public static List GetList() { return Context.GetList(); } - public static List GetList(Predicate match) + public static List GetList(Predicate match) { return Context.GetList(match); } diff --git a/Assets/Scripts/Configs/Gen/Warps/RodConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/RodConfigWarp.cs.meta new file mode 100644 index 000000000..33ef28386 --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/RodConfigWarp.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 81f057dddf36a734ead19cd98e19a2e0 \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/UnitConfigWarp.cs b/Assets/Scripts/Configs/Gen/Warps/UnitConfigWarp.cs new file mode 100644 index 000000000..0398f08b0 --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/UnitConfigWarp.cs @@ -0,0 +1,65 @@ +/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/ +using System; +using System.Collections.Generic; + +namespace NBF +{ + [Serializable] + public partial class UnitConfig + { + private static ConfigContext _context; + + private static ConfigContext Context => _context ??= Configs.Table(); + + public static UnitConfig Get(int key) + { + return Context.Get(key); + } + + public static UnitConfig Get(Predicate match) + { + return Context.Get(match); + } + + public static UnitConfig Fist() + { + return Context.Fist(); + } + + public static UnitConfig Last() + { + return Context.Last(); + } + + public static UnitConfig Fist(Predicate match) + { + return Context.Fist(match); + } + + public static UnitConfig Last(Predicate match) + { + return Context.Last(match); + } + + public static int Count() + { + return Context.Count(); + } + + public static int Count(Func predicate) + { + return Context.Count(predicate); + } + + + public static List GetList() + { + return Context.GetList(); + } + + public static List GetList(Predicate match) + { + return Context.GetList(match); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/UnitConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/UnitConfigWarp.cs.meta new file mode 100644 index 000000000..a260fdbd8 --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/UnitConfigWarp.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 69acf2fddccdd7b4fae3ad883cbc50ec \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/WeightConfigWarp.cs b/Assets/Scripts/Configs/Gen/Warps/WeightConfigWarp.cs new file mode 100644 index 000000000..7018eed48 --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/WeightConfigWarp.cs @@ -0,0 +1,65 @@ +/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/ +using System; +using System.Collections.Generic; + +namespace NBF +{ + [Serializable] + public partial class WeightConfig + { + private static ConfigContext _context; + + private static ConfigContext Context => _context ??= Configs.Table(); + + public static WeightConfig Get(int key) + { + return Context.Get(key); + } + + public static WeightConfig Get(Predicate match) + { + return Context.Get(match); + } + + public static WeightConfig Fist() + { + return Context.Fist(); + } + + public static WeightConfig Last() + { + return Context.Last(); + } + + public static WeightConfig Fist(Predicate match) + { + return Context.Fist(match); + } + + public static WeightConfig Last(Predicate match) + { + return Context.Last(match); + } + + public static int Count() + { + return Context.Count(); + } + + public static int Count(Func predicate) + { + return Context.Count(predicate); + } + + + public static List GetList() + { + return Context.GetList(); + } + + public static List GetList(Predicate match) + { + return Context.GetList(match); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Configs/Gen/Warps/WeightConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/WeightConfigWarp.cs.meta new file mode 100644 index 000000000..a14f49de5 --- /dev/null +++ b/Assets/Scripts/Configs/Gen/Warps/WeightConfigWarp.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 43244884876723947bd6574d57b2349c \ No newline at end of file diff --git a/Assets/Scripts/Configs/Mem/GameBaits.cs b/Assets/Scripts/Configs/Mem/BaitConfig.cs similarity index 92% rename from Assets/Scripts/Configs/Mem/GameBaits.cs rename to Assets/Scripts/Configs/Mem/BaitConfig.cs index a253d29d3..36e636948 100644 --- a/Assets/Scripts/Configs/Mem/GameBaits.cs +++ b/Assets/Scripts/Configs/Mem/BaitConfig.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace NBF { [TableName("gameBaits")] - public partial class GameBaits : ConfigGearBase + public partial class BaitConfig : ConfigGearBase { public enum Type { @@ -35,9 +35,9 @@ namespace NBF public virtual bool CheckIsFishAccept(FishSpecies fishSpecies, float fishWeight = 0f) { - var fish = GameFish.Get(t => t.speciesName == fishSpecies); + var fish = FishConfig.Get(t => t.speciesName == fishSpecies); if (fish == null) return false; - if (fish.type == GameFish.Type.Predator && type == Type.Spinning) + if (fish.type == FishConfig.Type.Predator && type == Type.Spinning) { Vector2 vector = weightFishAccept; Debug.Log("Startowa wartosc przynety:" + vector.ToString()); @@ -116,7 +116,7 @@ namespace NBF return true; } } - else if (fish.type == GameFish.Type.WhiteFish && type == Type.Natural) + else if (fish.type == FishConfig.Type.WhiteFish && type == Type.Natural) { if (acceptFish.Contains(fishSpecies)) { @@ -124,7 +124,7 @@ namespace NBF return true; } } - else if (fish.type == GameFish.Type.Predator && type == Type.Natural && + else if (fish.type == FishConfig.Type.Predator && type == Type.Natural && acceptFish.Contains(fishSpecies)) { Debug.Log("Fish accept bait predator weight:" + fishWeight); diff --git a/Assets/Scripts/Configs/Mem/GameBaits.cs.meta b/Assets/Scripts/Configs/Mem/BaitConfig.cs.meta similarity index 100% rename from Assets/Scripts/Configs/Mem/GameBaits.cs.meta rename to Assets/Scripts/Configs/Mem/BaitConfig.cs.meta diff --git a/Assets/Scripts/Configs/Mem/GameFloats.cs b/Assets/Scripts/Configs/Mem/BobberConfig.cs similarity index 89% rename from Assets/Scripts/Configs/Mem/GameFloats.cs rename to Assets/Scripts/Configs/Mem/BobberConfig.cs index 8d973c3e5..0457d38b6 100644 --- a/Assets/Scripts/Configs/Mem/GameFloats.cs +++ b/Assets/Scripts/Configs/Mem/BobberConfig.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace NBF { [TableName("gameFloats")] - public partial class GameFloats : ConfigGearBase + public partial class BobberConfig : ConfigGearBase { public enum Type { diff --git a/Assets/Scripts/Configs/Mem/GameFloats.cs.meta b/Assets/Scripts/Configs/Mem/BobberConfig.cs.meta similarity index 100% rename from Assets/Scripts/Configs/Mem/GameFloats.cs.meta rename to Assets/Scripts/Configs/Mem/BobberConfig.cs.meta diff --git a/Assets/Scripts/Configs/Mem/GameFeeders.cs b/Assets/Scripts/Configs/Mem/FeederConfig.cs similarity index 86% rename from Assets/Scripts/Configs/Mem/GameFeeders.cs rename to Assets/Scripts/Configs/Mem/FeederConfig.cs index 71bb5233f..ca386fad3 100644 --- a/Assets/Scripts/Configs/Mem/GameFeeders.cs +++ b/Assets/Scripts/Configs/Mem/FeederConfig.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace NBF { [TableName("gameFeeders")] - public partial class GameFeeders : ConfigGearBase + public partial class FeederConfig : ConfigGearBase { public enum Type { diff --git a/Assets/Scripts/Configs/Mem/GameFeeders.cs.meta b/Assets/Scripts/Configs/Mem/FeederConfig.cs.meta similarity index 100% rename from Assets/Scripts/Configs/Mem/GameFeeders.cs.meta rename to Assets/Scripts/Configs/Mem/FeederConfig.cs.meta diff --git a/Assets/Scripts/Configs/Mem/GameFishAccepts.cs b/Assets/Scripts/Configs/Mem/FishAcceptConfig.cs similarity index 72% rename from Assets/Scripts/Configs/Mem/GameFishAccepts.cs rename to Assets/Scripts/Configs/Mem/FishAcceptConfig.cs index 956a50826..9b26f1d60 100644 --- a/Assets/Scripts/Configs/Mem/GameFishAccepts.cs +++ b/Assets/Scripts/Configs/Mem/FishAcceptConfig.cs @@ -1,7 +1,7 @@ namespace NBF { [TableName("gameFishAccepts")] - public partial class GameFishAccepts : ConfigBase + public partial class FishAcceptConfig : ConfigBase { public int bait; diff --git a/Assets/Scripts/Configs/Mem/GameFishAccepts.cs.meta b/Assets/Scripts/Configs/Mem/FishAcceptConfig.cs.meta similarity index 100% rename from Assets/Scripts/Configs/Mem/GameFishAccepts.cs.meta rename to Assets/Scripts/Configs/Mem/FishAcceptConfig.cs.meta diff --git a/Assets/Scripts/Configs/Mem/GameFish.cs b/Assets/Scripts/Configs/Mem/FishConfig.cs similarity index 96% rename from Assets/Scripts/Configs/Mem/GameFish.cs rename to Assets/Scripts/Configs/Mem/FishConfig.cs index e2e316093..56470fffc 100644 --- a/Assets/Scripts/Configs/Mem/GameFish.cs +++ b/Assets/Scripts/Configs/Mem/FishConfig.cs @@ -18,9 +18,9 @@ namespace NBF } [TableName("gameFish")] - public partial class GameFish : ConfigBase + public partial class FishConfig : ConfigBase { - public static GameFish Get(FishSpecies fishSpecies) + public static FishConfig Get(FishSpecies fishSpecies) { return Get(t => t.speciesName == fishSpecies); } diff --git a/Assets/Scripts/Configs/Mem/GameFish.cs.meta b/Assets/Scripts/Configs/Mem/FishConfig.cs.meta similarity index 100% rename from Assets/Scripts/Configs/Mem/GameFish.cs.meta rename to Assets/Scripts/Configs/Mem/FishConfig.cs.meta diff --git a/Assets/Scripts/Configs/Mem/GameHooks.cs b/Assets/Scripts/Configs/Mem/HookConfig.cs similarity index 98% rename from Assets/Scripts/Configs/Mem/GameHooks.cs rename to Assets/Scripts/Configs/Mem/HookConfig.cs index b59e599f2..1c340ab28 100644 --- a/Assets/Scripts/Configs/Mem/GameHooks.cs +++ b/Assets/Scripts/Configs/Mem/HookConfig.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace NBF { [TableName("gameHooks")] - public partial class GameHooks : ConfigGearBase + public partial class HookConfig : ConfigGearBase { public enum Type { diff --git a/Assets/Scripts/Configs/Mem/GameHooks.cs.meta b/Assets/Scripts/Configs/Mem/HookConfig.cs.meta similarity index 100% rename from Assets/Scripts/Configs/Mem/GameHooks.cs.meta rename to Assets/Scripts/Configs/Mem/HookConfig.cs.meta diff --git a/Assets/Scripts/Configs/Mem/GameLeaders.cs b/Assets/Scripts/Configs/Mem/LeadersConfig.cs similarity index 56% rename from Assets/Scripts/Configs/Mem/GameLeaders.cs rename to Assets/Scripts/Configs/Mem/LeadersConfig.cs index 309412d84..6123c5244 100644 --- a/Assets/Scripts/Configs/Mem/GameLeaders.cs +++ b/Assets/Scripts/Configs/Mem/LeadersConfig.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace NBF { [TableName("gameLeaders")] - public partial class GameLeaders : ConfigGearBase + public partial class LeadersConfig : ConfigGearBase { public enum Type { @@ -13,15 +13,7 @@ namespace NBF Steel = 2, Titanium = 3 } - + public Type type; - - public float strength = 1f; - - public float size = 0.12f; - - public int Level = 1; - - public int amount = 1; } } \ No newline at end of file diff --git a/Assets/Scripts/Configs/Mem/GameLeaders.cs.meta b/Assets/Scripts/Configs/Mem/LeadersConfig.cs.meta similarity index 100% rename from Assets/Scripts/Configs/Mem/GameLeaders.cs.meta rename to Assets/Scripts/Configs/Mem/LeadersConfig.cs.meta diff --git a/Assets/Scripts/Configs/Mem/GameLines.cs b/Assets/Scripts/Configs/Mem/LineConfig.cs similarity index 89% rename from Assets/Scripts/Configs/Mem/GameLines.cs rename to Assets/Scripts/Configs/Mem/LineConfig.cs index 103f046fb..747a5b153 100644 --- a/Assets/Scripts/Configs/Mem/GameLines.cs +++ b/Assets/Scripts/Configs/Mem/LineConfig.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace NBF { [TableName("gameLines")] - public partial class GameLines : ConfigGearBase + public partial class LineConfig : ConfigGearBase { protected override string ModelRoot => "GameItemsPrefabs/"; diff --git a/Assets/Scripts/Configs/Mem/GameLines.cs.meta b/Assets/Scripts/Configs/Mem/LineConfig.cs.meta similarity index 100% rename from Assets/Scripts/Configs/Mem/GameLines.cs.meta rename to Assets/Scripts/Configs/Mem/LineConfig.cs.meta diff --git a/Assets/Scripts/Configs/Mem/GameLures.cs b/Assets/Scripts/Configs/Mem/LureConfig.cs similarity index 96% rename from Assets/Scripts/Configs/Mem/GameLures.cs rename to Assets/Scripts/Configs/Mem/LureConfig.cs index db8ae1805..9a2b891da 100644 --- a/Assets/Scripts/Configs/Mem/GameLures.cs +++ b/Assets/Scripts/Configs/Mem/LureConfig.cs @@ -3,7 +3,7 @@ namespace NBF { [TableName("gameLures")] - public partial class GameLures : ConfigGearBase + public partial class LureConfig : ConfigGearBase { public enum Type { @@ -37,7 +37,7 @@ namespace NBF public bool CheckIsFishAccept(FishSpecies fishSpecies, float fishWeight = 0) { - if (GameFish.Get(fishSpecies).type == GameFish.Type.Predator) + if (FishConfig.Get(fishSpecies).type == FishConfig.Type.Predator) { Vector2 vector = weightFishAccept; Debug.Log("诱饵的初始值:" + vector.ToString()); diff --git a/Assets/Scripts/Configs/Mem/GameLures.cs.meta b/Assets/Scripts/Configs/Mem/LureConfig.cs.meta similarity index 100% rename from Assets/Scripts/Configs/Mem/GameLures.cs.meta rename to Assets/Scripts/Configs/Mem/LureConfig.cs.meta diff --git a/Assets/Scripts/Configs/Mem/GameReels.cs b/Assets/Scripts/Configs/Mem/ReelConfig.cs similarity index 90% rename from Assets/Scripts/Configs/Mem/GameReels.cs rename to Assets/Scripts/Configs/Mem/ReelConfig.cs index a5ccc8002..dab4e3b4e 100644 --- a/Assets/Scripts/Configs/Mem/GameReels.cs +++ b/Assets/Scripts/Configs/Mem/ReelConfig.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace NBF { [TableName("gameReels")] - public partial class GameReels : ConfigGearBase + public partial class ReelConfig : ConfigGearBase { // protected override string ModelRoot => "GameItemsPrefabs/"; diff --git a/Assets/Scripts/Configs/Mem/GameReels.cs.meta b/Assets/Scripts/Configs/Mem/ReelConfig.cs.meta similarity index 100% rename from Assets/Scripts/Configs/Mem/GameReels.cs.meta rename to Assets/Scripts/Configs/Mem/ReelConfig.cs.meta diff --git a/Assets/Scripts/Configs/Mem/GameRings.cs b/Assets/Scripts/Configs/Mem/RingConfig.cs similarity index 53% rename from Assets/Scripts/Configs/Mem/GameRings.cs rename to Assets/Scripts/Configs/Mem/RingConfig.cs index d68055998..f29cdfdb0 100644 --- a/Assets/Scripts/Configs/Mem/GameRings.cs +++ b/Assets/Scripts/Configs/Mem/RingConfig.cs @@ -1,7 +1,7 @@ namespace NBF { [TableName("gameRings")] - public partial class GameRings : ConfigGearBase + public partial class RingConfig : ConfigGearBase { } } \ No newline at end of file diff --git a/Assets/Scripts/Configs/Mem/GameRings.cs.meta b/Assets/Scripts/Configs/Mem/RingConfig.cs.meta similarity index 100% rename from Assets/Scripts/Configs/Mem/GameRings.cs.meta rename to Assets/Scripts/Configs/Mem/RingConfig.cs.meta diff --git a/Assets/Scripts/Configs/Mem/GameRods.cs b/Assets/Scripts/Configs/Mem/RodConfig.cs similarity index 92% rename from Assets/Scripts/Configs/Mem/GameRods.cs rename to Assets/Scripts/Configs/Mem/RodConfig.cs index c1fa2a712..15e8976cb 100644 --- a/Assets/Scripts/Configs/Mem/GameRods.cs +++ b/Assets/Scripts/Configs/Mem/RodConfig.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace NBF { [TableName("gameRods")] - public partial class GameRods : ConfigGearBase + public partial class RodConfig : ConfigGearBase { public enum Type diff --git a/Assets/Scripts/Configs/Mem/GameRods.cs.meta b/Assets/Scripts/Configs/Mem/RodConfig.cs.meta similarity index 100% rename from Assets/Scripts/Configs/Mem/GameRods.cs.meta rename to Assets/Scripts/Configs/Mem/RodConfig.cs.meta diff --git a/Assets/Scripts/Fishing2/Data/Unit/UnitType.cs b/Assets/Scripts/Configs/Mem/UnitConfig.cs similarity index 72% rename from Assets/Scripts/Fishing2/Data/Unit/UnitType.cs rename to Assets/Scripts/Configs/Mem/UnitConfig.cs index c4867ff21..7a39846f7 100644 --- a/Assets/Scripts/Fishing2/Data/Unit/UnitType.cs +++ b/Assets/Scripts/Configs/Mem/UnitConfig.cs @@ -1,5 +1,11 @@ -namespace NBF.Fishing2 +namespace NBF { + [TableName("gameUnit")] + public partial class UnitConfig : ConfigBase + { + public UnitType Type; + } + public enum UnitType : byte { /// diff --git a/Assets/Scripts/Configs/Mem/UnitConfig.cs.meta b/Assets/Scripts/Configs/Mem/UnitConfig.cs.meta new file mode 100644 index 000000000..daa9722a3 --- /dev/null +++ b/Assets/Scripts/Configs/Mem/UnitConfig.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 956ed7b067744c369fcff9a8baef77ee +timeCreated: 1756049614 \ No newline at end of file diff --git a/Assets/Scripts/Configs/Mem/GameWeights.cs b/Assets/Scripts/Configs/Mem/WeightConfig.cs similarity index 88% rename from Assets/Scripts/Configs/Mem/GameWeights.cs rename to Assets/Scripts/Configs/Mem/WeightConfig.cs index 94a0531d1..8d769f975 100644 --- a/Assets/Scripts/Configs/Mem/GameWeights.cs +++ b/Assets/Scripts/Configs/Mem/WeightConfig.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace NBF { [TableName("gameWeights")] - public partial class GameWeights : ConfigGearBase + public partial class WeightConfig : ConfigGearBase { protected override string ModelRoot => "GameItemsPrefabs/"; diff --git a/Assets/Scripts/Configs/Mem/GameWeights.cs.meta b/Assets/Scripts/Configs/Mem/WeightConfig.cs.meta similarity index 100% rename from Assets/Scripts/Configs/Mem/GameWeights.cs.meta rename to Assets/Scripts/Configs/Mem/WeightConfig.cs.meta diff --git a/Assets/Scripts/Fishing2/Data.meta b/Assets/Scripts/Fishing2/Data.meta index 012ad5b85..49aaa69d4 100644 --- a/Assets/Scripts/Fishing2/Data.meta +++ b/Assets/Scripts/Fishing2/Data.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: 81e60ce9e4a944739d285ad0c562a4a0 -timeCreated: 1755914112 \ No newline at end of file +guid: fe99d0fb1bfc4912a205bb00911c1132 +timeCreated: 1756047069 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Carrier.meta b/Assets/Scripts/Fishing2/Data/Carrier.meta new file mode 100644 index 000000000..f4c51e849 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Carrier.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5432d229611d4f8e8fa72a637035bb40 +timeCreated: 1756044768 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Gear/Configs.meta b/Assets/Scripts/Fishing2/Data/Gear/Configs.meta deleted file mode 100644 index acec2aa17..000000000 --- a/Assets/Scripts/Fishing2/Data/Gear/Configs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 1258cbf54dfc4d1c906fd83dfa5943be -timeCreated: 1755921708 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Map.meta b/Assets/Scripts/Fishing2/Data/Map.meta new file mode 100644 index 000000000..cf5d9963d --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Map.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6ce24e5f59f2424faadee3d97e357365 +timeCreated: 1756049282 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Map/Map.cs b/Assets/Scripts/Fishing2/Data/Map/Map.cs new file mode 100644 index 000000000..eeedf2d73 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Map/Map.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using NBC.Entitas; + +namespace NBF.Fishing2 +{ + public class Map : Entity + { + /// + /// 好友房地图 + /// + public bool IsRoomMap; + + /// + /// 地图中的单位 + /// + public Dictionary Units = new Dictionary(); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Map/Map.cs.meta b/Assets/Scripts/Fishing2/Data/Map/Map.cs.meta new file mode 100644 index 000000000..f40f7062a --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Map/Map.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2acb8a2309ee4443a812939b0e02c18f +timeCreated: 1756049289 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Gear.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear.meta similarity index 100% rename from Assets/Scripts/Fishing2/Data/Gear.meta rename to Assets/Scripts/Fishing2/Data/Unit/Gear.meta diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child.meta new file mode 100644 index 000000000..a91a0f6b9 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 629d828f3fc74ce78482025124c31f85 +timeCreated: 1756047176 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs new file mode 100644 index 000000000..aae539aa8 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs @@ -0,0 +1,9 @@ +using NBC.Entitas; + +namespace NBF.Fishing2 +{ + public class GearBaitComponent : Entity + { + public int ConfigId; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs.meta new file mode 100644 index 000000000..5f67a8f55 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ee9d5fa0951c490fafb108bfb3e1d496 +timeCreated: 1756047193 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs new file mode 100644 index 000000000..8c9a64110 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs @@ -0,0 +1,9 @@ +using NBC.Entitas; + +namespace NBF.Fishing2 +{ + public class GearBobberComponent : Entity + { + public int ConfigId; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs.meta new file mode 100644 index 000000000..841872535 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3f772262a6ee45ebaa276d716c191ddd +timeCreated: 1756047151 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs new file mode 100644 index 000000000..a72531a63 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs @@ -0,0 +1,9 @@ +using NBC.Entitas; + +namespace NBF.Fishing2 +{ + public class GearHookComponent : Entity + { + public int ConfigId; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs.meta new file mode 100644 index 000000000..a63a49e38 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 601122a982d048789ee9131376c72158 +timeCreated: 1756047164 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs new file mode 100644 index 000000000..1d372a24d --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs @@ -0,0 +1,9 @@ +using NBC.Entitas; + +namespace NBF.Fishing2 +{ + public class GearLineComponent : Entity + { + public int ConfigId; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs.meta new file mode 100644 index 000000000..3b16c473e --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3e1209cd4f4242c2af9fbfbbb7480f6b +timeCreated: 1756047232 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs new file mode 100644 index 000000000..a8adf310a --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs @@ -0,0 +1,9 @@ +using NBC.Entitas; + +namespace NBF.Fishing2 +{ + public class GearLureComponent : Entity + { + public int ConfigId; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs.meta new file mode 100644 index 000000000..d85b3f922 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5537f49777ef40f0adeb36bb7687356d +timeCreated: 1756047207 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs new file mode 100644 index 000000000..493000c83 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs @@ -0,0 +1,9 @@ +using NBC.Entitas; + +namespace NBF.Fishing2 +{ + public class GearReelComponent : Entity + { + public int ConfigId; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs.meta new file mode 100644 index 000000000..917327a49 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 60c6ee2c8c084dd29267b0653a1a239d +timeCreated: 1756047139 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs new file mode 100644 index 000000000..9427a128b --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs @@ -0,0 +1,9 @@ +using NBC.Entitas; + +namespace NBF.Fishing2 +{ + public class GearRodComponent : Entity + { + public int ConfigId; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs.meta new file mode 100644 index 000000000..322159c93 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8a353dda940c4dd9bddcf7420d1c2108 +timeCreated: 1756047099 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs new file mode 100644 index 000000000..9f9ea6e16 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs @@ -0,0 +1,9 @@ +using NBC.Entitas; + +namespace NBF.Fishing2 +{ + public class GearWeightComponent : Entity + { + public int ConfigId; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs.meta new file mode 100644 index 000000000..dc85f9f67 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 82411b517dd84b9ca7839a4ddb486a66 +timeCreated: 1756047222 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Gear/UnitGearComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs similarity index 81% rename from Assets/Scripts/Fishing2/Data/Gear/UnitGearComponent.cs rename to Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs index be6ceadc7..0556e7b8c 100644 --- a/Assets/Scripts/Fishing2/Data/Gear/UnitGearComponent.cs +++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs @@ -17,12 +17,7 @@ namespace NBF.Fishing2 /// 旋转速度 /// public float ReelSpeed { get; set; } - - /// - /// 打开手电筒 - /// - public bool OpenLight { get; set; } - + /// /// 鱼竿设置 /// diff --git a/Assets/Scripts/Fishing2/Data/Gear/UnitGearComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Data/Gear/UnitGearComponent.cs.meta rename to Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Data/Unit/Parts.meta b/Assets/Scripts/Fishing2/Data/Unit/Parts.meta new file mode 100644 index 000000000..f3442fbd6 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Parts.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f63b5a4df9be4d1c839c3c1cc56c1275 +timeCreated: 1756048419 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs new file mode 100644 index 000000000..bcd462e6a --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs @@ -0,0 +1,15 @@ +using NBC.Entitas; + +namespace NBF.Fishing2 +{ + /// + /// 手电筒组件 + /// + public class UnitFlashlightComponent : Entity + { + /// + /// 打开手电筒 + /// + public bool OpenLight { get; set; } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs.meta new file mode 100644 index 000000000..499797438 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5f151cee0d5f43ff90c3aa013214b1ea +timeCreated: 1756048476 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Skin.meta b/Assets/Scripts/Fishing2/Data/Unit/Skin.meta new file mode 100644 index 000000000..e2ee5376e --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Skin.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0f655e37e9dd4b5885e127f44e01100d +timeCreated: 1756048586 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs new file mode 100644 index 000000000..b3bf24aa7 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs @@ -0,0 +1,11 @@ +using NBC.Entitas; + +namespace NBF.Fishing2 +{ + /// + /// Unity皮肤组件 + /// + public class UnitSkinComponent : Entity + { + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs.meta new file mode 100644 index 000000000..76e1e5b18 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 40c5cce71c8443aa82ea4108e72c887b +timeCreated: 1756048599 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data/Unit/Unit.cs b/Assets/Scripts/Fishing2/Data/Unit/Unit.cs index a29726ad7..f674888ca 100644 --- a/Assets/Scripts/Fishing2/Data/Unit/Unit.cs +++ b/Assets/Scripts/Fishing2/Data/Unit/Unit.cs @@ -3,6 +3,9 @@ using Unity.Mathematics; namespace NBF.Fishing2 { + /// + /// 单位 + /// public class Unit : Entity { public int ConfigId { get; set; } //配置表id diff --git a/Assets/Scripts/Fishing2/Data/Unit/UnitType.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/UnitType.cs.meta deleted file mode 100644 index cd6cc5596..000000000 --- a/Assets/Scripts/Fishing2/Data/Unit/UnitType.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: f13efb3457f04307b46bbfc54422cf48 -timeCreated: 1755915952 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System.meta b/Assets/Scripts/Fishing2/System.meta new file mode 100644 index 000000000..1b6b57cb1 --- /dev/null +++ b/Assets/Scripts/Fishing2/System.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8e7f0c94a8514f5fa23bcc283e7abdc4 +timeCreated: 1756049392 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Data.meta b/Assets/Scripts/Fishing2/System/Data.meta new file mode 100644 index 000000000..bcd63628f --- /dev/null +++ b/Assets/Scripts/Fishing2/System/Data.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: cd5e378ae3c94070be009d1df97f6aae +timeCreated: 1756049450 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Data/MapSystem.cs b/Assets/Scripts/Fishing2/System/Data/MapSystem.cs new file mode 100644 index 000000000..2faa9e4e5 --- /dev/null +++ b/Assets/Scripts/Fishing2/System/Data/MapSystem.cs @@ -0,0 +1,43 @@ +using System.Collections.Generic; +using NBC; + +namespace NBF.Fishing2 +{ + public static class MapSystem + { + /// + /// 获取一个单位 + /// + /// + /// + /// + public static Unit GetUnit(this Map self, long id) + { + return self.Units.GetValueOrDefault(id); + } + + /// + /// 进入地图 + /// + /// + /// + /// + public static async FTask Enter(this Map map, Unit unit) + { + await FTask.CompletedTask; + return true; + } + + /// + /// 离开地图 + /// + /// + /// + /// + public static async FTask Exit(this Map self, long id) + { + await FTask.CompletedTask; + return true; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Data/MapSystem.cs.meta b/Assets/Scripts/Fishing2/System/Data/MapSystem.cs.meta new file mode 100644 index 000000000..bdf5c359c --- /dev/null +++ b/Assets/Scripts/Fishing2/System/Data/MapSystem.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6e4715bc722c4438ae8603fab6232e81 +timeCreated: 1756049567 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs b/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs new file mode 100644 index 000000000..9cae15acb --- /dev/null +++ b/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs @@ -0,0 +1,15 @@ +namespace NBF.Fishing2 +{ + public static class UnitSystem + { + public static UnitConfig Config(this Unit self) + { + return UnitConfig.Get(self.ConfigId); + } + + public static UnitType Type(this Unit self) + { + return self.Config().Type; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs.meta b/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs.meta new file mode 100644 index 000000000..0948c54cb --- /dev/null +++ b/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1e34ab621bcb45b1af37fca0b06878bb +timeCreated: 1756049584 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Views.meta b/Assets/Scripts/Fishing2/System/Views.meta new file mode 100644 index 000000000..35416fae9 --- /dev/null +++ b/Assets/Scripts/Fishing2/System/Views.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f610539cbd2c43438067954ba6c2f148 +timeCreated: 1756049458 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs b/Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs new file mode 100644 index 000000000..1d180367d --- /dev/null +++ b/Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs @@ -0,0 +1,35 @@ +using NBC; +using NBC.Entitas.Interface; +using UnityEngine; + +namespace NBF.Fishing2 +{ + public static partial class UnitUnityComponentSystem + { + public class UnitUnityComponentAwakeSystem : AwakeSystem + { + protected override void Awake(UnitUnityComponent self) + { + Log.Info("UnitUnityComponentAwakeSystem"); + } + } + + public class UnitUnityComponentDestroySystem : DestroySystem + { + protected override void Destroy(UnitUnityComponent self) + { + self.Animator = null; + self.GameObject = null; + self.Transform = null; + } + } + + public static void SetGameObject(this UnitUnityComponent self, GameObject obj) + { + Log.Info("UnitUnityComponent SetGameObject"); + self.GameObject = obj; + self.Transform = obj.transform; + self.Animator = obj.GetComponent(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs.meta b/Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs.meta new file mode 100644 index 000000000..f57c27aac --- /dev/null +++ b/Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f218930cc1994aaf88752a49dc9aa4b1 +timeCreated: 1756049422 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Player.meta b/Assets/Scripts/Fishing2/Views.meta similarity index 100% rename from Assets/Scripts/Fishing2/Player.meta rename to Assets/Scripts/Fishing2/Views.meta diff --git a/Assets/Scripts/Fishing2/Player/Unit.meta b/Assets/Scripts/Fishing2/Views/Unit.meta similarity index 100% rename from Assets/Scripts/Fishing2/Player/Unit.meta rename to Assets/Scripts/Fishing2/Views/Unit.meta diff --git a/Assets/Scripts/Fishing2/Player/Unit/UnitHUDComponent.cs b/Assets/Scripts/Fishing2/Views/Unit/UnitHUDComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Player/Unit/UnitHUDComponent.cs rename to Assets/Scripts/Fishing2/Views/Unit/UnitHUDComponent.cs diff --git a/Assets/Scripts/Fishing2/Player/Unit/UnitHUDComponent.cs.meta b/Assets/Scripts/Fishing2/Views/Unit/UnitHUDComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Player/Unit/UnitHUDComponent.cs.meta rename to Assets/Scripts/Fishing2/Views/Unit/UnitHUDComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Player/Unit/UnitUnityComponent.cs b/Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs similarity index 70% rename from Assets/Scripts/Fishing2/Player/Unit/UnitUnityComponent.cs rename to Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs index ab83f2801..93694e851 100644 --- a/Assets/Scripts/Fishing2/Player/Unit/UnitUnityComponent.cs +++ b/Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs @@ -1,4 +1,6 @@ -using NBC.Entitas; +using NBC; +using NBC.Entitas; +using NBC.Entitas.Interface; using UnityEngine; namespace NBF.Fishing2 @@ -11,5 +13,8 @@ namespace NBF.Fishing2 public GameObject GameObject { get; set; } public Transform Transform { get; set; } + + public Animator Animator { get; set; } } + } \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Player/Unit/UnitUnityComponent.cs.meta b/Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Player/Unit/UnitUnityComponent.cs.meta rename to Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs.meta diff --git a/Assets/Scripts/UI/Login/LoginHelper.cs b/Assets/Scripts/UI/Login/LoginHelper.cs index 0763a30f7..1dcdeb454 100644 --- a/Assets/Scripts/UI/Login/LoginHelper.cs +++ b/Assets/Scripts/UI/Login/LoginHelper.cs @@ -2,6 +2,7 @@ using Assets.Scripts.Hotfix; using NBC; using NBC.Network; +using NBF.Fishing2; namespace NBF { @@ -13,6 +14,8 @@ namespace NBF { _session = Net.CreateSession("127.0.0.1:20001"); + _session.Scene.AddComponent(); + var acc = account; // 发送登录的请求给服务器 diff --git a/Assets/Scripts/UI/Login/LoginPanel.cs b/Assets/Scripts/UI/Login/LoginPanel.cs index 5569c677c..7fb78ba65 100644 --- a/Assets/Scripts/UI/Login/LoginPanel.cs +++ b/Assets/Scripts/UI/Login/LoginPanel.cs @@ -3,6 +3,8 @@ using FairyGUI; using UnityEngine; using NBC; +using NBC.Entitas; +using NBF.Fishing2; using UIPanel = NBC.UIPanel; namespace NBF @@ -18,7 +20,12 @@ namespace NBF { if (btn == BtnLogin) { - LoginHelper.Login(InputAccount.text).Coroutine(); + var unitGameObject = new GameObject("Unit"); + var unit = Entity.Create(App.Main, true, true); + var unitUnity = unit.AddComponent(); + unitUnity.SetGameObject(unitGameObject); + // App.Main.add + // LoginHelper.Login(InputAccount.text).Coroutine(); } } } diff --git a/Config/fish-鱼.xlsx b/Config/fish-鱼.xlsx index 3ae70f534db32c595fd29bbdef9a2290bda0eca8..2345078b3154729bae42da1228f76096c363a7c5 100644 GIT binary patch delta 4362 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 F=s$YU0@wfm delta 4294 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 GwEqKg;m-;H diff --git a/Config/unit - 单位.xlsx b/Config/unit - 单位.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..d3337655e748816afdb607a7b296d5f90f89d941 GIT binary patch literal 34051 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 literal 0 HcmV?d00001 diff --git a/Fishing2.sln.DotSettings.user b/Fishing2.sln.DotSettings.user index d2d692fa0..60815a0bb 100644 --- a/Fishing2.sln.DotSettings.user +++ b/Fishing2.sln.DotSettings.user @@ -8,6 +8,7 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 728450c56..cf72c0c88 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -76,7 +76,7 @@ QualitySettings: globalTextureMipmapLimit: 0 textureMipmapLimitSettings: [] anisotropicTextures: 2 - antiAliasing: 2 + antiAliasing: 8 softParticles: 0 softVegetation: 1 realtimeReflectionProbes: 1