diff --git a/Assets/Resources/Fgui/Load/Load_fui.bytes b/Assets/Resources/Fgui/Load/Load_fui.bytes index e5f8a9860..1d6969d76 100644 Binary files a/Assets/Resources/Fgui/Load/Load_fui.bytes and b/Assets/Resources/Fgui/Load/Load_fui.bytes differ diff --git a/Assets/Scripts/Common.meta b/Assets/Scripts/Common.meta index e429883f5..89d8386b0 100644 --- a/Assets/Scripts/Common.meta +++ b/Assets/Scripts/Common.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: c8426c4b03da403284afe458076b9c10 -timeCreated: 1742387508 \ No newline at end of file +guid: caf75b28905c41ab8e414e696c3423f9 +timeCreated: 1756363998 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Def.meta b/Assets/Scripts/Common/Def.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Def.meta rename to Assets/Scripts/Common/Def.meta diff --git a/Assets/Scripts/Common/Def/ErrorCode.cs b/Assets/Scripts/Common/Def/ErrorCode.cs new file mode 100644 index 000000000..6f20ecfbc --- /dev/null +++ b/Assets/Scripts/Common/Def/ErrorCode.cs @@ -0,0 +1,8 @@ +namespace NBF +{ + public class ErrorCode + { + public const int Success = 0; + public const int Error = 1; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Common/Def/ErrorCode.cs.meta b/Assets/Scripts/Common/Def/ErrorCode.cs.meta new file mode 100644 index 000000000..79835187f --- /dev/null +++ b/Assets/Scripts/Common/Def/ErrorCode.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 059e898abe0b45988f002ca7e6ff9540 +timeCreated: 1756365454 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Def/GameDef.cs b/Assets/Scripts/Common/Def/GameDef.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Def/GameDef.cs rename to Assets/Scripts/Common/Def/GameDef.cs diff --git a/Assets/Scripts/Fishing2/Model/Def/GameDef.cs.meta b/Assets/Scripts/Common/Def/GameDef.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Def/GameDef.cs.meta rename to Assets/Scripts/Common/Def/GameDef.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Def/InputDef.cs b/Assets/Scripts/Common/Def/InputDef.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Def/InputDef.cs rename to Assets/Scripts/Common/Def/InputDef.cs diff --git a/Assets/Scripts/Fishing2/Model/Def/InputDef.cs.meta b/Assets/Scripts/Common/Def/InputDef.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Def/InputDef.cs.meta rename to Assets/Scripts/Common/Def/InputDef.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Def/SelectorRodSetting.cs b/Assets/Scripts/Common/Def/SelectorRodSetting.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Def/SelectorRodSetting.cs rename to Assets/Scripts/Common/Def/SelectorRodSetting.cs diff --git a/Assets/Scripts/Fishing2/Model/Def/SelectorRodSetting.cs.meta b/Assets/Scripts/Common/Def/SelectorRodSetting.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Def/SelectorRodSetting.cs.meta rename to Assets/Scripts/Common/Def/SelectorRodSetting.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Def/States.cs b/Assets/Scripts/Common/Def/States.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Def/States.cs rename to Assets/Scripts/Common/Def/States.cs diff --git a/Assets/Scripts/Fishing2/Model/Def/States.cs.meta b/Assets/Scripts/Common/Def/States.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Def/States.cs.meta rename to Assets/Scripts/Common/Def/States.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Def/UIDef.cs b/Assets/Scripts/Common/Def/UIDef.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Def/UIDef.cs rename to Assets/Scripts/Common/Def/UIDef.cs diff --git a/Assets/Scripts/Fishing2/Model/Def/UIDef.cs.meta b/Assets/Scripts/Common/Def/UIDef.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Def/UIDef.cs.meta rename to Assets/Scripts/Common/Def/UIDef.cs.meta diff --git a/Assets/Scripts/Common/Events.cs b/Assets/Scripts/Common/Events.cs new file mode 100644 index 000000000..68e43df8b --- /dev/null +++ b/Assets/Scripts/Common/Events.cs @@ -0,0 +1,78 @@ +using NBF.Fishing2; + +namespace NBF +{ + public struct Wait_SceneChangeFinish : IWaitType + { + public int Error { get; set; } + } + + /// + /// 开始切换场景 + /// + public struct SceneChangeStart + { + } + + /// + /// Loading进度变化 + /// + public struct LoadingProgress + { + public float Progress { get; set; } + } + + /// + /// 场景切换结束 + /// + public struct SceneChangeFinish + { + /// + /// 是否首次切换场景 + /// + public bool IsFirst { get; set; } + } + + /// + /// 场景创建成功事件 + /// + public struct AfterCreateCurrentScene + { + } + + /// + /// 游戏启动成功事件 + /// + public struct AppStartInitFinish + { + public bool IsRobot; + } + + /// + /// 登录完成 + /// + public struct LoginFinish + { + } + + /// + /// 进入地图成功 + /// + public struct EnterMapFinish + { + } + + /// + /// 角色创建完成 + /// + public struct AfterUnitCreate + { + /// + /// 是否是主玩家 + /// + public bool IsMainPlayer; + + public Unit Unit; + // public UnitInfo UnitInfo; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Common/Events.cs.meta b/Assets/Scripts/Common/Events.cs.meta new file mode 100644 index 000000000..ccf5b0782 --- /dev/null +++ b/Assets/Scripts/Common/Events.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9c1540ac905c4c4eb9486d66019e7485 +timeCreated: 1756365591 \ No newline at end of file diff --git a/Assets/Scripts/ArmTest.cs b/Assets/Scripts/Demo/ArmTest.cs similarity index 100% rename from Assets/Scripts/ArmTest.cs rename to Assets/Scripts/Demo/ArmTest.cs diff --git a/Assets/Scripts/ArmTest.cs.meta b/Assets/Scripts/Demo/ArmTest.cs.meta similarity index 100% rename from Assets/Scripts/ArmTest.cs.meta rename to Assets/Scripts/Demo/ArmTest.cs.meta diff --git a/Assets/Scripts/Attributes.cs b/Assets/Scripts/Demo/Attributes.cs similarity index 100% rename from Assets/Scripts/Attributes.cs rename to Assets/Scripts/Demo/Attributes.cs diff --git a/Assets/Scripts/Attributes.cs.meta b/Assets/Scripts/Demo/Attributes.cs.meta similarity index 100% rename from Assets/Scripts/Attributes.cs.meta rename to Assets/Scripts/Demo/Attributes.cs.meta diff --git a/Assets/Scripts/FPSCounter.cs b/Assets/Scripts/Demo/FPSCounter.cs similarity index 100% rename from Assets/Scripts/FPSCounter.cs rename to Assets/Scripts/Demo/FPSCounter.cs diff --git a/Assets/Scripts/FPSCounter.cs.meta b/Assets/Scripts/Demo/FPSCounter.cs.meta similarity index 100% rename from Assets/Scripts/FPSCounter.cs.meta rename to Assets/Scripts/Demo/FPSCounter.cs.meta diff --git a/Assets/Scripts/GameTimer.cs b/Assets/Scripts/Demo/GameTimer.cs similarity index 100% rename from Assets/Scripts/GameTimer.cs rename to Assets/Scripts/Demo/GameTimer.cs diff --git a/Assets/Scripts/GameTimer.cs.meta b/Assets/Scripts/Demo/GameTimer.cs.meta similarity index 100% rename from Assets/Scripts/GameTimer.cs.meta rename to Assets/Scripts/Demo/GameTimer.cs.meta diff --git a/Assets/Scripts/Rope.cs b/Assets/Scripts/Demo/Rope.cs similarity index 100% rename from Assets/Scripts/Rope.cs rename to Assets/Scripts/Demo/Rope.cs diff --git a/Assets/Scripts/Rope.cs.meta b/Assets/Scripts/Demo/Rope.cs.meta similarity index 100% rename from Assets/Scripts/Rope.cs.meta rename to Assets/Scripts/Demo/Rope.cs.meta diff --git a/Assets/Scripts/SceneSettings.cs b/Assets/Scripts/Demo/SceneSettings.cs similarity index 90% rename from Assets/Scripts/SceneSettings.cs rename to Assets/Scripts/Demo/SceneSettings.cs index 91360182f..39693a63e 100644 --- a/Assets/Scripts/SceneSettings.cs +++ b/Assets/Scripts/Demo/SceneSettings.cs @@ -43,7 +43,7 @@ public class SceneSettings : MonoBehaviour private void Start() { // EnviroManager.instance.Time.Settings.simulate = true; - EnviroManager.instance.Time.SetTimeOfDay(0.5f * 24f); + // EnviroManager.instance.Time.SetTimeOfDay(0.5f * 24f); } private void Update() @@ -80,12 +80,12 @@ public class SceneSettings : MonoBehaviour #endregion #region 场景时间 - + private void UpdateTimeOfDay() { // var p = GameTimer.GetGameDayProgress(); // Debug.Log(p); - EnviroManager.instance.Time.SetTimeOfDay(GameTimer.GetGameDayProgress() * 24f); + // EnviroManager.instance.Time.SetTimeOfDay(GameTimer.GetGameDayProgress() * 24f); } #endregion diff --git a/Assets/Scripts/SceneSettings.cs.meta b/Assets/Scripts/Demo/SceneSettings.cs.meta similarity index 100% rename from Assets/Scripts/SceneSettings.cs.meta rename to Assets/Scripts/Demo/SceneSettings.cs.meta diff --git a/Assets/Scripts/SessionHelper.cs b/Assets/Scripts/Demo/SessionHelper.cs similarity index 100% rename from Assets/Scripts/SessionHelper.cs rename to Assets/Scripts/Demo/SessionHelper.cs diff --git a/Assets/Scripts/SessionHelper.cs.meta b/Assets/Scripts/Demo/SessionHelper.cs.meta similarity index 100% rename from Assets/Scripts/SessionHelper.cs.meta rename to Assets/Scripts/Demo/SessionHelper.cs.meta diff --git a/Assets/Scripts/WaterSplash.cs b/Assets/Scripts/Demo/WaterSplash.cs similarity index 100% rename from Assets/Scripts/WaterSplash.cs rename to Assets/Scripts/Demo/WaterSplash.cs diff --git a/Assets/Scripts/WaterSplash.cs.meta b/Assets/Scripts/Demo/WaterSplash.cs.meta similarity index 100% rename from Assets/Scripts/WaterSplash.cs.meta rename to Assets/Scripts/Demo/WaterSplash.cs.meta diff --git a/Assets/Scripts/WaterTest.cs b/Assets/Scripts/Demo/WaterTest.cs similarity index 100% rename from Assets/Scripts/WaterTest.cs rename to Assets/Scripts/Demo/WaterTest.cs diff --git a/Assets/Scripts/WaterTest.cs.meta b/Assets/Scripts/Demo/WaterTest.cs.meta similarity index 100% rename from Assets/Scripts/WaterTest.cs.meta rename to Assets/Scripts/Demo/WaterTest.cs.meta diff --git a/Assets/Scripts/Fishing2.meta b/Assets/Scripts/Fishing2.meta index 69ab9d76e..7a0b13523 100644 --- a/Assets/Scripts/Fishing2.meta +++ b/Assets/Scripts/Fishing2.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: bd88d7e7b7f24428a3a67395265ba9b6 -timeCreated: 1755792122 \ No newline at end of file +guid: 370fe07e6dd1446298721033a240b4fd +timeCreated: 1756363974 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Data.meta b/Assets/Scripts/Fishing2/Data.meta new file mode 100644 index 000000000..256284f21 --- /dev/null +++ b/Assets/Scripts/Fishing2/Data.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 67d5b3b1b06a4f60875ee66ec05d6205 +timeCreated: 1756364079 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Entity/Data/Move.meta b/Assets/Scripts/Fishing2/Data/Move.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Move.meta rename to Assets/Scripts/Fishing2/Data/Move.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Move/MoveComponent.cs b/Assets/Scripts/Fishing2/Data/Move/MoveComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Move/MoveComponent.cs rename to Assets/Scripts/Fishing2/Data/Move/MoveComponent.cs diff --git a/Assets/Scripts/Fishing2/Entity/Data/Move/MoveComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Move/MoveComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Move/MoveComponent.cs.meta rename to Assets/Scripts/Fishing2/Data/Move/MoveComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/System.meta b/Assets/Scripts/Fishing2/Data/System.meta similarity index 100% rename from Assets/Scripts/Fishing2/System.meta rename to Assets/Scripts/Fishing2/Data/System.meta diff --git a/Assets/Scripts/Fishing2/System/Data/Map/MapSystem.cs b/Assets/Scripts/Fishing2/Data/System/MapSystem.cs similarity index 96% rename from Assets/Scripts/Fishing2/System/Data/Map/MapSystem.cs rename to Assets/Scripts/Fishing2/Data/System/MapSystem.cs index 2faa9e4e5..1c10f7070 100644 --- a/Assets/Scripts/Fishing2/System/Data/Map/MapSystem.cs +++ b/Assets/Scripts/Fishing2/Data/System/MapSystem.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using NBC; namespace NBF.Fishing2 diff --git a/Assets/Scripts/Fishing2/System/Data/Map/MapSystem.cs.meta b/Assets/Scripts/Fishing2/Data/System/MapSystem.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/System/Data/Map/MapSystem.cs.meta rename to Assets/Scripts/Fishing2/Data/System/MapSystem.cs.meta diff --git a/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs b/Assets/Scripts/Fishing2/Data/System/UnitSystem.cs similarity index 97% rename from Assets/Scripts/Fishing2/System/Data/UnitSystem.cs rename to Assets/Scripts/Fishing2/Data/System/UnitSystem.cs index 36dfc6b83..42eb1f1ec 100644 --- a/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs +++ b/Assets/Scripts/Fishing2/Data/System/UnitSystem.cs @@ -22,5 +22,7 @@ namespace NBF.Fishing2 { 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/Data/System/UnitSystem.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/System/Data/UnitSystem.cs.meta rename to Assets/Scripts/Fishing2/Data/System/UnitSystem.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit.meta b/Assets/Scripts/Fishing2/Data/Unit.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit.meta rename to Assets/Scripts/Fishing2/Data/Unit.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear.meta rename to Assets/Scripts/Fishing2/Data/Unit/Gear.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child.meta rename to Assets/Scripts/Fishing2/Data/Unit/Gear/Child.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBaitComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBaitComponent.cs rename to Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBaitComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBaitComponent.cs.meta rename to Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBobberComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBobberComponent.cs rename to Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBobberComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBobberComponent.cs.meta rename to Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearHookComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearHookComponent.cs rename to Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearHookComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearHookComponent.cs.meta rename to Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLineComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLineComponent.cs rename to Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLineComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLineComponent.cs.meta rename to Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLureComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLureComponent.cs rename to Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLureComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLureComponent.cs.meta rename to Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearReelComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearReelComponent.cs rename to Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearReelComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearReelComponent.cs.meta rename to Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearRodComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearRodComponent.cs rename to Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearRodComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearRodComponent.cs.meta rename to Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearWeightComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearWeightComponent.cs rename to Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearWeightComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearWeightComponent.cs.meta rename to Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/UnitGearComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/UnitGearComponent.cs rename to Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/UnitGearComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/UnitGearComponent.cs.meta rename to Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Parts.meta b/Assets/Scripts/Fishing2/Data/Unit/Parts.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Parts.meta rename to Assets/Scripts/Fishing2/Data/Unit/Parts.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Parts/UnitFlashlightComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Parts/UnitFlashlightComponent.cs rename to Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Parts/UnitFlashlightComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Parts/UnitFlashlightComponent.cs.meta rename to Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Skin.meta b/Assets/Scripts/Fishing2/Data/Unit/Skin.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Skin.meta rename to Assets/Scripts/Fishing2/Data/Unit/Skin.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Skin/UnitSkinComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Skin/UnitSkinComponent.cs rename to Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Skin/UnitSkinComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Skin/UnitSkinComponent.cs.meta rename to Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Unit.cs b/Assets/Scripts/Fishing2/Data/Unit/Unit.cs similarity index 79% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Unit.cs rename to Assets/Scripts/Fishing2/Data/Unit/Unit.cs index f674888ca..fc8918b36 100644 --- a/Assets/Scripts/Fishing2/Entity/Data/Unit/Unit.cs +++ b/Assets/Scripts/Fishing2/Data/Unit/Unit.cs @@ -1,4 +1,5 @@ -using NBC.Entitas; +using NBC; +using NBC.Entitas; using Unity.Mathematics; namespace NBF.Fishing2 @@ -48,5 +49,17 @@ namespace NBF.Fishing2 { Scene.EventComponent.Publish(new ChangeState() { Unit = this, State = state, Args = args }); } + + + #region 静态 + + public static Unit Create(Map map, MapUnitInfo unitInfo, bool isMainPlayer = false) + { + var unit = Entity.Create(map.Scene, true, true); + unit.SetUnitInfo(unitInfo); + return null; + } + + #endregion } } \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/Unit.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Unit.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/Unit.cs.meta rename to Assets/Scripts/Fishing2/Data/Unit/Unit.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitBasic.cs b/Assets/Scripts/Fishing2/Data/Unit/UnitBasic.cs similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/UnitBasic.cs rename to Assets/Scripts/Fishing2/Data/Unit/UnitBasic.cs diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitBasic.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/UnitBasic.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/UnitBasic.cs.meta rename to Assets/Scripts/Fishing2/Data/Unit/UnitBasic.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitEventType.cs b/Assets/Scripts/Fishing2/Data/Unit/UnitEventType.cs similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/UnitEventType.cs rename to Assets/Scripts/Fishing2/Data/Unit/UnitEventType.cs diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitEventType.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/UnitEventType.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/UnitEventType.cs.meta rename to Assets/Scripts/Fishing2/Data/Unit/UnitEventType.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitStateArgs.cs b/Assets/Scripts/Fishing2/Data/Unit/UnitStateArgs.cs similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/UnitStateArgs.cs rename to Assets/Scripts/Fishing2/Data/Unit/UnitStateArgs.cs diff --git a/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitStateArgs.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/UnitStateArgs.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Unit/UnitStateArgs.cs.meta rename to Assets/Scripts/Fishing2/Data/Unit/UnitStateArgs.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity.meta b/Assets/Scripts/Fishing2/Entity.meta deleted file mode 100644 index 9f6fe3988..000000000 --- a/Assets/Scripts/Fishing2/Entity.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 664b8188498e48b7875266cd768c4b23 -timeCreated: 1756305288 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Entity/Data.meta b/Assets/Scripts/Fishing2/Entity/Data.meta deleted file mode 100644 index 2461d28c1..000000000 --- a/Assets/Scripts/Fishing2/Entity/Data.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 3aca1b3b8c2e4ef38cb2c4e0759f5620 -timeCreated: 1756305296 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Entity/Data/Map.meta b/Assets/Scripts/Fishing2/Entity/Data/Map.meta deleted file mode 100644 index cf5d9963d..000000000 --- a/Assets/Scripts/Fishing2/Entity/Data/Map.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 6ce24e5f59f2424faadee3d97e357365 -timeCreated: 1756049282 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Event.meta b/Assets/Scripts/Fishing2/Event.meta deleted file mode 100644 index 8e64e000f..000000000 --- a/Assets/Scripts/Fishing2/Event.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 958c7de8b9234f129e1ce439a961d540 -timeCreated: 1756305421 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Event/LoginFinish.cs b/Assets/Scripts/Fishing2/Event/LoginFinish.cs deleted file mode 100644 index 0dc0a27fb..000000000 --- a/Assets/Scripts/Fishing2/Event/LoginFinish.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace NBF.Fishing2 -{ - /// - /// 登录完成 - /// - public struct LoginFinish - { - } -} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Event/LoginFinish.cs.meta b/Assets/Scripts/Fishing2/Event/LoginFinish.cs.meta deleted file mode 100644 index a8bed6d0d..000000000 --- a/Assets/Scripts/Fishing2/Event/LoginFinish.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: a85bf2f0e79b42caab50178c5b9c89e6 -timeCreated: 1756132556 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Map.meta b/Assets/Scripts/Fishing2/Map.meta new file mode 100644 index 000000000..2bcb59442 --- /dev/null +++ b/Assets/Scripts/Fishing2/Map.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b9626380655a42298daf90e7333172ae +timeCreated: 1756363915 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Entity/Data/Map/Map.cs b/Assets/Scripts/Fishing2/Map/Map.cs similarity index 95% rename from Assets/Scripts/Fishing2/Entity/Data/Map/Map.cs rename to Assets/Scripts/Fishing2/Map/Map.cs index eeedf2d73..909e5c99c 100644 --- a/Assets/Scripts/Fishing2/Entity/Data/Map/Map.cs +++ b/Assets/Scripts/Fishing2/Map/Map.cs @@ -15,5 +15,7 @@ namespace NBF.Fishing2 /// 地图中的单位 /// public Dictionary Units = new Dictionary(); + + } } \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Entity/Data/Map/Map.cs.meta b/Assets/Scripts/Fishing2/Map/Map.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/Data/Map/Map.cs.meta rename to Assets/Scripts/Fishing2/Map/Map.cs.meta diff --git a/Assets/Scripts/Fishing2/Map/Map2C_ChangeMapHandler.cs b/Assets/Scripts/Fishing2/Map/Map2C_ChangeMapHandler.cs new file mode 100644 index 000000000..d7274b28c --- /dev/null +++ b/Assets/Scripts/Fishing2/Map/Map2C_ChangeMapHandler.cs @@ -0,0 +1,18 @@ +using NBC; +using NBC.Network; +using NBC.Network.Interface; +using NBF.Fishing2; + +namespace NBF +{ + public class Map2C_ChangeMapHandler : Message + { + protected override async FTask Run(Session session, Map2C_ChangeMap message) + { + Log.Info($"收到地图切换消息=={message.MapId}"); + await MapHelper.LoadMap(message.MapId); + + // await MapHelper.CreateRoomTest(message.MapId); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs.meta b/Assets/Scripts/Fishing2/Map/Map2C_ChangeMapHandler.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs.meta rename to Assets/Scripts/Fishing2/Map/Map2C_ChangeMapHandler.cs.meta diff --git a/Assets/Scripts/Fishing2/Map/MapHelper.cs b/Assets/Scripts/Fishing2/Map/MapHelper.cs new file mode 100644 index 000000000..d383d84f0 --- /dev/null +++ b/Assets/Scripts/Fishing2/Map/MapHelper.cs @@ -0,0 +1,67 @@ +using System; +using NBC; + +namespace NBF.Fishing2 +{ + public static class MapHelper + { + /// + /// 开始进入地图 + /// + public static async FTask EnterMap(int mapId, long roomId = 0) + { + try + { + var root = App.Main; + var response = (Map2C_EnterMapResponse)await Net.Call(new C2Map_EnterMapRequest() + { + MapId = mapId, + RoomId = roomId + }); + Log.Info($"进入地图请求返回={response.ErrorCode}"); + + // 等待场景切换完成 + await root.GetComponent().Wait(); + Log.Info($"等待场景切换结束"); + await root.EventComponent.PublishAsync(new EnterMapFinish()); + } + catch (Exception e) + { + Log.Error(e); + return ErrorCode.Error; + } + + return ErrorCode.Success; + } + + + public static async FTask LoadMap(int mapId) + { + LoadingPanel.Show(); + var sceneName = "Map99"; + //家族场景== + await SceneHelper.LoadScene(sceneName); + + FishingPanel.Show(); + + // 通知等待场景切换的协程 + App.Main.GetComponent().Notify(new Wait_SceneChangeFinish()); + } + + public static async FTask CreateRoomTest(int mapId) + { + // var roomResponse = (Map2C_CreateRoomResponse)await Net.Call(new C2Map_CreateRoomRequest() + // { + // MapId = mapId + // }); + // Log.Info($"创建房间返回 Code={roomResponse.RoomCode} 房间玩家数量={roomResponse.Units.Count}"); + // + // //执行进入房间 + // var roomResponse2 = (G2C_EnterRoomResponse)await Net.Call(new C2G_EnterRoomRequest() + // { + // RoomCode = roomResponse.RoomCode + // }); + // Log.Info($"进入房间返回 Code={roomResponse2.RoomCode} 房间玩家数量={roomResponse2.Units.Count}"); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Helper/MapHelper.cs.meta b/Assets/Scripts/Fishing2/Map/MapHelper.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/System/Helper/MapHelper.cs.meta rename to Assets/Scripts/Fishing2/Map/MapHelper.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/MapManageComponent.cs b/Assets/Scripts/Fishing2/Map/MapManageComponent.cs similarity index 62% rename from Assets/Scripts/Fishing2/Model/MapManageComponent.cs rename to Assets/Scripts/Fishing2/Map/MapManageComponent.cs index 40aa0b937..37220211f 100644 --- a/Assets/Scripts/Fishing2/Model/MapManageComponent.cs +++ b/Assets/Scripts/Fishing2/Map/MapManageComponent.cs @@ -2,8 +2,10 @@ namespace NBF.Fishing2 { + /// + /// 地图管理组件 + /// public class MapManageComponent : Entity { - } } \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/MapManageComponent.cs.meta b/Assets/Scripts/Fishing2/Map/MapManageComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/MapManageComponent.cs.meta rename to Assets/Scripts/Fishing2/Map/MapManageComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Map/Scene.meta b/Assets/Scripts/Fishing2/Map/Scene.meta new file mode 100644 index 000000000..8f939b12b --- /dev/null +++ b/Assets/Scripts/Fishing2/Map/Scene.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2f5c6349983b45b0bc48d4f30ef677ee +timeCreated: 1756367958 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Map/Scene/MapScene.cs b/Assets/Scripts/Fishing2/Map/Scene/MapScene.cs new file mode 100644 index 000000000..9a0082505 --- /dev/null +++ b/Assets/Scripts/Fishing2/Map/Scene/MapScene.cs @@ -0,0 +1,9 @@ +using NBC.Entitas; + +namespace NBF.Fishing2 +{ + public class MapScene : Entity + { + + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Map/Scene/MapScene.cs.meta b/Assets/Scripts/Fishing2/Map/Scene/MapScene.cs.meta new file mode 100644 index 000000000..26d563474 --- /dev/null +++ b/Assets/Scripts/Fishing2/Map/Scene/MapScene.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f4087371950b45cb8eaa0933cfbd9bee +timeCreated: 1756365024 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Map/Scene/SceneHelper.cs b/Assets/Scripts/Fishing2/Map/Scene/SceneHelper.cs new file mode 100644 index 000000000..515fa8522 --- /dev/null +++ b/Assets/Scripts/Fishing2/Map/Scene/SceneHelper.cs @@ -0,0 +1,38 @@ +using System; +using NBC; +using UnityEngine.SceneManagement; + +namespace NBF.Fishing2 +{ + public static class SceneHelper + { + public static async FTask LoadScene(string sceneName) + { + try + { + App.Main.EventComponent.Publish(new SceneChangeStart()); + LoadingPanel.Show(); + var asyncOperation = SceneManager.LoadSceneAsync(sceneName); + if (asyncOperation == null) throw new Exception($"Scene not found,name={sceneName}"); + while (true) + { + App.Main.EventComponent.Publish(new LoadingProgress() + { + Progress = asyncOperation.progress + }); + LoadingPanel.SetProgress(asyncOperation.progress); + // 等待0.5秒后执行下面的逻辑。 + await App.Main.TimerComponent.Net.WaitAsync(500); + if (asyncOperation.isDone) + { + break; + } + } + } + catch (Exception e) + { + Log.Error(e); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Map/Scene/SceneHelper.cs.meta b/Assets/Scripts/Fishing2/Map/Scene/SceneHelper.cs.meta new file mode 100644 index 000000000..6cf1a83b7 --- /dev/null +++ b/Assets/Scripts/Fishing2/Map/Scene/SceneHelper.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d4a2e9c0ac6d4faabbec4bccdb7a2917 +timeCreated: 1756367987 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs b/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs deleted file mode 100644 index 70b04c1b4..000000000 --- a/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs +++ /dev/null @@ -1,24 +0,0 @@ -using NBC; -using NBC.Network; -using NBC.Network.Interface; -using NBF.Fishing2; - -namespace NBF -{ - public class Map2C_ChangeMapHandler : Message - { - protected override async FTask Run(Session session, Map2C_ChangeMap message) - { - Log.Info($"收到地图切换消息=={message.MapId}"); - await MapHelper.CreateRoomTest(message.MapId); - } - } - // public class Map2C_ChangeMapHandler : Message - // { - // protected override async FTask Run(Session session, Map2C_ChangeMap message) - // { - // Log.Info($"收到地图切换消息=={message.MapId}"); - // await MapHelper.CreateRoomTest(message.MapId); - // } - // } -} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Data.meta b/Assets/Scripts/Fishing2/System/Data.meta deleted file mode 100644 index bcd63628f..000000000 --- a/Assets/Scripts/Fishing2/System/Data.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: cd5e378ae3c94070be009d1df97f6aae -timeCreated: 1756049450 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Data/Map.meta b/Assets/Scripts/Fishing2/System/Data/Map.meta deleted file mode 100644 index ac3909cf7..000000000 --- a/Assets/Scripts/Fishing2/System/Data/Map.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 3ea88c9233de496b971c64715426805f -timeCreated: 1756132197 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Data/UnitFactory.cs b/Assets/Scripts/Fishing2/System/Data/UnitFactory.cs deleted file mode 100644 index e657fe231..000000000 --- a/Assets/Scripts/Fishing2/System/Data/UnitFactory.cs +++ /dev/null @@ -1,15 +0,0 @@ -using NBC; -using NBC.Entitas; - -namespace NBF.Fishing2 -{ - public static partial class UnitFactory - { - public static Unit Create(Map map, MapUnitInfo unitInfo, bool isMainPlayer = false) - { - var unit = Entity.Create(map.Scene,true,true); - unit.SetUnitInfo(unitInfo); - return null; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Data/UnitFactory.cs.meta b/Assets/Scripts/Fishing2/System/Data/UnitFactory.cs.meta deleted file mode 100644 index a6899b615..000000000 --- a/Assets/Scripts/Fishing2/System/Data/UnitFactory.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: d636bf7bc79a4d55b7f03a6e7a187b22 -timeCreated: 1756106498 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Helper.meta b/Assets/Scripts/Fishing2/System/Helper.meta deleted file mode 100644 index d8f9d4b56..000000000 --- a/Assets/Scripts/Fishing2/System/Helper.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 8de8645248d34ebfaf351bc67a8b8a45 -timeCreated: 1756309950 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Helper/MapHelper.cs b/Assets/Scripts/Fishing2/System/Helper/MapHelper.cs deleted file mode 100644 index 1b06e3f1a..000000000 --- a/Assets/Scripts/Fishing2/System/Helper/MapHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using NBC; - -namespace NBF.Fishing2 -{ - public static class MapHelper - { - /// - /// 开始进入地图 - /// - public static async FTask Enter(int mapId, long roomId = 0) - { - var response = (Map2C_EnterMapResponse)await Net.Call(new C2Map_EnterMapRequest() - { - MapId = mapId, - RoomId = roomId - }); - Log.Info($"进入房间请求返回={response.ErrorCode}"); - - await FTask.CompletedTask; - } - - public static async FTask CreateRoomTest(int mapId) - { - // var roomResponse = (Map2C_CreateRoomResponse)await Net.Call(new C2Map_CreateRoomRequest() - // { - // MapId = mapId - // }); - // Log.Info($"创建房间返回 Code={roomResponse.RoomCode} 房间玩家数量={roomResponse.Units.Count}"); - // - // //执行进入房间 - // var roomResponse2 = (G2C_EnterRoomResponse)await Net.Call(new C2G_EnterRoomRequest() - // { - // RoomCode = roomResponse.RoomCode - // }); - // Log.Info($"进入房间返回 Code={roomResponse2.RoomCode} 房间玩家数量={roomResponse2.Units.Count}"); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Views.meta b/Assets/Scripts/Fishing2/System/Views.meta deleted file mode 100644 index 35416fae9..000000000 --- a/Assets/Scripts/Fishing2/System/Views.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: f610539cbd2c43438067954ba6c2f148 -timeCreated: 1756049458 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Entity/View.meta b/Assets/Scripts/Fishing2/View.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/View.meta rename to Assets/Scripts/Fishing2/View.meta diff --git a/Assets/Scripts/Fishing2/View/System.meta b/Assets/Scripts/Fishing2/View/System.meta new file mode 100644 index 000000000..e698c5bdc --- /dev/null +++ b/Assets/Scripts/Fishing2/View/System.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ce6182010e784256ba7127a8ffa8d056 +timeCreated: 1756364880 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs b/Assets/Scripts/Fishing2/View/System/UnitUnityComponentSystem.cs similarity index 100% rename from Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs rename to Assets/Scripts/Fishing2/View/System/UnitUnityComponentSystem.cs diff --git a/Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs.meta b/Assets/Scripts/Fishing2/View/System/UnitUnityComponentSystem.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs.meta rename to Assets/Scripts/Fishing2/View/System/UnitUnityComponentSystem.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/View/Unit.meta b/Assets/Scripts/Fishing2/View/Unit.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/View/Unit.meta rename to Assets/Scripts/Fishing2/View/Unit.meta diff --git a/Assets/Scripts/Fishing2/Entity/View/Unit/UnitHUDComponent.cs b/Assets/Scripts/Fishing2/View/Unit/UnitHUDComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Entity/View/Unit/UnitHUDComponent.cs rename to Assets/Scripts/Fishing2/View/Unit/UnitHUDComponent.cs diff --git a/Assets/Scripts/Fishing2/Entity/View/Unit/UnitHUDComponent.cs.meta b/Assets/Scripts/Fishing2/View/Unit/UnitHUDComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/View/Unit/UnitHUDComponent.cs.meta rename to Assets/Scripts/Fishing2/View/Unit/UnitHUDComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/View/Unit/UnitUnityComponent.cs b/Assets/Scripts/Fishing2/View/Unit/UnitUnityComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Entity/View/Unit/UnitUnityComponent.cs rename to Assets/Scripts/Fishing2/View/Unit/UnitUnityComponent.cs diff --git a/Assets/Scripts/Fishing2/Entity/View/Unit/UnitUnityComponent.cs.meta b/Assets/Scripts/Fishing2/View/Unit/UnitUnityComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Entity/View/Unit/UnitUnityComponent.cs.meta rename to Assets/Scripts/Fishing2/View/Unit/UnitUnityComponent.cs.meta diff --git a/Assets/Scripts/Startup/Init.cs b/Assets/Scripts/Init.cs similarity index 100% rename from Assets/Scripts/Startup/Init.cs rename to Assets/Scripts/Init.cs diff --git a/Assets/Scripts/Startup/Init.cs.meta b/Assets/Scripts/Init.cs.meta similarity index 100% rename from Assets/Scripts/Startup/Init.cs.meta rename to Assets/Scripts/Init.cs.meta diff --git a/Assets/Scripts/Fishing2/Model.meta b/Assets/Scripts/Model.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model.meta rename to Assets/Scripts/Model.meta diff --git a/Assets/Scripts/Fishing2/Assets.meta b/Assets/Scripts/Model/Assets.meta similarity index 100% rename from Assets/Scripts/Fishing2/Assets.meta rename to Assets/Scripts/Model/Assets.meta diff --git a/Assets/Scripts/Fishing2/Assets/BaitAsset.cs b/Assets/Scripts/Model/Assets/BaitAsset.cs similarity index 100% rename from Assets/Scripts/Fishing2/Assets/BaitAsset.cs rename to Assets/Scripts/Model/Assets/BaitAsset.cs diff --git a/Assets/Scripts/Fishing2/Assets/BaitAsset.cs.meta b/Assets/Scripts/Model/Assets/BaitAsset.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Assets/BaitAsset.cs.meta rename to Assets/Scripts/Model/Assets/BaitAsset.cs.meta diff --git a/Assets/Scripts/Fishing2/Assets/BobberAsset.cs b/Assets/Scripts/Model/Assets/BobberAsset.cs similarity index 100% rename from Assets/Scripts/Fishing2/Assets/BobberAsset.cs rename to Assets/Scripts/Model/Assets/BobberAsset.cs diff --git a/Assets/Scripts/Fishing2/Assets/BobberAsset.cs.meta b/Assets/Scripts/Model/Assets/BobberAsset.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Assets/BobberAsset.cs.meta rename to Assets/Scripts/Model/Assets/BobberAsset.cs.meta diff --git a/Assets/Scripts/Fishing2/Assets/FishAsset.cs b/Assets/Scripts/Model/Assets/FishAsset.cs similarity index 100% rename from Assets/Scripts/Fishing2/Assets/FishAsset.cs rename to Assets/Scripts/Model/Assets/FishAsset.cs diff --git a/Assets/Scripts/Fishing2/Assets/FishAsset.cs.meta b/Assets/Scripts/Model/Assets/FishAsset.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Assets/FishAsset.cs.meta rename to Assets/Scripts/Model/Assets/FishAsset.cs.meta diff --git a/Assets/Scripts/Fishing2/Assets/FishGroupAsset.cs b/Assets/Scripts/Model/Assets/FishGroupAsset.cs similarity index 100% rename from Assets/Scripts/Fishing2/Assets/FishGroupAsset.cs rename to Assets/Scripts/Model/Assets/FishGroupAsset.cs diff --git a/Assets/Scripts/Fishing2/Assets/FishGroupAsset.cs.meta b/Assets/Scripts/Model/Assets/FishGroupAsset.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Assets/FishGroupAsset.cs.meta rename to Assets/Scripts/Model/Assets/FishGroupAsset.cs.meta diff --git a/Assets/Scripts/Fishing2/Assets/HookAsset.cs b/Assets/Scripts/Model/Assets/HookAsset.cs similarity index 100% rename from Assets/Scripts/Fishing2/Assets/HookAsset.cs rename to Assets/Scripts/Model/Assets/HookAsset.cs diff --git a/Assets/Scripts/Fishing2/Assets/HookAsset.cs.meta b/Assets/Scripts/Model/Assets/HookAsset.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Assets/HookAsset.cs.meta rename to Assets/Scripts/Model/Assets/HookAsset.cs.meta diff --git a/Assets/Scripts/Fishing2/Assets/LineAsset.cs b/Assets/Scripts/Model/Assets/LineAsset.cs similarity index 100% rename from Assets/Scripts/Fishing2/Assets/LineAsset.cs rename to Assets/Scripts/Model/Assets/LineAsset.cs diff --git a/Assets/Scripts/Fishing2/Assets/LineAsset.cs.meta b/Assets/Scripts/Model/Assets/LineAsset.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Assets/LineAsset.cs.meta rename to Assets/Scripts/Model/Assets/LineAsset.cs.meta diff --git a/Assets/Scripts/Fishing2/Assets/LureAsset.cs b/Assets/Scripts/Model/Assets/LureAsset.cs similarity index 100% rename from Assets/Scripts/Fishing2/Assets/LureAsset.cs rename to Assets/Scripts/Model/Assets/LureAsset.cs diff --git a/Assets/Scripts/Fishing2/Assets/LureAsset.cs.meta b/Assets/Scripts/Model/Assets/LureAsset.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Assets/LureAsset.cs.meta rename to Assets/Scripts/Model/Assets/LureAsset.cs.meta diff --git a/Assets/Scripts/Fishing2/Assets/PreviewableAsset.cs b/Assets/Scripts/Model/Assets/PreviewableAsset.cs similarity index 100% rename from Assets/Scripts/Fishing2/Assets/PreviewableAsset.cs rename to Assets/Scripts/Model/Assets/PreviewableAsset.cs diff --git a/Assets/Scripts/Fishing2/Assets/PreviewableAsset.cs.meta b/Assets/Scripts/Model/Assets/PreviewableAsset.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Assets/PreviewableAsset.cs.meta rename to Assets/Scripts/Model/Assets/PreviewableAsset.cs.meta diff --git a/Assets/Scripts/Fishing2/Assets/PropAsset.cs b/Assets/Scripts/Model/Assets/PropAsset.cs similarity index 100% rename from Assets/Scripts/Fishing2/Assets/PropAsset.cs rename to Assets/Scripts/Model/Assets/PropAsset.cs diff --git a/Assets/Scripts/Fishing2/Assets/PropAsset.cs.meta b/Assets/Scripts/Model/Assets/PropAsset.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Assets/PropAsset.cs.meta rename to Assets/Scripts/Model/Assets/PropAsset.cs.meta diff --git a/Assets/Scripts/Fishing2/Assets/ReelAsset.cs b/Assets/Scripts/Model/Assets/ReelAsset.cs similarity index 100% rename from Assets/Scripts/Fishing2/Assets/ReelAsset.cs rename to Assets/Scripts/Model/Assets/ReelAsset.cs diff --git a/Assets/Scripts/Fishing2/Assets/ReelAsset.cs.meta b/Assets/Scripts/Model/Assets/ReelAsset.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Assets/ReelAsset.cs.meta rename to Assets/Scripts/Model/Assets/ReelAsset.cs.meta diff --git a/Assets/Scripts/Fishing2/Assets/RodAsset.cs b/Assets/Scripts/Model/Assets/RodAsset.cs similarity index 100% rename from Assets/Scripts/Fishing2/Assets/RodAsset.cs rename to Assets/Scripts/Model/Assets/RodAsset.cs diff --git a/Assets/Scripts/Fishing2/Assets/RodAsset.cs.meta b/Assets/Scripts/Model/Assets/RodAsset.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Assets/RodAsset.cs.meta rename to Assets/Scripts/Model/Assets/RodAsset.cs.meta diff --git a/Assets/Scripts/Fishing2/Assets/RodRingAsset.cs b/Assets/Scripts/Model/Assets/RodRingAsset.cs similarity index 100% rename from Assets/Scripts/Fishing2/Assets/RodRingAsset.cs rename to Assets/Scripts/Model/Assets/RodRingAsset.cs diff --git a/Assets/Scripts/Fishing2/Assets/RodRingAsset.cs.meta b/Assets/Scripts/Model/Assets/RodRingAsset.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Assets/RodRingAsset.cs.meta rename to Assets/Scripts/Model/Assets/RodRingAsset.cs.meta diff --git a/Assets/Scripts/Fishing2/Assets/SpinnerLureAsset.cs b/Assets/Scripts/Model/Assets/SpinnerLureAsset.cs similarity index 100% rename from Assets/Scripts/Fishing2/Assets/SpinnerLureAsset.cs rename to Assets/Scripts/Model/Assets/SpinnerLureAsset.cs diff --git a/Assets/Scripts/Fishing2/Assets/SpinnerLureAsset.cs.meta b/Assets/Scripts/Model/Assets/SpinnerLureAsset.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Assets/SpinnerLureAsset.cs.meta rename to Assets/Scripts/Model/Assets/SpinnerLureAsset.cs.meta diff --git a/Assets/Scripts/Model/Common.meta b/Assets/Scripts/Model/Common.meta new file mode 100644 index 000000000..e429883f5 --- /dev/null +++ b/Assets/Scripts/Model/Common.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c8426c4b03da403284afe458076b9c10 +timeCreated: 1742387508 \ No newline at end of file diff --git a/Assets/Scripts/Common/Attrobites.meta b/Assets/Scripts/Model/Common/Attrobites.meta similarity index 100% rename from Assets/Scripts/Common/Attrobites.meta rename to Assets/Scripts/Model/Common/Attrobites.meta diff --git a/Assets/Scripts/Common/Attrobites/AttributeHelper.cs b/Assets/Scripts/Model/Common/Attrobites/AttributeHelper.cs similarity index 100% rename from Assets/Scripts/Common/Attrobites/AttributeHelper.cs rename to Assets/Scripts/Model/Common/Attrobites/AttributeHelper.cs diff --git a/Assets/Scripts/Common/Attrobites/AttributeHelper.cs.meta b/Assets/Scripts/Model/Common/Attrobites/AttributeHelper.cs.meta similarity index 100% rename from Assets/Scripts/Common/Attrobites/AttributeHelper.cs.meta rename to Assets/Scripts/Model/Common/Attrobites/AttributeHelper.cs.meta diff --git a/Assets/Scripts/Common/Attrobites/Attributes.cs b/Assets/Scripts/Model/Common/Attrobites/Attributes.cs similarity index 100% rename from Assets/Scripts/Common/Attrobites/Attributes.cs rename to Assets/Scripts/Model/Common/Attrobites/Attributes.cs diff --git a/Assets/Scripts/Common/Attrobites/Attributes.cs.meta b/Assets/Scripts/Model/Common/Attrobites/Attributes.cs.meta similarity index 100% rename from Assets/Scripts/Common/Attrobites/Attributes.cs.meta rename to Assets/Scripts/Model/Common/Attrobites/Attributes.cs.meta diff --git a/Assets/Scripts/Common/BaseCamera.cs b/Assets/Scripts/Model/Common/BaseCamera.cs similarity index 100% rename from Assets/Scripts/Common/BaseCamera.cs rename to Assets/Scripts/Model/Common/BaseCamera.cs diff --git a/Assets/Scripts/Common/BaseCamera.cs.meta b/Assets/Scripts/Model/Common/BaseCamera.cs.meta similarity index 100% rename from Assets/Scripts/Common/BaseCamera.cs.meta rename to Assets/Scripts/Model/Common/BaseCamera.cs.meta diff --git a/Assets/Scripts/Common/Enum.meta b/Assets/Scripts/Model/Common/Enum.meta similarity index 100% rename from Assets/Scripts/Common/Enum.meta rename to Assets/Scripts/Model/Common/Enum.meta diff --git a/Assets/Scripts/Common/Enum/FishSpecies.cs b/Assets/Scripts/Model/Common/Enum/FishSpecies.cs similarity index 100% rename from Assets/Scripts/Common/Enum/FishSpecies.cs rename to Assets/Scripts/Model/Common/Enum/FishSpecies.cs diff --git a/Assets/Scripts/Common/Enum/FishSpecies.cs.meta b/Assets/Scripts/Model/Common/Enum/FishSpecies.cs.meta similarity index 100% rename from Assets/Scripts/Common/Enum/FishSpecies.cs.meta rename to Assets/Scripts/Model/Common/Enum/FishSpecies.cs.meta diff --git a/Assets/Scripts/Common/Input.meta b/Assets/Scripts/Model/Common/Input.meta similarity index 100% rename from Assets/Scripts/Common/Input.meta rename to Assets/Scripts/Model/Common/Input.meta diff --git a/Assets/Scripts/Common/Input/InteractiveObject.cs b/Assets/Scripts/Model/Common/Input/InteractiveObject.cs similarity index 100% rename from Assets/Scripts/Common/Input/InteractiveObject.cs rename to Assets/Scripts/Model/Common/Input/InteractiveObject.cs diff --git a/Assets/Scripts/Common/Input/InteractiveObject.cs.meta b/Assets/Scripts/Model/Common/Input/InteractiveObject.cs.meta similarity index 100% rename from Assets/Scripts/Common/Input/InteractiveObject.cs.meta rename to Assets/Scripts/Model/Common/Input/InteractiveObject.cs.meta diff --git a/Assets/Scripts/Common/Input/PlayerInputControl.cs b/Assets/Scripts/Model/Common/Input/PlayerInputControl.cs similarity index 100% rename from Assets/Scripts/Common/Input/PlayerInputControl.cs rename to Assets/Scripts/Model/Common/Input/PlayerInputControl.cs diff --git a/Assets/Scripts/Common/Input/PlayerInputControl.cs.meta b/Assets/Scripts/Model/Common/Input/PlayerInputControl.cs.meta similarity index 100% rename from Assets/Scripts/Common/Input/PlayerInputControl.cs.meta rename to Assets/Scripts/Model/Common/Input/PlayerInputControl.cs.meta diff --git a/Assets/Scripts/Common/Outline.cs b/Assets/Scripts/Model/Common/Outline.cs similarity index 100% rename from Assets/Scripts/Common/Outline.cs rename to Assets/Scripts/Model/Common/Outline.cs diff --git a/Assets/Scripts/Common/Outline.cs.meta b/Assets/Scripts/Model/Common/Outline.cs.meta similarity index 100% rename from Assets/Scripts/Common/Outline.cs.meta rename to Assets/Scripts/Model/Common/Outline.cs.meta diff --git a/Assets/Scripts/Common/PermanentCommon.cs b/Assets/Scripts/Model/Common/PermanentCommon.cs similarity index 100% rename from Assets/Scripts/Common/PermanentCommon.cs rename to Assets/Scripts/Model/Common/PermanentCommon.cs diff --git a/Assets/Scripts/Common/PermanentCommon.cs.meta b/Assets/Scripts/Model/Common/PermanentCommon.cs.meta similarity index 100% rename from Assets/Scripts/Common/PermanentCommon.cs.meta rename to Assets/Scripts/Model/Common/PermanentCommon.cs.meta diff --git a/Assets/Scripts/Common/Services.meta b/Assets/Scripts/Model/Common/Services.meta similarity index 100% rename from Assets/Scripts/Common/Services.meta rename to Assets/Scripts/Model/Common/Services.meta diff --git a/Assets/Scripts/Common/Services/Input.meta b/Assets/Scripts/Model/Common/Services/Input.meta similarity index 100% rename from Assets/Scripts/Common/Services/Input.meta rename to Assets/Scripts/Model/Common/Services/Input.meta diff --git a/Assets/Scripts/Common/Services/Input/InputCursorExtension.cs b/Assets/Scripts/Model/Common/Services/Input/InputCursorExtension.cs similarity index 100% rename from Assets/Scripts/Common/Services/Input/InputCursorExtension.cs rename to Assets/Scripts/Model/Common/Services/Input/InputCursorExtension.cs diff --git a/Assets/Scripts/Common/Services/Input/InputCursorExtension.cs.meta b/Assets/Scripts/Model/Common/Services/Input/InputCursorExtension.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Input/InputCursorExtension.cs.meta rename to Assets/Scripts/Model/Common/Services/Input/InputCursorExtension.cs.meta diff --git a/Assets/Scripts/Common/Services/Input/InputManager.cs b/Assets/Scripts/Model/Common/Services/Input/InputManager.cs similarity index 100% rename from Assets/Scripts/Common/Services/Input/InputManager.cs rename to Assets/Scripts/Model/Common/Services/Input/InputManager.cs diff --git a/Assets/Scripts/Common/Services/Input/InputManager.cs.meta b/Assets/Scripts/Model/Common/Services/Input/InputManager.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Input/InputManager.cs.meta rename to Assets/Scripts/Model/Common/Services/Input/InputManager.cs.meta diff --git a/Assets/Scripts/Common/Services/MonoService.cs b/Assets/Scripts/Model/Common/Services/MonoService.cs similarity index 100% rename from Assets/Scripts/Common/Services/MonoService.cs rename to Assets/Scripts/Model/Common/Services/MonoService.cs diff --git a/Assets/Scripts/Common/Services/MonoService.cs.meta b/Assets/Scripts/Model/Common/Services/MonoService.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/MonoService.cs.meta rename to Assets/Scripts/Model/Common/Services/MonoService.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings.meta b/Assets/Scripts/Model/Common/Services/Settings.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings.meta rename to Assets/Scripts/Model/Common/Services/Settings.meta diff --git a/Assets/Scripts/Common/Services/Settings/Base.meta b/Assets/Scripts/Model/Common/Services/Settings/Base.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base.meta rename to Assets/Scripts/Model/Common/Services/Settings/Base.meta diff --git a/Assets/Scripts/Common/Services/Settings/Base/ControllerOption.cs b/Assets/Scripts/Model/Common/Services/Settings/Base/ControllerOption.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/ControllerOption.cs rename to Assets/Scripts/Model/Common/Services/Settings/Base/ControllerOption.cs diff --git a/Assets/Scripts/Common/Services/Settings/Base/ControllerOption.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Base/ControllerOption.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/ControllerOption.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Base/ControllerOption.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Base/GamepadOption.cs b/Assets/Scripts/Model/Common/Services/Settings/Base/GamepadOption.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/GamepadOption.cs rename to Assets/Scripts/Model/Common/Services/Settings/Base/GamepadOption.cs diff --git a/Assets/Scripts/Common/Services/Settings/Base/GamepadOption.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Base/GamepadOption.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/GamepadOption.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Base/GamepadOption.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Base/ISettings.cs b/Assets/Scripts/Model/Common/Services/Settings/Base/ISettings.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/ISettings.cs rename to Assets/Scripts/Model/Common/Services/Settings/Base/ISettings.cs diff --git a/Assets/Scripts/Common/Services/Settings/Base/ISettings.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Base/ISettings.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/ISettings.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Base/ISettings.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Base/InputOption.cs b/Assets/Scripts/Model/Common/Services/Settings/Base/InputOption.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/InputOption.cs rename to Assets/Scripts/Model/Common/Services/Settings/Base/InputOption.cs diff --git a/Assets/Scripts/Common/Services/Settings/Base/InputOption.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Base/InputOption.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/InputOption.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Base/InputOption.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Base/KeyBoardOption.cs b/Assets/Scripts/Model/Common/Services/Settings/Base/KeyBoardOption.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/KeyBoardOption.cs rename to Assets/Scripts/Model/Common/Services/Settings/Base/KeyBoardOption.cs diff --git a/Assets/Scripts/Common/Services/Settings/Base/KeyBoardOption.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Base/KeyBoardOption.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/KeyBoardOption.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Base/KeyBoardOption.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Base/MultiOption.cs b/Assets/Scripts/Model/Common/Services/Settings/Base/MultiOption.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/MultiOption.cs rename to Assets/Scripts/Model/Common/Services/Settings/Base/MultiOption.cs diff --git a/Assets/Scripts/Common/Services/Settings/Base/MultiOption.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Base/MultiOption.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/MultiOption.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Base/MultiOption.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Base/OptionBase.cs b/Assets/Scripts/Model/Common/Services/Settings/Base/OptionBase.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/OptionBase.cs rename to Assets/Scripts/Model/Common/Services/Settings/Base/OptionBase.cs diff --git a/Assets/Scripts/Common/Services/Settings/Base/OptionBase.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Base/OptionBase.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/OptionBase.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Base/OptionBase.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Base/OptionTable.cs b/Assets/Scripts/Model/Common/Services/Settings/Base/OptionTable.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/OptionTable.cs rename to Assets/Scripts/Model/Common/Services/Settings/Base/OptionTable.cs diff --git a/Assets/Scripts/Common/Services/Settings/Base/OptionTable.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Base/OptionTable.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/OptionTable.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Base/OptionTable.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Base/RangeOption.cs b/Assets/Scripts/Model/Common/Services/Settings/Base/RangeOption.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/RangeOption.cs rename to Assets/Scripts/Model/Common/Services/Settings/Base/RangeOption.cs diff --git a/Assets/Scripts/Common/Services/Settings/Base/RangeOption.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Base/RangeOption.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/RangeOption.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Base/RangeOption.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Base/ToggleOption.cs b/Assets/Scripts/Model/Common/Services/Settings/Base/ToggleOption.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/ToggleOption.cs rename to Assets/Scripts/Model/Common/Services/Settings/Base/ToggleOption.cs diff --git a/Assets/Scripts/Common/Services/Settings/Base/ToggleOption.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Base/ToggleOption.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Base/ToggleOption.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Base/ToggleOption.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options.meta b/Assets/Scripts/Model/Common/Services/Settings/Options.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/AnisotropicModeSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/AnisotropicModeSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/AnisotropicModeSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/AnisotropicModeSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/AnisotropicModeSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/AnisotropicModeSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/AnisotropicModeSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/AnisotropicModeSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/FullScreenModeSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/FullScreenModeSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/FullScreenModeSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/FullScreenModeSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/FullScreenModeSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/FullScreenModeSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/FullScreenModeSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/FullScreenModeSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/GlobalAnisotropicFilteringLimitsSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/GlobalAnisotropicFilteringLimitsSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/GlobalAnisotropicFilteringLimitsSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/GlobalAnisotropicFilteringLimitsSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/GlobalAnisotropicFilteringLimitsSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/GlobalAnisotropicFilteringLimitsSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/GlobalAnisotropicFilteringLimitsSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/GlobalAnisotropicFilteringLimitsSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/MsaaSampleSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/MsaaSampleSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/MsaaSampleSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/MsaaSampleSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/MsaaSampleSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/MsaaSampleSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/MsaaSampleSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/MsaaSampleSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/QualityLevelSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/QualityLevelSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/QualityLevelSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/QualityLevelSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/QualityLevelSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/QualityLevelSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/QualityLevelSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/QualityLevelSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/RenderScaleSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/RenderScaleSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/RenderScaleSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/RenderScaleSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/RenderScaleSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/RenderScaleSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/RenderScaleSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/RenderScaleSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/ResolutionSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/ResolutionSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/ResolutionSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/ResolutionSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/ResolutionSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/ResolutionSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/ResolutionSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/ResolutionSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/TextureQualitySetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/TextureQualitySetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/TextureQualitySetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/TextureQualitySetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/TextureQualitySetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/TextureQualitySetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/TextureQualitySetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/TextureQualitySetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/VSyncSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/VSyncSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/VSyncSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/VSyncSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Graphics/VSyncSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/VSyncSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Graphics/VSyncSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Graphics/VSyncSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Input.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Input.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Input.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input/InputAddBobSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputAddBobSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Input/InputAddBobSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputAddBobSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input/InputAddBobSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputAddBobSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Input/InputAddBobSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputAddBobSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input/InputChatSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputChatSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Input/InputChatSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputChatSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input/InputChatSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputChatSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Input/InputChatSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputChatSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input/InputHelpSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputHelpSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Input/InputHelpSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputHelpSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input/InputHelpSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputHelpSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Input/InputHelpSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputHelpSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input/InputSubBobSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputSubBobSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Input/InputSubBobSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputSubBobSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input/InputSubBobSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputSubBobSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Input/InputSubBobSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputSubBobSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input/InputToBagSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputToBagSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Input/InputToBagSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputToBagSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input/InputToBagSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputToBagSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Input/InputToBagSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputToBagSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input/InputUseTelescopeSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputUseTelescopeSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Input/InputUseTelescopeSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputUseTelescopeSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input/InputUseTelescopeSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputUseTelescopeSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Input/InputUseTelescopeSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputUseTelescopeSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input/InputUseTorchSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputUseTorchSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Input/InputUseTorchSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputUseTorchSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input/InputUseTorchSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputUseTorchSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Input/InputUseTorchSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Input/InputUseTorchSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Language.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Language.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Language.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Language.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Language/LanguageSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Language/LanguageSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Language/LanguageSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Language/LanguageSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Language/LanguageSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Language/LanguageSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Language/LanguageSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Language/LanguageSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Sound.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Sound.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Sound.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Sound.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Sound/AmbientVolumeSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Sound/AmbientVolumeSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Sound/AmbientVolumeSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Sound/AmbientVolumeSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Sound/AmbientVolumeSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Sound/AmbientVolumeSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Sound/AmbientVolumeSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Sound/AmbientVolumeSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Sound/MasterVolumeSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Sound/MasterVolumeSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Sound/MasterVolumeSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Sound/MasterVolumeSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Sound/MasterVolumeSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Sound/MasterVolumeSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Sound/MasterVolumeSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Sound/MasterVolumeSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Sound/PlayerVolumeSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Sound/PlayerVolumeSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Sound/PlayerVolumeSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Sound/PlayerVolumeSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Sound/PlayerVolumeSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Sound/PlayerVolumeSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Sound/PlayerVolumeSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Sound/PlayerVolumeSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Options/Sound/UIVolumeSetting.cs b/Assets/Scripts/Model/Common/Services/Settings/Options/Sound/UIVolumeSetting.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Sound/UIVolumeSetting.cs rename to Assets/Scripts/Model/Common/Services/Settings/Options/Sound/UIVolumeSetting.cs diff --git a/Assets/Scripts/Common/Services/Settings/Options/Sound/UIVolumeSetting.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Options/Sound/UIVolumeSetting.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Options/Sound/UIVolumeSetting.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Options/Sound/UIVolumeSetting.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/Settings.cs b/Assets/Scripts/Model/Common/Services/Settings/Settings.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Settings.cs rename to Assets/Scripts/Model/Common/Services/Settings/Settings.cs diff --git a/Assets/Scripts/Common/Services/Settings/Settings.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/Settings.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/Settings.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/Settings.cs.meta diff --git a/Assets/Scripts/Common/Services/Settings/SettingsDef.cs b/Assets/Scripts/Model/Common/Services/Settings/SettingsDef.cs similarity index 100% rename from Assets/Scripts/Common/Services/Settings/SettingsDef.cs rename to Assets/Scripts/Model/Common/Services/Settings/SettingsDef.cs diff --git a/Assets/Scripts/Common/Services/Settings/SettingsDef.cs.meta b/Assets/Scripts/Model/Common/Services/Settings/SettingsDef.cs.meta similarity index 100% rename from Assets/Scripts/Common/Services/Settings/SettingsDef.cs.meta rename to Assets/Scripts/Model/Common/Services/Settings/SettingsDef.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Data.meta b/Assets/Scripts/Model/Data.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Data.meta rename to Assets/Scripts/Model/Data.meta diff --git a/Assets/Scripts/Fishing2/Model/Data/TabListData.cs b/Assets/Scripts/Model/Data/TabListData.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Data/TabListData.cs rename to Assets/Scripts/Model/Data/TabListData.cs diff --git a/Assets/Scripts/Fishing2/Model/Data/TabListData.cs.meta b/Assets/Scripts/Model/Data/TabListData.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Data/TabListData.cs.meta rename to Assets/Scripts/Model/Data/TabListData.cs.meta diff --git a/Assets/Scripts/Model/Login.meta b/Assets/Scripts/Model/Login.meta new file mode 100644 index 000000000..9dbea86d7 --- /dev/null +++ b/Assets/Scripts/Model/Login.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 68baddf7abd1473fabac026cc34e9b14 +timeCreated: 1756363638 \ No newline at end of file diff --git a/Assets/Scripts/UI/Login/LoginHelper.cs b/Assets/Scripts/Model/Login/LoginHelper.cs similarity index 100% rename from Assets/Scripts/UI/Login/LoginHelper.cs rename to Assets/Scripts/Model/Login/LoginHelper.cs diff --git a/Assets/Scripts/UI/Login/LoginHelper.cs.meta b/Assets/Scripts/Model/Login/LoginHelper.cs.meta similarity index 100% rename from Assets/Scripts/UI/Login/LoginHelper.cs.meta rename to Assets/Scripts/Model/Login/LoginHelper.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Module.meta b/Assets/Scripts/Model/Module.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Module.meta rename to Assets/Scripts/Model/Module.meta diff --git a/Assets/Scripts/Fishing2/Model/Module/Numeric.meta b/Assets/Scripts/Model/Module/Numeric.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Module/Numeric.meta rename to Assets/Scripts/Model/Module/Numeric.meta diff --git a/Assets/Scripts/Fishing2/Model/Module/Numeric/NumericComponent.cs b/Assets/Scripts/Model/Module/Numeric/NumericComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Module/Numeric/NumericComponent.cs rename to Assets/Scripts/Model/Module/Numeric/NumericComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Module/Numeric/NumericComponent.cs.meta b/Assets/Scripts/Model/Module/Numeric/NumericComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Module/Numeric/NumericComponent.cs.meta rename to Assets/Scripts/Model/Module/Numeric/NumericComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Module/Numeric/NumericType.cs b/Assets/Scripts/Model/Module/Numeric/NumericType.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Module/Numeric/NumericType.cs rename to Assets/Scripts/Model/Module/Numeric/NumericType.cs diff --git a/Assets/Scripts/Fishing2/Model/Module/Numeric/NumericType.cs.meta b/Assets/Scripts/Model/Module/Numeric/NumericType.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Module/Numeric/NumericType.cs.meta rename to Assets/Scripts/Model/Module/Numeric/NumericType.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Module/ObjectWait.meta b/Assets/Scripts/Model/Module/ObjectWait.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Module/ObjectWait.meta rename to Assets/Scripts/Model/Module/ObjectWait.meta diff --git a/Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs b/Assets/Scripts/Model/Module/ObjectWait/ObjectWait.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs rename to Assets/Scripts/Model/Module/ObjectWait/ObjectWait.cs diff --git a/Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs.meta b/Assets/Scripts/Model/Module/ObjectWait/ObjectWait.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs.meta rename to Assets/Scripts/Model/Module/ObjectWait/ObjectWait.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Net.meta b/Assets/Scripts/Model/Net.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net.meta rename to Assets/Scripts/Model/Net.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/Entity.meta b/Assets/Scripts/Model/Net/Entity.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Entity.meta rename to Assets/Scripts/Model/Net/Entity.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/Entity/AuthenticationSelectComponent.cs b/Assets/Scripts/Model/Net/Entity/AuthenticationSelectComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Entity/AuthenticationSelectComponent.cs rename to Assets/Scripts/Model/Net/Entity/AuthenticationSelectComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Net/Entity/AuthenticationSelectComponent.cs.meta b/Assets/Scripts/Model/Net/Entity/AuthenticationSelectComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Entity/AuthenticationSelectComponent.cs.meta rename to Assets/Scripts/Model/Net/Entity/AuthenticationSelectComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/Entity/JWT.meta b/Assets/Scripts/Model/Net/Entity/JWT.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Entity/JWT.meta rename to Assets/Scripts/Model/Net/Entity/JWT.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/Entity/JWT/JWTParseComponent.cs b/Assets/Scripts/Model/Net/Entity/JWT/JWTParseComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Entity/JWT/JWTParseComponent.cs rename to Assets/Scripts/Model/Net/Entity/JWT/JWTParseComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Net/Entity/JWT/JWTParseComponent.cs.meta b/Assets/Scripts/Model/Net/Entity/JWT/JWTParseComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Entity/JWT/JWTParseComponent.cs.meta rename to Assets/Scripts/Model/Net/Entity/JWT/JWTParseComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/Hotfix.meta b/Assets/Scripts/Model/Net/Hotfix.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Hotfix.meta rename to Assets/Scripts/Model/Net/Hotfix.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/Hotfix/.DS_Store b/Assets/Scripts/Model/Net/Hotfix/.DS_Store similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Hotfix/.DS_Store rename to Assets/Scripts/Model/Net/Hotfix/.DS_Store diff --git a/Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler.meta b/Assets/Scripts/Model/Net/Hotfix/Handler.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler.meta rename to Assets/Scripts/Model/Net/Hotfix/Handler.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs b/Assets/Scripts/Model/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs rename to Assets/Scripts/Model/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs diff --git a/Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs.meta b/Assets/Scripts/Model/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs.meta rename to Assets/Scripts/Model/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/Hotfix/System.meta b/Assets/Scripts/Model/Net/Hotfix/System.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Hotfix/System.meta rename to Assets/Scripts/Model/Net/Hotfix/System.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs b/Assets/Scripts/Model/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs rename to Assets/Scripts/Model/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs diff --git a/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs.meta b/Assets/Scripts/Model/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs.meta rename to Assets/Scripts/Model/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT.meta b/Assets/Scripts/Model/Net/Hotfix/System/JWT.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT.meta rename to Assets/Scripts/Model/Net/Hotfix/System/JWT.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs b/Assets/Scripts/Model/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs rename to Assets/Scripts/Model/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs diff --git a/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs.meta b/Assets/Scripts/Model/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs.meta rename to Assets/Scripts/Model/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/SessionHelper.cs b/Assets/Scripts/Model/Net/Hotfix/System/SessionHelper.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Hotfix/System/SessionHelper.cs rename to Assets/Scripts/Model/Net/Hotfix/System/SessionHelper.cs diff --git a/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/SessionHelper.cs.meta b/Assets/Scripts/Model/Net/Hotfix/System/SessionHelper.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Hotfix/System/SessionHelper.cs.meta rename to Assets/Scripts/Model/Net/Hotfix/System/SessionHelper.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/MessageHandler.meta b/Assets/Scripts/Model/Net/MessageHandler.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/MessageHandler.meta rename to Assets/Scripts/Model/Net/MessageHandler.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Chat2C_MessageHandler.cs b/Assets/Scripts/Model/Net/MessageHandler/Chat2C_MessageHandler.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/MessageHandler/Chat2C_MessageHandler.cs rename to Assets/Scripts/Model/Net/MessageHandler/Chat2C_MessageHandler.cs diff --git a/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Chat2C_MessageHandler.cs.meta b/Assets/Scripts/Model/Net/MessageHandler/Chat2C_MessageHandler.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/MessageHandler/Chat2C_MessageHandler.cs.meta rename to Assets/Scripts/Model/Net/MessageHandler/Chat2C_MessageHandler.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/Net.cs b/Assets/Scripts/Model/Net/Net.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Net.cs rename to Assets/Scripts/Model/Net/Net.cs diff --git a/Assets/Scripts/Fishing2/Model/Net/Net.cs.meta b/Assets/Scripts/Model/Net/Net.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/Net.cs.meta rename to Assets/Scripts/Model/Net/Net.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/NetExtends.cs b/Assets/Scripts/Model/Net/NetExtends.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/NetExtends.cs rename to Assets/Scripts/Model/Net/NetExtends.cs diff --git a/Assets/Scripts/Fishing2/Model/Net/NetExtends.cs.meta b/Assets/Scripts/Model/Net/NetExtends.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Net/NetExtends.cs.meta rename to Assets/Scripts/Model/Net/NetExtends.cs.meta diff --git a/Assets/Scripts/Sound.meta b/Assets/Scripts/Model/Sound.meta similarity index 100% rename from Assets/Scripts/Sound.meta rename to Assets/Scripts/Model/Sound.meta diff --git a/Assets/Scripts/Sound/Sound.cs b/Assets/Scripts/Model/Sound/Sound.cs similarity index 100% rename from Assets/Scripts/Sound/Sound.cs rename to Assets/Scripts/Model/Sound/Sound.cs diff --git a/Assets/Scripts/Sound/Sound.cs.meta b/Assets/Scripts/Model/Sound/Sound.cs.meta similarity index 100% rename from Assets/Scripts/Sound/Sound.cs.meta rename to Assets/Scripts/Model/Sound/Sound.cs.meta diff --git a/Assets/Scripts/Sound/SoundManager.cs b/Assets/Scripts/Model/Sound/SoundManager.cs similarity index 100% rename from Assets/Scripts/Sound/SoundManager.cs rename to Assets/Scripts/Model/Sound/SoundManager.cs diff --git a/Assets/Scripts/Sound/SoundManager.cs.meta b/Assets/Scripts/Model/Sound/SoundManager.cs.meta similarity index 100% rename from Assets/Scripts/Sound/SoundManager.cs.meta rename to Assets/Scripts/Model/Sound/SoundManager.cs.meta diff --git a/Assets/Scripts/Utils.meta b/Assets/Scripts/Model/Utils.meta similarity index 100% rename from Assets/Scripts/Utils.meta rename to Assets/Scripts/Model/Utils.meta diff --git a/Assets/Scripts/Utils/AlgorithmUtils.cs b/Assets/Scripts/Model/Utils/AlgorithmUtils.cs similarity index 100% rename from Assets/Scripts/Utils/AlgorithmUtils.cs rename to Assets/Scripts/Model/Utils/AlgorithmUtils.cs diff --git a/Assets/Scripts/Utils/AlgorithmUtils.cs.meta b/Assets/Scripts/Model/Utils/AlgorithmUtils.cs.meta similarity index 100% rename from Assets/Scripts/Utils/AlgorithmUtils.cs.meta rename to Assets/Scripts/Model/Utils/AlgorithmUtils.cs.meta diff --git a/Assets/Scripts/Utils/ButtonNavigate.cs b/Assets/Scripts/Model/Utils/ButtonNavigate.cs similarity index 100% rename from Assets/Scripts/Utils/ButtonNavigate.cs rename to Assets/Scripts/Model/Utils/ButtonNavigate.cs diff --git a/Assets/Scripts/Utils/ButtonNavigate.cs.meta b/Assets/Scripts/Model/Utils/ButtonNavigate.cs.meta similarity index 100% rename from Assets/Scripts/Utils/ButtonNavigate.cs.meta rename to Assets/Scripts/Model/Utils/ButtonNavigate.cs.meta diff --git a/Assets/Scripts/Utils/CameraUtils.cs b/Assets/Scripts/Model/Utils/CameraUtils.cs similarity index 100% rename from Assets/Scripts/Utils/CameraUtils.cs rename to Assets/Scripts/Model/Utils/CameraUtils.cs diff --git a/Assets/Scripts/Utils/CameraUtils.cs.meta b/Assets/Scripts/Model/Utils/CameraUtils.cs.meta similarity index 100% rename from Assets/Scripts/Utils/CameraUtils.cs.meta rename to Assets/Scripts/Model/Utils/CameraUtils.cs.meta diff --git a/Assets/Scripts/Utils/Cryptor.cs b/Assets/Scripts/Model/Utils/Cryptor.cs similarity index 100% rename from Assets/Scripts/Utils/Cryptor.cs rename to Assets/Scripts/Model/Utils/Cryptor.cs diff --git a/Assets/Scripts/Utils/Cryptor.cs.meta b/Assets/Scripts/Model/Utils/Cryptor.cs.meta similarity index 100% rename from Assets/Scripts/Utils/Cryptor.cs.meta rename to Assets/Scripts/Model/Utils/Cryptor.cs.meta diff --git a/Assets/Scripts/Utils/DataArrayExtends.cs b/Assets/Scripts/Model/Utils/DataArrayExtends.cs similarity index 100% rename from Assets/Scripts/Utils/DataArrayExtends.cs rename to Assets/Scripts/Model/Utils/DataArrayExtends.cs diff --git a/Assets/Scripts/Utils/DataArrayExtends.cs.meta b/Assets/Scripts/Model/Utils/DataArrayExtends.cs.meta similarity index 100% rename from Assets/Scripts/Utils/DataArrayExtends.cs.meta rename to Assets/Scripts/Model/Utils/DataArrayExtends.cs.meta diff --git a/Assets/Scripts/Utils/DontDestroy.cs b/Assets/Scripts/Model/Utils/DontDestroy.cs similarity index 100% rename from Assets/Scripts/Utils/DontDestroy.cs rename to Assets/Scripts/Model/Utils/DontDestroy.cs diff --git a/Assets/Scripts/Utils/DontDestroy.cs.meta b/Assets/Scripts/Model/Utils/DontDestroy.cs.meta similarity index 100% rename from Assets/Scripts/Utils/DontDestroy.cs.meta rename to Assets/Scripts/Model/Utils/DontDestroy.cs.meta diff --git a/Assets/Scripts/Utils/Extends.meta b/Assets/Scripts/Model/Utils/Extends.meta similarity index 100% rename from Assets/Scripts/Utils/Extends.meta rename to Assets/Scripts/Model/Utils/Extends.meta diff --git a/Assets/Scripts/Utils/Extends/Extensions.cs b/Assets/Scripts/Model/Utils/Extends/Extensions.cs similarity index 100% rename from Assets/Scripts/Utils/Extends/Extensions.cs rename to Assets/Scripts/Model/Utils/Extends/Extensions.cs diff --git a/Assets/Scripts/Utils/Extends/Extensions.cs.meta b/Assets/Scripts/Model/Utils/Extends/Extensions.cs.meta similarity index 100% rename from Assets/Scripts/Utils/Extends/Extensions.cs.meta rename to Assets/Scripts/Model/Utils/Extends/Extensions.cs.meta diff --git a/Assets/Scripts/Utils/Extends/FairyGUIExtensions.cs b/Assets/Scripts/Model/Utils/Extends/FairyGUIExtensions.cs similarity index 100% rename from Assets/Scripts/Utils/Extends/FairyGUIExtensions.cs rename to Assets/Scripts/Model/Utils/Extends/FairyGUIExtensions.cs diff --git a/Assets/Scripts/Utils/Extends/FairyGUIExtensions.cs.meta b/Assets/Scripts/Model/Utils/Extends/FairyGUIExtensions.cs.meta similarity index 100% rename from Assets/Scripts/Utils/Extends/FairyGUIExtensions.cs.meta rename to Assets/Scripts/Model/Utils/Extends/FairyGUIExtensions.cs.meta diff --git a/Assets/Scripts/Utils/Extends/ListExtends.cs b/Assets/Scripts/Model/Utils/Extends/ListExtends.cs similarity index 100% rename from Assets/Scripts/Utils/Extends/ListExtends.cs rename to Assets/Scripts/Model/Utils/Extends/ListExtends.cs diff --git a/Assets/Scripts/Utils/Extends/ListExtends.cs.meta b/Assets/Scripts/Model/Utils/Extends/ListExtends.cs.meta similarity index 100% rename from Assets/Scripts/Utils/Extends/ListExtends.cs.meta rename to Assets/Scripts/Model/Utils/Extends/ListExtends.cs.meta diff --git a/Assets/Scripts/Utils/Extends/StringExtends.cs b/Assets/Scripts/Model/Utils/Extends/StringExtends.cs similarity index 100% rename from Assets/Scripts/Utils/Extends/StringExtends.cs rename to Assets/Scripts/Model/Utils/Extends/StringExtends.cs diff --git a/Assets/Scripts/Utils/Extends/StringExtends.cs.meta b/Assets/Scripts/Model/Utils/Extends/StringExtends.cs.meta similarity index 100% rename from Assets/Scripts/Utils/Extends/StringExtends.cs.meta rename to Assets/Scripts/Model/Utils/Extends/StringExtends.cs.meta diff --git a/Assets/Scripts/Utils/Extends/UIInputExtensions.cs b/Assets/Scripts/Model/Utils/Extends/UIInputExtensions.cs similarity index 100% rename from Assets/Scripts/Utils/Extends/UIInputExtensions.cs rename to Assets/Scripts/Model/Utils/Extends/UIInputExtensions.cs diff --git a/Assets/Scripts/Utils/Extends/UIInputExtensions.cs.meta b/Assets/Scripts/Model/Utils/Extends/UIInputExtensions.cs.meta similarity index 100% rename from Assets/Scripts/Utils/Extends/UIInputExtensions.cs.meta rename to Assets/Scripts/Model/Utils/Extends/UIInputExtensions.cs.meta diff --git a/Assets/Scripts/Utils/FishWeightToLength.cs b/Assets/Scripts/Model/Utils/FishWeightToLength.cs similarity index 100% rename from Assets/Scripts/Utils/FishWeightToLength.cs rename to Assets/Scripts/Model/Utils/FishWeightToLength.cs diff --git a/Assets/Scripts/Utils/FishWeightToLength.cs.meta b/Assets/Scripts/Model/Utils/FishWeightToLength.cs.meta similarity index 100% rename from Assets/Scripts/Utils/FishWeightToLength.cs.meta rename to Assets/Scripts/Model/Utils/FishWeightToLength.cs.meta diff --git a/Assets/Scripts/Utils/FishingTrajectoryCalculator.cs b/Assets/Scripts/Model/Utils/FishingTrajectoryCalculator.cs similarity index 100% rename from Assets/Scripts/Utils/FishingTrajectoryCalculator.cs rename to Assets/Scripts/Model/Utils/FishingTrajectoryCalculator.cs diff --git a/Assets/Scripts/Utils/FishingTrajectoryCalculator.cs.meta b/Assets/Scripts/Model/Utils/FishingTrajectoryCalculator.cs.meta similarity index 100% rename from Assets/Scripts/Utils/FishingTrajectoryCalculator.cs.meta rename to Assets/Scripts/Model/Utils/FishingTrajectoryCalculator.cs.meta diff --git a/Assets/Scripts/Utils/JsonHelper.cs b/Assets/Scripts/Model/Utils/JsonHelper.cs similarity index 100% rename from Assets/Scripts/Utils/JsonHelper.cs rename to Assets/Scripts/Model/Utils/JsonHelper.cs diff --git a/Assets/Scripts/Utils/JsonHelper.cs.meta b/Assets/Scripts/Model/Utils/JsonHelper.cs.meta similarity index 100% rename from Assets/Scripts/Utils/JsonHelper.cs.meta rename to Assets/Scripts/Model/Utils/JsonHelper.cs.meta diff --git a/Assets/Scripts/Utils/ModelUtils.cs b/Assets/Scripts/Model/Utils/ModelUtils.cs similarity index 100% rename from Assets/Scripts/Utils/ModelUtils.cs rename to Assets/Scripts/Model/Utils/ModelUtils.cs diff --git a/Assets/Scripts/Utils/ModelUtils.cs.meta b/Assets/Scripts/Model/Utils/ModelUtils.cs.meta similarity index 100% rename from Assets/Scripts/Utils/ModelUtils.cs.meta rename to Assets/Scripts/Model/Utils/ModelUtils.cs.meta diff --git a/Assets/Scripts/Utils/NewFile1.txt b/Assets/Scripts/Model/Utils/NewFile1.txt similarity index 100% rename from Assets/Scripts/Utils/NewFile1.txt rename to Assets/Scripts/Model/Utils/NewFile1.txt diff --git a/Assets/Scripts/Utils/NewFile1.txt.meta b/Assets/Scripts/Model/Utils/NewFile1.txt.meta similarity index 100% rename from Assets/Scripts/Utils/NewFile1.txt.meta rename to Assets/Scripts/Model/Utils/NewFile1.txt.meta diff --git a/Assets/Scripts/Utils/PrefabCreator.cs b/Assets/Scripts/Model/Utils/PrefabCreator.cs similarity index 100% rename from Assets/Scripts/Utils/PrefabCreator.cs rename to Assets/Scripts/Model/Utils/PrefabCreator.cs diff --git a/Assets/Scripts/Utils/PrefabCreator.cs.meta b/Assets/Scripts/Model/Utils/PrefabCreator.cs.meta similarity index 100% rename from Assets/Scripts/Utils/PrefabCreator.cs.meta rename to Assets/Scripts/Model/Utils/PrefabCreator.cs.meta diff --git a/Assets/Scripts/Utils/Reflection.cs b/Assets/Scripts/Model/Utils/Reflection.cs similarity index 100% rename from Assets/Scripts/Utils/Reflection.cs rename to Assets/Scripts/Model/Utils/Reflection.cs diff --git a/Assets/Scripts/Utils/Reflection.cs.meta b/Assets/Scripts/Model/Utils/Reflection.cs.meta similarity index 100% rename from Assets/Scripts/Utils/Reflection.cs.meta rename to Assets/Scripts/Model/Utils/Reflection.cs.meta diff --git a/Assets/Scripts/Utils/SPrefs.cs b/Assets/Scripts/Model/Utils/SPrefs.cs similarity index 100% rename from Assets/Scripts/Utils/SPrefs.cs rename to Assets/Scripts/Model/Utils/SPrefs.cs diff --git a/Assets/Scripts/Utils/SPrefs.cs.meta b/Assets/Scripts/Model/Utils/SPrefs.cs.meta similarity index 100% rename from Assets/Scripts/Utils/SPrefs.cs.meta rename to Assets/Scripts/Model/Utils/SPrefs.cs.meta diff --git a/Assets/Scripts/Utils/ScreenshotCapturer.cs b/Assets/Scripts/Model/Utils/ScreenshotCapturer.cs similarity index 100% rename from Assets/Scripts/Utils/ScreenshotCapturer.cs rename to Assets/Scripts/Model/Utils/ScreenshotCapturer.cs diff --git a/Assets/Scripts/Utils/ScreenshotCapturer.cs.meta b/Assets/Scripts/Model/Utils/ScreenshotCapturer.cs.meta similarity index 100% rename from Assets/Scripts/Utils/ScreenshotCapturer.cs.meta rename to Assets/Scripts/Model/Utils/ScreenshotCapturer.cs.meta diff --git a/Assets/Scripts/Utils/VectorUtil.cs b/Assets/Scripts/Model/Utils/VectorUtil.cs similarity index 100% rename from Assets/Scripts/Utils/VectorUtil.cs rename to Assets/Scripts/Model/Utils/VectorUtil.cs diff --git a/Assets/Scripts/Utils/VectorUtil.cs.meta b/Assets/Scripts/Model/Utils/VectorUtil.cs.meta similarity index 100% rename from Assets/Scripts/Utils/VectorUtil.cs.meta rename to Assets/Scripts/Model/Utils/VectorUtil.cs.meta diff --git a/Assets/Scripts/Fishing2/OnSceneCreate_Init.cs b/Assets/Scripts/OnSceneCreate_Init.cs similarity index 100% rename from Assets/Scripts/Fishing2/OnSceneCreate_Init.cs rename to Assets/Scripts/OnSceneCreate_Init.cs diff --git a/Assets/Scripts/Fishing2/OnSceneCreate_Init.cs.meta b/Assets/Scripts/OnSceneCreate_Init.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/OnSceneCreate_Init.cs.meta rename to Assets/Scripts/OnSceneCreate_Init.cs.meta diff --git a/Assets/Scripts/Startup.meta b/Assets/Scripts/Startup.meta deleted file mode 100644 index 27f2b1458..000000000 --- a/Assets/Scripts/Startup.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e3e562854a98d12438f787cdcefdfd9c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Startup/.idea/.gitignore b/Assets/Scripts/Startup/.idea/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/Assets/Scripts/Startup/.idea/indexLayout.xml b/Assets/Scripts/Startup/.idea/indexLayout.xml deleted file mode 100644 index 7b08163ce..000000000 --- a/Assets/Scripts/Startup/.idea/indexLayout.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/Assets/Scripts/Startup/.idea/projectSettingsUpdater.xml b/Assets/Scripts/Startup/.idea/projectSettingsUpdater.xml deleted file mode 100644 index ef20cb08c..000000000 --- a/Assets/Scripts/Startup/.idea/projectSettingsUpdater.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Assets/Scripts/Startup/.idea/workspace.xml b/Assets/Scripts/Startup/.idea/workspace.xml deleted file mode 100644 index ac3d92246..000000000 --- a/Assets/Scripts/Startup/.idea/workspace.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - 1747884929312 - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/Scripts/UI/Loading/LoadingPanel.Designer.cs b/Assets/Scripts/UI/Loading/LoadingPanel.Designer.cs index bc35697e3..e4ce42c8b 100644 --- a/Assets/Scripts/UI/Loading/LoadingPanel.Designer.cs +++ b/Assets/Scripts/UI/Loading/LoadingPanel.Designer.cs @@ -14,6 +14,8 @@ namespace NBF public override string UIPackName => "Load"; public override string UIResName => "LoadingPanel"; + [AutoFind(Name = "back")] + public GLoader back; [AutoFind(Name = "Progress")] public GProgressBar Progress; [AutoFind(Name = "TextLoading")] diff --git a/Assets/Scripts/UI/Loading/LoadingPanel.cs b/Assets/Scripts/UI/Loading/LoadingPanel.cs index 77289c8e6..fcd78e6f8 100644 --- a/Assets/Scripts/UI/Loading/LoadingPanel.cs +++ b/Assets/Scripts/UI/Loading/LoadingPanel.cs @@ -2,6 +2,7 @@ using UnityEngine; using NBC; +using NBC.Event; namespace NBF { @@ -17,14 +18,32 @@ namespace NBF } } + public class OnLoadingProgressEvent : EventSystem + { + protected override void Handler(LoadingProgress self) + { + LoadingPanel.SetProgress(self.Progress); + } + } + public partial class LoadingPanel : UIPanel { - public static readonly LoadingTask LoadingTask = new(); + private static LoadingPanel _loadingPanel; + + public static void SetProgress(float progress) + { + if (_loadingPanel != null) + { + _loadingPanel.Progress.value = progress * 100; + } + } protected override void OnInit() { ContentPane.sortingOrder = UIDef.UIOrder.Loading; + _loadingPanel = this; + Progress.max = 100; } protected override void OnShow() diff --git a/Assets/Scripts/UI/Login/LoginPanel.cs b/Assets/Scripts/UI/Login/LoginPanel.cs index aa90cf5cd..1c905c3cb 100644 --- a/Assets/Scripts/UI/Login/LoginPanel.cs +++ b/Assets/Scripts/UI/Login/LoginPanel.cs @@ -27,7 +27,8 @@ namespace NBF private async FTask OnLoginClick() { await LoginHelper.Login(InputAccount.text); - await MapHelper.Enter(99); + await MapHelper.EnterMap(99); + Del(); } } } \ No newline at end of file diff --git a/FGUIProject/assets/Load/LoadingPanel.xml b/FGUIProject/assets/Load/LoadingPanel.xml index ea9c27d2e..298956485 100644 --- a/FGUIProject/assets/Load/LoadingPanel.xml +++ b/FGUIProject/assets/Load/LoadingPanel.xml @@ -1,16 +1,14 @@ - + + - - - diff --git a/Fishing2.sln.DotSettings.user b/Fishing2.sln.DotSettings.user index 60815a0bb..1cd18838f 100644 --- a/Fishing2.sln.DotSettings.user +++ b/Fishing2.sln.DotSettings.user @@ -21,6 +21,7 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded