diff --git a/Assets/Enviro 3 - Sky and Weather/Prefabs/VFX Graph/Rain.vfx b/Assets/Enviro 3 - Sky and Weather/Prefabs/VFX Graph/Rain.vfx
index e5abcd97b..4e1142d6a 100644
--- a/Assets/Enviro 3 - Sky and Weather/Prefabs/VFX Graph/Rain.vfx
+++ b/Assets/Enviro 3 - Sky and Weather/Prefabs/VFX Graph/Rain.vfx
@@ -2238,9 +2238,7 @@ MonoBehaviour:
m_UIPosition: {x: 951, y: 1054}
m_UICollapsed: 0
m_UISuperCollapsed: 0
- m_InputSlots:
- - {fileID: 8926484042661614840}
- - {fileID: 8926484042661614845}
+ m_InputSlots: []
m_OutputSlots: []
m_Label:
m_Data: {fileID: 8926484042661614568}
@@ -2764,207 +2762,3 @@ MonoBehaviour:
m_UIPosition: {x: 0, y: 0}
m_UICollapsed: 1
m_UISuperCollapsed: 0
---- !u!114 &8926484042661614840
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: c82227d5759e296488798b1554a72a15, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_UIIgnoredErrors: []
- m_Parent: {fileID: 0}
- m_Children:
- - {fileID: 8926484042661614841}
- - {fileID: 8926484042661614842}
- - {fileID: 8926484042661614843}
- - {fileID: 8926484042661614844}
- m_UIPosition: {x: 0, y: 0}
- m_UICollapsed: 1
- m_UISuperCollapsed: 0
- m_MasterSlot: {fileID: 8926484042661614840}
- m_MasterData:
- m_Owner: {fileID: 8926484042661614817}
- m_Value:
- m_Type:
- m_SerializableType: UnityEngine.Color, UnityEngine.CoreModule, Version=0.0.0.0,
- Culture=neutral, PublicKeyToken=null
- m_SerializableObject: '{"r":1.0,"g":1.0,"b":1.0,"a":1.0}'
- m_Space: -1
- m_Property:
- name: _Color
- m_serializedType:
- m_SerializableType: UnityEngine.Color, UnityEngine.CoreModule, Version=0.0.0.0,
- Culture=neutral, PublicKeyToken=null
- m_Direction: 0
- m_LinkedSlots: []
---- !u!114 &8926484042661614841
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_UIIgnoredErrors: []
- m_Parent: {fileID: 8926484042661614840}
- m_Children: []
- m_UIPosition: {x: 0, y: 0}
- m_UICollapsed: 1
- m_UISuperCollapsed: 0
- m_MasterSlot: {fileID: 8926484042661614840}
- m_MasterData:
- m_Owner: {fileID: 0}
- m_Value:
- m_Type:
- m_SerializableType:
- m_SerializableObject:
- m_Space: -1
- m_Property:
- name: r
- m_serializedType:
- m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b77a5c561934e089
- m_Direction: 0
- m_LinkedSlots: []
---- !u!114 &8926484042661614842
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_UIIgnoredErrors: []
- m_Parent: {fileID: 8926484042661614840}
- m_Children: []
- m_UIPosition: {x: 0, y: 0}
- m_UICollapsed: 1
- m_UISuperCollapsed: 0
- m_MasterSlot: {fileID: 8926484042661614840}
- m_MasterData:
- m_Owner: {fileID: 0}
- m_Value:
- m_Type:
- m_SerializableType:
- m_SerializableObject:
- m_Space: -1
- m_Property:
- name: g
- m_serializedType:
- m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b77a5c561934e089
- m_Direction: 0
- m_LinkedSlots: []
---- !u!114 &8926484042661614843
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_UIIgnoredErrors: []
- m_Parent: {fileID: 8926484042661614840}
- m_Children: []
- m_UIPosition: {x: 0, y: 0}
- m_UICollapsed: 1
- m_UISuperCollapsed: 0
- m_MasterSlot: {fileID: 8926484042661614840}
- m_MasterData:
- m_Owner: {fileID: 0}
- m_Value:
- m_Type:
- m_SerializableType:
- m_SerializableObject:
- m_Space: -1
- m_Property:
- name: b
- m_serializedType:
- m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b77a5c561934e089
- m_Direction: 0
- m_LinkedSlots: []
---- !u!114 &8926484042661614844
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_UIIgnoredErrors: []
- m_Parent: {fileID: 8926484042661614840}
- m_Children: []
- m_UIPosition: {x: 0, y: 0}
- m_UICollapsed: 1
- m_UISuperCollapsed: 0
- m_MasterSlot: {fileID: 8926484042661614840}
- m_MasterData:
- m_Owner: {fileID: 0}
- m_Value:
- m_Type:
- m_SerializableType:
- m_SerializableObject:
- m_Space: -1
- m_Property:
- name: a
- m_serializedType:
- m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b77a5c561934e089
- m_Direction: 0
- m_LinkedSlots: []
---- !u!114 &8926484042661614845
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 70a331b1d86cc8d4aa106ccbe0da5852, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_UIIgnoredErrors: []
- m_Parent: {fileID: 0}
- m_Children: []
- m_UIPosition: {x: 0, y: 0}
- m_UICollapsed: 1
- m_UISuperCollapsed: 0
- m_MasterSlot: {fileID: 8926484042661614845}
- m_MasterData:
- m_Owner: {fileID: 8926484042661614817}
- m_Value:
- m_Type:
- m_SerializableType: UnityEngine.Texture2D, UnityEngine.CoreModule, Version=0.0.0.0,
- Culture=neutral, PublicKeyToken=null
- m_SerializableObject:
- m_Space: -1
- m_Property:
- name: _Main
- m_serializedType:
- m_SerializableType: UnityEngine.Texture2D, UnityEngine.CoreModule, Version=0.0.0.0,
- Culture=neutral, PublicKeyToken=null
- m_Direction: 0
- m_LinkedSlots: []
diff --git a/Assets/Enviro 3 - Sky and Weather/Prefabs/VFX Graph/Snow.vfx b/Assets/Enviro 3 - Sky and Weather/Prefabs/VFX Graph/Snow.vfx
index 8d0e4d0d1..7f2cbaa1f 100644
--- a/Assets/Enviro 3 - Sky and Weather/Prefabs/VFX Graph/Snow.vfx
+++ b/Assets/Enviro 3 - Sky and Weather/Prefabs/VFX Graph/Snow.vfx
@@ -3286,9 +3286,7 @@ MonoBehaviour:
m_UIPosition: {x: 941, y: 1360}
m_UICollapsed: 0
m_UISuperCollapsed: 0
- m_InputSlots:
- - {fileID: 8926484042661614884}
- - {fileID: 8926484042661614889}
+ m_InputSlots: []
m_OutputSlots: []
m_Label:
m_Data: {fileID: 8926484042661614568}
@@ -3641,207 +3639,3 @@ MonoBehaviour:
m_UIPosition: {x: 0, y: 0}
m_UICollapsed: 1
m_UISuperCollapsed: 0
---- !u!114 &8926484042661614884
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: c82227d5759e296488798b1554a72a15, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_UIIgnoredErrors: []
- m_Parent: {fileID: 0}
- m_Children:
- - {fileID: 8926484042661614885}
- - {fileID: 8926484042661614886}
- - {fileID: 8926484042661614887}
- - {fileID: 8926484042661614888}
- m_UIPosition: {x: 0, y: 0}
- m_UICollapsed: 1
- m_UISuperCollapsed: 0
- m_MasterSlot: {fileID: 8926484042661614884}
- m_MasterData:
- m_Owner: {fileID: 8926484042661614860}
- m_Value:
- m_Type:
- m_SerializableType: UnityEngine.Color, UnityEngine.CoreModule, Version=0.0.0.0,
- Culture=neutral, PublicKeyToken=null
- m_SerializableObject: '{"r":1.0,"g":1.0,"b":1.0,"a":1.0}'
- m_Space: -1
- m_Property:
- name: _Color
- m_serializedType:
- m_SerializableType: UnityEngine.Color, UnityEngine.CoreModule, Version=0.0.0.0,
- Culture=neutral, PublicKeyToken=null
- m_Direction: 0
- m_LinkedSlots: []
---- !u!114 &8926484042661614885
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_UIIgnoredErrors: []
- m_Parent: {fileID: 8926484042661614884}
- m_Children: []
- m_UIPosition: {x: 0, y: 0}
- m_UICollapsed: 1
- m_UISuperCollapsed: 0
- m_MasterSlot: {fileID: 8926484042661614884}
- m_MasterData:
- m_Owner: {fileID: 0}
- m_Value:
- m_Type:
- m_SerializableType:
- m_SerializableObject:
- m_Space: -1
- m_Property:
- name: r
- m_serializedType:
- m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b77a5c561934e089
- m_Direction: 0
- m_LinkedSlots: []
---- !u!114 &8926484042661614886
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_UIIgnoredErrors: []
- m_Parent: {fileID: 8926484042661614884}
- m_Children: []
- m_UIPosition: {x: 0, y: 0}
- m_UICollapsed: 1
- m_UISuperCollapsed: 0
- m_MasterSlot: {fileID: 8926484042661614884}
- m_MasterData:
- m_Owner: {fileID: 0}
- m_Value:
- m_Type:
- m_SerializableType:
- m_SerializableObject:
- m_Space: -1
- m_Property:
- name: g
- m_serializedType:
- m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b77a5c561934e089
- m_Direction: 0
- m_LinkedSlots: []
---- !u!114 &8926484042661614887
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_UIIgnoredErrors: []
- m_Parent: {fileID: 8926484042661614884}
- m_Children: []
- m_UIPosition: {x: 0, y: 0}
- m_UICollapsed: 1
- m_UISuperCollapsed: 0
- m_MasterSlot: {fileID: 8926484042661614884}
- m_MasterData:
- m_Owner: {fileID: 0}
- m_Value:
- m_Type:
- m_SerializableType:
- m_SerializableObject:
- m_Space: -1
- m_Property:
- name: b
- m_serializedType:
- m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b77a5c561934e089
- m_Direction: 0
- m_LinkedSlots: []
---- !u!114 &8926484042661614888
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_UIIgnoredErrors: []
- m_Parent: {fileID: 8926484042661614884}
- m_Children: []
- m_UIPosition: {x: 0, y: 0}
- m_UICollapsed: 1
- m_UISuperCollapsed: 0
- m_MasterSlot: {fileID: 8926484042661614884}
- m_MasterData:
- m_Owner: {fileID: 0}
- m_Value:
- m_Type:
- m_SerializableType:
- m_SerializableObject:
- m_Space: -1
- m_Property:
- name: a
- m_serializedType:
- m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b77a5c561934e089
- m_Direction: 0
- m_LinkedSlots: []
---- !u!114 &8926484042661614889
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 70a331b1d86cc8d4aa106ccbe0da5852, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_UIIgnoredErrors: []
- m_Parent: {fileID: 0}
- m_Children: []
- m_UIPosition: {x: 0, y: 0}
- m_UICollapsed: 1
- m_UISuperCollapsed: 0
- m_MasterSlot: {fileID: 8926484042661614889}
- m_MasterData:
- m_Owner: {fileID: 8926484042661614860}
- m_Value:
- m_Type:
- m_SerializableType: UnityEngine.Texture2D, UnityEngine.CoreModule, Version=0.0.0.0,
- Culture=neutral, PublicKeyToken=null
- m_SerializableObject:
- m_Space: -1
- m_Property:
- name: _Main
- m_serializedType:
- m_SerializableType: UnityEngine.Texture2D, UnityEngine.CoreModule, Version=0.0.0.0,
- Culture=neutral, PublicKeyToken=null
- m_Direction: 0
- m_LinkedSlots: []
diff --git a/Assets/New Terrain 4.asset b/Assets/New Terrain 4.asset
index 6ceda2a28..def3aec32 100644
Binary files a/Assets/New Terrain 4.asset and b/Assets/New Terrain 4.asset differ
diff --git a/Assets/New Terrain 8.asset b/Assets/New Terrain 8.asset
index 14e8dc429..1aaf86daa 100644
Binary files a/Assets/New Terrain 8.asset and b/Assets/New Terrain 8.asset differ
diff --git a/Assets/New Terrain 9.asset b/Assets/New Terrain 9.asset
new file mode 100644
index 000000000..78a2e8299
Binary files /dev/null and b/Assets/New Terrain 9.asset differ
diff --git a/Assets/New Terrain 9.asset.meta b/Assets/New Terrain 9.asset.meta
new file mode 100644
index 000000000..22d58b31a
--- /dev/null
+++ b/Assets/New Terrain 9.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8c4f5ca9e4547ac4da4929b3fa9263be
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 15600000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ResRaw/Maps/Map5/New Terrain 3.asset b/Assets/ResRaw/Maps/Map5/New Terrain 3.asset
index 66a50a68f..6b0e09e11 100644
Binary files a/Assets/ResRaw/Maps/Map5/New Terrain 3.asset and b/Assets/ResRaw/Maps/Map5/New Terrain 3.asset differ
diff --git a/Assets/ResRaw/Maps/Map99.meta b/Assets/ResRaw/Maps/Map99.meta
new file mode 100644
index 000000000..118ba0412
--- /dev/null
+++ b/Assets/ResRaw/Maps/Map99.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 89a00fb36d982ec488432f1a229addfe
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ResRaw/Maps/Map99/Map99.unity b/Assets/ResRaw/Maps/Map99/Map99.unity
new file mode 100644
index 000000000..9690c5862
--- /dev/null
+++ b/Assets/ResRaw/Maps/Map99/Map99.unity
@@ -0,0 +1,517 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_OcclusionBakeSettings:
+ smallestOccluder: 5
+ smallestHole: 0.25
+ backfaceThreshold: 100
+ m_SceneGUID: 00000000000000000000000000000000
+ m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+ m_ObjectHideFlags: 0
+ serializedVersion: 10
+ m_Fog: 0
+ m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+ m_FogMode: 3
+ m_FogDensity: 0.01
+ m_LinearFogStart: 0
+ m_LinearFogEnd: 300
+ m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+ m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+ m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+ m_AmbientIntensity: 0.8050667
+ m_AmbientMode: 0
+ m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+ m_SkyboxMaterial: {fileID: 0}
+ m_HaloStrength: 0.5
+ m_FlareStrength: 1
+ m_FlareFadeSpeed: 3
+ m_HaloTexture: {fileID: 0}
+ m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+ m_DefaultReflectionMode: 0
+ m_DefaultReflectionResolution: 128
+ m_ReflectionBounces: 1
+ m_ReflectionIntensity: 1
+ m_CustomReflection: {fileID: 755651760}
+ m_Sun: {fileID: 0}
+ m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+ m_ObjectHideFlags: 0
+ serializedVersion: 13
+ m_BakeOnSceneLoad: 0
+ m_GISettings:
+ serializedVersion: 2
+ m_BounceScale: 1
+ m_IndirectOutputScale: 1
+ m_AlbedoBoost: 1
+ m_EnvironmentLightingMode: 0
+ m_EnableBakedLightmaps: 1
+ m_EnableRealtimeLightmaps: 0
+ m_LightmapEditorSettings:
+ serializedVersion: 12
+ m_Resolution: 2
+ m_BakeResolution: 40
+ m_AtlasSize: 1024
+ m_AO: 0
+ m_AOMaxDistance: 1
+ m_CompAOExponent: 1
+ m_CompAOExponentDirect: 0
+ m_ExtractAmbientOcclusion: 0
+ m_Padding: 2
+ m_LightmapParameters: {fileID: 0}
+ m_LightmapsBakeMode: 1
+ m_TextureCompression: 1
+ m_ReflectionCompression: 2
+ m_MixedBakeMode: 2
+ m_BakeBackend: 1
+ m_PVRSampling: 1
+ m_PVRDirectSampleCount: 32
+ m_PVRSampleCount: 512
+ m_PVRBounces: 2
+ m_PVREnvironmentSampleCount: 256
+ m_PVREnvironmentReferencePointCount: 2048
+ m_PVRFilteringMode: 1
+ m_PVRDenoiserTypeDirect: 1
+ m_PVRDenoiserTypeIndirect: 1
+ m_PVRDenoiserTypeAO: 1
+ m_PVRFilterTypeDirect: 0
+ m_PVRFilterTypeIndirect: 0
+ m_PVRFilterTypeAO: 0
+ m_PVREnvironmentMIS: 1
+ m_PVRCulling: 1
+ m_PVRFilteringGaussRadiusDirect: 1
+ m_PVRFilteringGaussRadiusIndirect: 5
+ m_PVRFilteringGaussRadiusAO: 2
+ m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+ m_PVRFilteringAtrousPositionSigmaIndirect: 2
+ m_PVRFilteringAtrousPositionSigmaAO: 1
+ m_ExportTrainingData: 0
+ m_TrainingDataDestination: TrainingData
+ m_LightProbeSampleCountMultiplier: 4
+ m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
+ m_LightingSettings: {fileID: 0}
+--- !u!196 &4
+NavMeshSettings:
+ serializedVersion: 2
+ m_ObjectHideFlags: 0
+ m_BuildSettings:
+ serializedVersion: 3
+ agentTypeID: 0
+ agentRadius: 0.5
+ agentHeight: 2
+ agentSlope: 45
+ agentClimb: 0.4
+ ledgeDropHeight: 0
+ maxJumpAcrossDistance: 0
+ minRegionArea: 2
+ manualCellSize: 0
+ cellSize: 0.16666667
+ manualTileSize: 0
+ tileSize: 256
+ buildHeightMesh: 0
+ maxJobWorkers: 0
+ preserveTilesOutsideBounds: 0
+ debug:
+ m_Flags: 0
+ m_NavMeshData: {fileID: 0}
+--- !u!1 &534995317
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 534995320}
+ - component: {fileID: 534995319}
+ - component: {fileID: 534995318}
+ m_Layer: 0
+ m_Name: Terrain
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 2147483647
+ m_IsActive: 1
+--- !u!154 &534995318
+TerrainCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 534995317}
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_ProvidesContacts: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_TerrainData: {fileID: 15600000, guid: 8c4f5ca9e4547ac4da4929b3fa9263be, type: 2}
+ m_EnableTreeColliders: 1
+--- !u!218 &534995319
+Terrain:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 534995317}
+ m_Enabled: 1
+ serializedVersion: 6
+ m_TerrainData: {fileID: 15600000, guid: 8c4f5ca9e4547ac4da4929b3fa9263be, type: 2}
+ m_TreeDistance: 5000
+ m_TreeBillboardDistance: 50
+ m_TreeCrossFadeLength: 5
+ m_TreeMaximumFullLODCount: 50
+ m_DetailObjectDistance: 80
+ m_DetailObjectDensity: 1
+ m_HeightmapPixelError: 5
+ m_SplatMapDistance: 1000
+ m_HeightmapMinimumLODSimplification: 0
+ m_HeightmapMaximumLOD: 0
+ m_ShadowCastingMode: 2
+ m_DrawHeightmap: 1
+ m_DrawInstanced: 0
+ m_DrawTreesAndFoliage: 1
+ m_StaticShadowCaster: 0
+ m_IgnoreQualitySettings: 0
+ m_ReflectionProbeUsage: 1
+ m_MaterialTemplate: {fileID: 2100000, guid: 2a9735a7a91173c40820a0df7524ad73, type: 2}
+ m_BakeLightProbesForTrees: 1
+ m_PreserveTreePrototypeLayers: 0
+ m_DeringLightProbesForTrees: 1
+ m_ReceiveGI: 1
+ m_ScaleInLightmap: 0.0256
+ m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0}
+ m_GroupingID: 0
+ m_RenderingLayerMask: 1
+ m_AllowAutoConnect: 1
+ m_EnableHeightmapRayTracing: 1
+ m_EnableTreesAndDetailsRayTracing: 0
+ m_TreeMotionVectorModeOverride: 3
+--- !u!4 &534995320
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 534995317}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!84 &755651760
+RenderTexture:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Enviro Reflection Final Cubemap
+ m_ImageContentsHash:
+ serializedVersion: 2
+ Hash: 00000000000000000000000000000000
+ m_IsAlphaChannelOptional: 0
+ serializedVersion: 6
+ m_Width: 128
+ m_Height: 128
+ m_AntiAliasing: 1
+ m_MipCount: -1
+ m_DepthStencilFormat: 90
+ m_ColorFormat: 48
+ m_MipMap: 1
+ m_GenerateMips: 0
+ m_SRGB: 0
+ m_UseDynamicScale: 0
+ m_UseDynamicScaleExplicit: 0
+ m_BindMS: 0
+ m_EnableCompatibleFormat: 1
+ m_EnableRandomWrite: 0
+ m_TextureSettings:
+ serializedVersion: 2
+ m_FilterMode: 2
+ m_Aniso: 0
+ m_MipBias: 0
+ m_WrapU: 1
+ m_WrapV: 1
+ m_WrapW: 1
+ m_Dimension: 4
+ m_VolumeDepth: 1
+ m_ShadowSamplingMode: 2
+--- !u!4 &93014201345057470
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7149315942453194809}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1080296085537247983}
+ - {fileID: 3728570160014241394}
+ - {fileID: 669375430614655351}
+ - {fileID: 9026304082495429121}
+ - {fileID: 817543543836774727}
+ - {fileID: 7435946866910238001}
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &542608892086238647
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 9026304082495429121}
+ m_Layer: 0
+ m_Name: Players
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &669375430614655351
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1521831782473444408}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 261.546, y: 2.2, z: 422.366}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 93014201345057470}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &817543543836774727
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5904591576765191607}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 93014201345057470}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &1080296085537247983
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5901011577808903017}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 93014201345057470}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1521831782473444408
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 669375430614655351}
+ m_Layer: 0
+ m_Name: PosNode
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &2857910391209815854
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5901011577808903017}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 434ec3c1822e84ae79a7f64f950b1bf9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ solvers: []
+ substeps: 1
+--- !u!4 &3728570160014241394
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4497548572007836266}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: -6, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 93014201345057470}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4200389617540461288
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7149315942453194809}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ba52b4e0f1274042a192a3242f0a3946, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ sceneID: 0
+ sceneName: Test
+ WaterObject: {fileID: 0}
+ Node: {fileID: 9026304082495429121}
+ GearNode: {fileID: 817543543836774727}
+ obiFixedUpdater: {fileID: 0}
+ LineRenderer: {fileID: 0}
+ FPS: 0
+ updateInterval: 0.2
+--- !u!1 &4250036860101857858
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7435946866910238001}
+ m_Layer: 0
+ m_Name: Boats
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!1 &4497548572007836266
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3728570160014241394}
+ m_Layer: 0
+ m_Name: SceneObjs
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!1 &5901011577808903017
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1080296085537247983}
+ - component: {fileID: 2857910391209815854}
+ m_Layer: 0
+ m_Name: FishingLineContent
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!1 &5904591576765191607
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 817543543836774727}
+ m_Layer: 0
+ m_Name: Gears
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!1 &7149315942453194809
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 93014201345057470}
+ - component: {fileID: 4200389617540461288}
+ m_Layer: 0
+ m_Name: SceneRoot
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &7435946866910238001
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4250036860101857858}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 93014201345057470}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &9026304082495429121
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 542608892086238647}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 93014201345057470}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+ m_ObjectHideFlags: 0
+ m_Roots:
+ - {fileID: 534995320}
+ - {fileID: 93014201345057470}
diff --git a/Assets/ResRaw/Maps/Map99/Map99.unity.meta b/Assets/ResRaw/Maps/Map99/Map99.unity.meta
new file mode 100644
index 000000000..06ae64ef0
--- /dev/null
+++ b/Assets/ResRaw/Maps/Map99/Map99.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 956b354d2875715418f574fcf501363e
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ResRaw/Maps/Map99/Res.meta b/Assets/ResRaw/Maps/Map99/Res.meta
new file mode 100644
index 000000000..211e80908
--- /dev/null
+++ b/Assets/ResRaw/Maps/Map99/Res.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 25286abe9d43ae14d859931df80121a8
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ResRaw/Maps/Map99/Res/Map99.mat b/Assets/ResRaw/Maps/Map99/Res/Map99.mat
new file mode 100644
index 000000000..b7714cb9c
--- /dev/null
+++ b/Assets/ResRaw/Maps/Map99/Res/Map99.mat
@@ -0,0 +1,247 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-3634489341622598488
+MonoBehaviour:
+ m_ObjectHideFlags: 11
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ version: 9
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Map99
+ m_Shader: {fileID: 4800000, guid: 69c1f799e772cb6438f56c23efccb782, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 1
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses:
+ - MOTIONVECTORS
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BaseMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Control:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Control0:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Control1:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Control2:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Control3:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Diffuse:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Mask0:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Mask1:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Mask2:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Mask3:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Normal0:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Normal1:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Normal2:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Normal3:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalSAO:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _PerPixelNormal:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _PerTexProps:
+ m_Texture: {fileID: 8739736798517632918, guid: 6b273f66f18fccb4996102f2deb8fa36, type: 2}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _SpecGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Splat0:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Splat1:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Splat2:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Splat3:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _TerrainHeightmapTexture:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _TerrainHolesTexture:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _TerrainNormalmapTexture:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_Lightmaps:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_LightmapsInd:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_ShadowMasks:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _AddPrecomputedVelocity: 0
+ - _AlphaClip: 0
+ - _AlphaToMask: 0
+ - _Blend: 0
+ - _BlendModePreserveSpecular: 1
+ - _BumpScale: 1
+ - _ClearCoatMask: 0
+ - _ClearCoatSmoothness: 0
+ - _Contrast: 0.4
+ - _Cull: 2
+ - _Cutoff: 0.5
+ - _DetailAlbedoMapScale: 1
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _DstBlendAlpha: 0
+ - _EnableHeightBlend: 0
+ - _EnableInstancedPerPixelNormal: 1
+ - _EnvironmentReflections: 1
+ - _GlossMapScale: 0
+ - _Glossiness: 0
+ - _GlossyReflections: 0
+ - _HeightTransition: 0
+ - _HybridHeightBlendDistance: 300
+ - _Metallic: 0
+ - _Metallic0: 0
+ - _Metallic1: 0
+ - _Metallic2: 0
+ - _Metallic3: 0
+ - _NumLayersCount: 1
+ - _OcclusionStrength: 1
+ - _Parallax: 0.005
+ - _QueueOffset: 0
+ - _ReceiveShadows: 1
+ - _Smoothness: 0.5
+ - _Smoothness0: 0.5
+ - _Smoothness1: 0.5
+ - _Smoothness2: 0.5
+ - _Smoothness3: 0.5
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _SrcBlendAlpha: 1
+ - _Surface: 0
+ - _WorkflowMode: 1
+ - _ZWrite: 1
+ m_Colors:
+ - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+ - _TriplanarUVScale: {r: 1, g: 1, b: 0, a: 0}
+ - _UVScale: {r: 45, g: 45, b: 0, a: 0}
+ m_BuildTextureStacks: []
+ m_AllowLocking: 1
diff --git a/Assets/ResRaw/Maps/Map99/Res/Map99.mat.meta b/Assets/ResRaw/Maps/Map99/Res/Map99.mat.meta
new file mode 100644
index 000000000..13dc2addd
--- /dev/null
+++ b/Assets/ResRaw/Maps/Map99/Res/Map99.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2a9735a7a91173c40820a0df7524ad73
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ResRaw/Maps/Map99/Res/Map99Test.terrainlayer b/Assets/ResRaw/Maps/Map99/Res/Map99Test.terrainlayer
new file mode 100644
index 000000000..d3cf2e002
--- /dev/null
+++ b/Assets/ResRaw/Maps/Map99/Res/Map99Test.terrainlayer
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1953259897 &8574412962073106934
+TerrainLayer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Map99Test
+ m_DiffuseTexture: {fileID: 2800000, guid: dbb08b66ca73db24db63b42bb6628ccf, type: 3}
+ m_NormalMapTexture: {fileID: 0}
+ m_MaskMapTexture: {fileID: 0}
+ m_TileSize: {x: 2, y: 2}
+ m_TileOffset: {x: 0, y: 0}
+ m_Specular: {r: 0, g: 0, b: 0, a: 0}
+ m_Metallic: 0
+ m_Smoothness: 0
+ m_NormalScale: 1
+ m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
+ m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
+ m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
+ m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}
+ m_SmoothnessSource: 1
diff --git a/Assets/ResRaw/Maps/Map99/Res/Map99Test.terrainlayer.meta b/Assets/ResRaw/Maps/Map99/Res/Map99Test.terrainlayer.meta
new file mode 100644
index 000000000..58936a311
--- /dev/null
+++ b/Assets/ResRaw/Maps/Map99/Res/Map99Test.terrainlayer.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b9df64bc523126c4ba1603f144c98c8e
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 8574412962073106934
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ResRaw/Maps/Map99/Res/t1.png b/Assets/ResRaw/Maps/Map99/Res/t1.png
new file mode 100644
index 000000000..2bc8b4788
Binary files /dev/null and b/Assets/ResRaw/Maps/Map99/Res/t1.png differ
diff --git a/Assets/ResRaw/Maps/Map99/Res/t1.png.meta b/Assets/ResRaw/Maps/Map99/Res/t1.png.meta
new file mode 100644
index 000000000..563a9632f
--- /dev/null
+++ b/Assets/ResRaw/Maps/Map99/Res/t1.png.meta
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: dbb08b66ca73db24db63b42bb6628ccf
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 13
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 0
+ wrapV: 0
+ wrapW: 0
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 4
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ customData:
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spriteCustomMetadata:
+ entries: []
+ nameFileIdTable: {}
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Fishing2/Data/Carrier.meta b/Assets/Scripts/Fishing2/Data/Carrier.meta
deleted file mode 100644
index f4c51e849..000000000
--- a/Assets/Scripts/Fishing2/Data/Carrier.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 5432d229611d4f8e8fa72a637035bb40
-timeCreated: 1756044768
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data.meta b/Assets/Scripts/Fishing2/Model.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data.meta
rename to Assets/Scripts/Fishing2/Model.meta
diff --git a/Assets/Scripts/Fishing2/Data/Map.meta b/Assets/Scripts/Fishing2/Model/Map.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Map.meta
rename to Assets/Scripts/Fishing2/Model/Map.meta
diff --git a/Assets/Scripts/Fishing2/Data/Map/Map.cs b/Assets/Scripts/Fishing2/Model/Map/Map.cs
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Map/Map.cs
rename to Assets/Scripts/Fishing2/Model/Map/Map.cs
diff --git a/Assets/Scripts/Fishing2/Data/Map/Map.cs.meta b/Assets/Scripts/Fishing2/Model/Map/Map.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Map/Map.cs.meta
rename to Assets/Scripts/Fishing2/Model/Map/Map.cs.meta
diff --git a/Assets/Scripts/Fishing2/Model/Move.meta b/Assets/Scripts/Fishing2/Model/Move.meta
new file mode 100644
index 000000000..e0e28c630
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Model/Move.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3313ff0be8cf4611891770497b258bcd
+timeCreated: 1756115138
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Model/Move/MoveComponent.cs b/Assets/Scripts/Fishing2/Model/Move/MoveComponent.cs
new file mode 100644
index 000000000..e1d06fb3b
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Model/Move/MoveComponent.cs
@@ -0,0 +1,9 @@
+using NBC.Entitas;
+
+namespace NBF.Fishing2
+{
+ public class MoveComponent : Entity
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Model/Move/MoveComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Move/MoveComponent.cs.meta
new file mode 100644
index 000000000..4ca362673
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Model/Move/MoveComponent.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 660d750ed1f74128a55bbb574d772af4
+timeCreated: 1756115969
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Model/Numeric.meta b/Assets/Scripts/Fishing2/Model/Numeric.meta
new file mode 100644
index 000000000..04782f7a4
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Model/Numeric.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2859b0361c964635b4ea58be3b903b6a
+timeCreated: 1756115131
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Model/Numeric/NumericComponent.cs b/Assets/Scripts/Fishing2/Model/Numeric/NumericComponent.cs
new file mode 100644
index 000000000..7ea459dfd
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Model/Numeric/NumericComponent.cs
@@ -0,0 +1,138 @@
+using System.Collections.Generic;
+using NBC;
+using NBC.Entitas;
+
+namespace NBF.Fishing2
+{
+ ///
+ /// 数据组件
+ ///
+ public class NumericComponent : Entity
+ {
+ public Dictionary NumericDic = new Dictionary();
+
+ public long this[int numericType]
+ {
+ get { return this.GetByKey(numericType); }
+ set { this.Insert(numericType, value); }
+ }
+ }
+
+ public struct NumericChange
+ {
+ public Unit Unit;
+ public int NumericType;
+ public long Old;
+ public long New;
+ }
+
+ public static class NumericComponentSystem
+ {
+ public static float GetAsFloat(this NumericComponent self, int numericType)
+ {
+ return (float)self.GetByKey(numericType) / 10000;
+ }
+
+ public static int GetAsInt(this NumericComponent self, int numericType)
+ {
+ return (int)self.GetByKey(numericType);
+ }
+
+ public static long GetAsLong(this NumericComponent self, int numericType)
+ {
+ return self.GetByKey(numericType);
+ }
+
+ public static void Set(this NumericComponent self, int nt, float value)
+ {
+ self[nt] = (long)(value * 10000);
+ }
+
+ public static void Set(this NumericComponent self, int nt, int value)
+ {
+ self[nt] = value;
+ }
+
+ public static void Set(this NumericComponent self, int nt, long value)
+ {
+ self[nt] = value;
+ }
+
+ public static void Add(this NumericComponent self, int nt, float value)
+ {
+ self[nt] += (long)(value * 10000);
+ }
+
+ public static void Add(this NumericComponent self, int nt, int value)
+ {
+ self[nt] += value;
+ }
+
+ public static void Add(this NumericComponent self, int nt, long value)
+ {
+ self[nt] += value;
+ }
+
+ public static void SetNoEvent(this NumericComponent self, int numericType, long value)
+ {
+ self.Insert(numericType, value, false);
+ }
+
+ public static void Insert(this NumericComponent self, int numericType, long value, bool isPublicEvent = true)
+ {
+ long oldValue = self.GetByKey(numericType);
+ if (oldValue == value)
+ {
+ return;
+ }
+
+ self.NumericDic[numericType] = value;
+
+ if (numericType >= NumericType.Max)
+ {
+ self.Update(numericType, isPublicEvent);
+ return;
+ }
+
+ if (isPublicEvent)
+ {
+ App.Main.EventComponent.Publish(new NumericChange()
+ { Unit = self.GetParent(), New = value, Old = oldValue, NumericType = numericType });
+ }
+ }
+
+ public static long GetByKey(this NumericComponent self, int key)
+ {
+ long value = 0;
+ self.NumericDic.TryGetValue(key, out value);
+ return value;
+ }
+
+ public static void Update(this NumericComponent self, int numericType, bool isPublicEvent)
+ {
+ int final = numericType / 10;
+ int bas = final * 10 + 1;
+ int add = final * 10 + 2;
+ int pct = final * 10 + 3;
+ int finalAdd = final * 10 + 4;
+ int finalPct = final * 10 + 5;
+
+ // 一个数值可能会多种情况影响，比如速度,加个buff可能增加速度绝对值100，也有些buff增加10%速度，所以一个值可以由5个值进行控制其最终结果
+ // final = (((base + add) * (100 + pct) / 100) + finalAdd) * (100 + finalPct) / 100;
+ long result = (long)(((self.GetByKey(bas) + self.GetByKey(add)) * (100 + self.GetAsFloat(pct)) / 100f +
+ self.GetByKey(finalAdd)) *
+ (100 + self.GetAsFloat(finalPct)) / 100f);
+ self.Insert(final, result, isPublicEvent);
+ }
+
+ public static Dictionary CopyDict(this NumericComponent self)
+ {
+ return new Dictionary(self.NumericDic);
+ }
+
+ public static void Clear(this NumericComponent self)
+ {
+ self.NumericDic.Clear();
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Model/Numeric/NumericComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Numeric/NumericComponent.cs.meta
new file mode 100644
index 000000000..9a562f78a
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Model/Numeric/NumericComponent.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 737675ae567e412aa2ec234c3fa62ed5
+timeCreated: 1756114955
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Model/Numeric/NumericType.cs b/Assets/Scripts/Fishing2/Model/Numeric/NumericType.cs
new file mode 100644
index 000000000..0ae6a1d13
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Model/Numeric/NumericType.cs
@@ -0,0 +1,8 @@
+namespace NBF.Fishing2
+{
+ public static class NumericType
+ {
+ public const int Max = 10000;
+
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Model/Numeric/NumericType.cs.meta b/Assets/Scripts/Fishing2/Model/Numeric/NumericType.cs.meta
new file mode 100644
index 000000000..c514ab5ac
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Model/Numeric/NumericType.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 257e38cf2fa2457087822886699e3276
+timeCreated: 1756115154
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit.meta b/Assets/Scripts/Fishing2/Model/Unit.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit.meta
rename to Assets/Scripts/Fishing2/Model/Unit.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear.meta b/Assets/Scripts/Fishing2/Model/Unit/Gear.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear.meta
rename to Assets/Scripts/Fishing2/Model/Unit/Gear.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child.meta b/Assets/Scripts/Fishing2/Model/Unit/Gear/Child.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/Child.meta
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/Child.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs b/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBaitComponent.cs
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBaitComponent.cs
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBaitComponent.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs.meta
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBaitComponent.cs.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs b/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBobberComponent.cs
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBobberComponent.cs
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBobberComponent.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs.meta
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBobberComponent.cs.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs b/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearHookComponent.cs
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearHookComponent.cs
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearHookComponent.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs.meta
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearHookComponent.cs.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs b/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLineComponent.cs
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLineComponent.cs
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLineComponent.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs.meta
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLineComponent.cs.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs b/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLureComponent.cs
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLureComponent.cs
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLureComponent.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs.meta
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLureComponent.cs.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs b/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearReelComponent.cs
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearReelComponent.cs
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearReelComponent.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs.meta
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearReelComponent.cs.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs b/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearRodComponent.cs
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearRodComponent.cs
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearRodComponent.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs.meta
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearRodComponent.cs.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs b/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearWeightComponent.cs
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearWeightComponent.cs
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearWeightComponent.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs.meta
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearWeightComponent.cs.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs b/Assets/Scripts/Fishing2/Model/Unit/Gear/UnitGearComponent.cs
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/UnitGearComponent.cs
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Unit/Gear/UnitGearComponent.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs.meta
rename to Assets/Scripts/Fishing2/Model/Unit/Gear/UnitGearComponent.cs.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Parts.meta b/Assets/Scripts/Fishing2/Model/Unit/Parts.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Parts.meta
rename to Assets/Scripts/Fishing2/Model/Unit/Parts.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs b/Assets/Scripts/Fishing2/Model/Unit/Parts/UnitFlashlightComponent.cs
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs
rename to Assets/Scripts/Fishing2/Model/Unit/Parts/UnitFlashlightComponent.cs
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Unit/Parts/UnitFlashlightComponent.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs.meta
rename to Assets/Scripts/Fishing2/Model/Unit/Parts/UnitFlashlightComponent.cs.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Skin.meta b/Assets/Scripts/Fishing2/Model/Unit/Skin.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Skin.meta
rename to Assets/Scripts/Fishing2/Model/Unit/Skin.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs b/Assets/Scripts/Fishing2/Model/Unit/Skin/UnitSkinComponent.cs
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs
rename to Assets/Scripts/Fishing2/Model/Unit/Skin/UnitSkinComponent.cs
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Unit/Skin/UnitSkinComponent.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs.meta
rename to Assets/Scripts/Fishing2/Model/Unit/Skin/UnitSkinComponent.cs.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Unit.cs b/Assets/Scripts/Fishing2/Model/Unit/Unit.cs
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Unit.cs
rename to Assets/Scripts/Fishing2/Model/Unit/Unit.cs
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Unit.cs.meta b/Assets/Scripts/Fishing2/Model/Unit/Unit.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/Unit.cs.meta
rename to Assets/Scripts/Fishing2/Model/Unit/Unit.cs.meta
diff --git a/Assets/Scripts/Fishing2/Model/Unit/UnitBasic.cs b/Assets/Scripts/Fishing2/Model/Unit/UnitBasic.cs
new file mode 100644
index 000000000..de2ddf7fc
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Model/Unit/UnitBasic.cs
@@ -0,0 +1,9 @@
+using NBC.Entitas;
+
+namespace NBF.Fishing2
+{
+ public class UnitBasic : Entity
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Model/Unit/UnitBasic.cs.meta b/Assets/Scripts/Fishing2/Model/Unit/UnitBasic.cs.meta
new file mode 100644
index 000000000..09b54bbbf
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Model/Unit/UnitBasic.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 19299372f58c4c1db612f36ce60ee238
+timeCreated: 1756116063
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/UnitEventType.cs b/Assets/Scripts/Fishing2/Model/Unit/UnitEventType.cs
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/UnitEventType.cs
rename to Assets/Scripts/Fishing2/Model/Unit/UnitEventType.cs
diff --git a/Assets/Scripts/Fishing2/Data/Unit/UnitEventType.cs.meta b/Assets/Scripts/Fishing2/Model/Unit/UnitEventType.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/UnitEventType.cs.meta
rename to Assets/Scripts/Fishing2/Model/Unit/UnitEventType.cs.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/UnitStateArgs.cs b/Assets/Scripts/Fishing2/Model/Unit/UnitStateArgs.cs
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/UnitStateArgs.cs
rename to Assets/Scripts/Fishing2/Model/Unit/UnitStateArgs.cs
diff --git a/Assets/Scripts/Fishing2/Data/Unit/UnitStateArgs.cs.meta b/Assets/Scripts/Fishing2/Model/Unit/UnitStateArgs.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Unit/UnitStateArgs.cs.meta
rename to Assets/Scripts/Fishing2/Model/Unit/UnitStateArgs.cs.meta
diff --git a/Assets/Scripts/Fishing2/System/Data/UnitFactory.cs b/Assets/Scripts/Fishing2/System/Data/UnitFactory.cs
new file mode 100644
index 000000000..e657fe231
--- /dev/null
+++ b/Assets/Scripts/Fishing2/System/Data/UnitFactory.cs
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 000000000..a6899b615
--- /dev/null
+++ b/Assets/Scripts/Fishing2/System/Data/UnitFactory.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d636bf7bc79a4d55b7f03a6e7a187b22
+timeCreated: 1756106498
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs b/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs
index 9cae15acb..36dfc6b83 100644
--- a/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs
+++ b/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs
@@ -1,7 +1,18 @@
-namespace NBF.Fishing2
+using NBC;
+
+namespace NBF.Fishing2
{
public static class UnitSystem
{
+ public static void SetUnitInfo(this Unit self, MapUnitInfo unitInfo)
+ {
+ NumericComponent numericComponent = self.AddComponent();
+ foreach (var kv in unitInfo.KV)
+ {
+ numericComponent.Set(kv.Key, kv.Value);
+ }
+ }
+
public static UnitConfig Config(this Unit self)
{
return UnitConfig.Get(self.ConfigId);
diff --git a/Assets/Scripts/Generate/NetworkProtocol/Account.cs b/Assets/Scripts/Generate/NetworkProtocol/Account.cs
index 24459a31c..08a52bdbe 100644
--- a/Assets/Scripts/Generate/NetworkProtocol/Account.cs
+++ b/Assets/Scripts/Generate/NetworkProtocol/Account.cs
@@ -68,6 +68,26 @@ namespace NBC
public long Value { get; set; }
}
[ProtoContract]
+ public partial class KeyValueInt32 : AMessage, IProto
+ {
+ public static KeyValueInt32 Create(Scene scene)
+ {
+ return scene.MessagePoolComponent.Rent();
+ }
+ public override void Dispose()
+ {
+ Key = default;
+ Value = default;
+#if FANTASY_NET || FANTASY_UNITY
+ GetScene().MessagePoolComponent.Return(this);
+#endif
+ }
+ [ProtoMember(1)]
+ public int Key { get; set; }
+ [ProtoMember(2)]
+ public int Value { get; set; }
+ }
+ [ProtoContract]
public partial class KeyValueInt64 : AMessage, IProto
{
public static KeyValueInt64 Create(Scene scene)
diff --git a/Assets/Scripts/Generate/NetworkProtocol/MapMessage.cs b/Assets/Scripts/Generate/NetworkProtocol/MapMessage.cs
index 30c08eddf..f3679cffa 100644
--- a/Assets/Scripts/Generate/NetworkProtocol/MapMessage.cs
+++ b/Assets/Scripts/Generate/NetworkProtocol/MapMessage.cs
@@ -10,18 +10,18 @@ using NBC.Serialize;
namespace NBC
{
[ProtoContract]
- public partial class RoleGearItemInfo : AMessage, IProto
+ public partial class UnitGearItemInfo : AMessage, IProto
{
- public static RoleGearItemInfo Create(Scene scene)
+ public static UnitGearItemInfo Create(Scene scene)
{
- return scene.MessagePoolComponent.Rent();
+ return scene.MessagePoolComponent.Rent();
}
public override void Dispose()
{
Id = default;
ConfigId = default;
#if FANTASY_NET || FANTASY_UNITY
- GetScene().MessagePoolComponent.Return(this);
+ GetScene().MessagePoolComponent.Return(this);
#endif
}
[ProtoMember(1)]
@@ -30,11 +30,11 @@ namespace NBC
public int ConfigId { get; set; }
}
[ProtoContract]
- public partial class RoleGearInfo : AMessage, IProto
+ public partial class UnitGearInfo : AMessage, IProto
{
- public static RoleGearInfo Create(Scene scene)
+ public static UnitGearInfo Create(Scene scene)
{
- return scene.MessagePoolComponent.Rent();
+ return scene.MessagePoolComponent.Rent();
}
public override void Dispose()
{
@@ -49,29 +49,29 @@ namespace NBC
Leader = default;
Feeder = default;
#if FANTASY_NET || FANTASY_UNITY
- GetScene().MessagePoolComponent.Return(this);
+ GetScene().MessagePoolComponent.Return(this);
#endif
}
[ProtoMember(1)]
- public RoleGearItemInfo Rod { get; set; }
+ public UnitGearItemInfo Rod { get; set; }
[ProtoMember(2)]
- public RoleGearItemInfo Reel { get; set; }
+ public UnitGearItemInfo Reel { get; set; }
[ProtoMember(3)]
- public RoleGearItemInfo Bobber { get; set; }
+ public UnitGearItemInfo Bobber { get; set; }
[ProtoMember(4)]
- public RoleGearItemInfo Hook { get; set; }
+ public UnitGearItemInfo Hook { get; set; }
[ProtoMember(5)]
- public RoleGearItemInfo Bait { get; set; }
+ public UnitGearItemInfo Bait { get; set; }
[ProtoMember(6)]
- public RoleGearItemInfo Lure { get; set; }
+ public UnitGearItemInfo Lure { get; set; }
[ProtoMember(7)]
- public RoleGearItemInfo Weight { get; set; }
+ public UnitGearItemInfo Weight { get; set; }
[ProtoMember(8)]
- public RoleGearItemInfo Line { get; set; }
+ public UnitGearItemInfo Line { get; set; }
[ProtoMember(9)]
- public RoleGearItemInfo Leader { get; set; }
+ public UnitGearItemInfo Leader { get; set; }
[ProtoMember(10)]
- public RoleGearItemInfo Feeder { get; set; }
+ public UnitGearItemInfo Feeder { get; set; }
}
[ProtoContract]
public partial class Vector3Info : AMessage, IProto
@@ -123,11 +123,11 @@ namespace NBC
public float w { get; set; }
}
[ProtoContract]
- public partial class RoleFishingInfo : AMessage, IProto
+ public partial class UnitFishingInfo : AMessage, IProto
{
- public static RoleFishingInfo Create(Scene scene)
+ public static UnitFishingInfo Create(Scene scene)
{
- return scene.MessagePoolComponent.Rent();
+ return scene.MessagePoolComponent.Rent();
}
public override void Dispose()
{
@@ -136,7 +136,7 @@ namespace NBC
OpenLight = default;
RodSetting = default;
#if FANTASY_NET || FANTASY_UNITY
- GetScene().MessagePoolComponent.Return(this);
+ GetScene().MessagePoolComponent.Return(this);
#endif
}
[ProtoMember(1)]
@@ -149,18 +149,18 @@ namespace NBC
public int RodSetting { get; set; }
}
[ProtoContract]
- public partial class RoleStateInfo : AMessage, IProto
+ public partial class UnitStateInfo : AMessage, IProto
{
- public static RoleStateInfo Create(Scene scene)
+ public static UnitStateInfo Create(Scene scene)
{
- return scene.MessagePoolComponent.Rent();
+ return scene.MessagePoolComponent.Rent();
}
public override void Dispose()
{
State = default;
Args.Clear();
#if FANTASY_NET || FANTASY_UNITY
- GetScene().MessagePoolComponent.Return(this);
+ GetScene().MessagePoolComponent.Return(this);
#endif
}
[ProtoMember(1)]
@@ -169,11 +169,11 @@ namespace NBC
public List Args = new List();
}
[ProtoContract]
- public partial class MapRoleInfo : AMessage, IProto
+ public partial class MapUnitInfo : AMessage, IProto
{
- public static MapRoleInfo Create(Scene scene)
+ public static MapUnitInfo Create(Scene scene)
{
- return scene.MessagePoolComponent.Rent();
+ return scene.MessagePoolComponent.Rent();
}
public override void Dispose()
{
@@ -183,8 +183,9 @@ namespace NBC
State = default;
Gears = default;
FishingInfo = default;
+ KV.Clear();
#if FANTASY_NET || FANTASY_UNITY
- GetScene().MessagePoolComponent.Return(this);
+ GetScene().MessagePoolComponent.Return(this);
#endif
}
[ProtoMember(1)]
@@ -192,27 +193,29 @@ namespace NBC
[ProtoMember(2)]
public RoleSimpleInfo RoleInfo { get; set; }
[ProtoMember(3)]
- public MapRolePositionInfo Location { get; set; }
+ public MapUnitPositionInfo Location { get; set; }
[ProtoMember(4)]
- public RoleStateInfo State { get; set; }
+ public UnitStateInfo State { get; set; }
[ProtoMember(5)]
- public RoleGearInfo Gears { get; set; }
+ public UnitGearInfo Gears { get; set; }
[ProtoMember(6)]
- public RoleFishingInfo FishingInfo { get; set; }
+ public UnitFishingInfo FishingInfo { get; set; }
+ [ProtoMember(7)]
+ public List KV = new List();
}
[ProtoContract]
- public partial class MapRolePositionInfo : AMessage, IProto
+ public partial class MapUnitPositionInfo : AMessage, IProto
{
- public static MapRolePositionInfo Create(Scene scene)
+ public static MapUnitPositionInfo Create(Scene scene)
{
- return scene.MessagePoolComponent.Rent();
+ return scene.MessagePoolComponent.Rent();
}
public override void Dispose()
{
Position = default;
Rotation = default;
#if FANTASY_NET || FANTASY_UNITY
- GetScene().MessagePoolComponent.Return(this);
+ GetScene().MessagePoolComponent.Return(this);
#endif
}
[ProtoMember(1)]
@@ -230,14 +233,14 @@ namespace NBC
public override void Dispose()
{
ErrorCode = default;
- Roles.Clear();
+ Units.Clear();
#if FANTASY_NET || FANTASY_UNITY
GetScene().MessagePoolComponent.Return(this);
#endif
}
public uint OpCode() { return OuterOpcode.Map2C_CreateMapResponse; }
[ProtoMember(1)]
- public List Roles = new List();
+ public List Units = new List();
[ProtoMember(2)]
public uint ErrorCode { get; set; }
}
@@ -276,14 +279,14 @@ namespace NBC
public override void Dispose()
{
ErrorCode = default;
- Roles.Clear();
+ Units.Clear();
#if FANTASY_NET || FANTASY_UNITY
GetScene().MessagePoolComponent.Return(this);
#endif
}
public uint OpCode() { return OuterOpcode.Map2C_EnterMapResponse; }
[ProtoMember(1)]
- public List Roles = new List();
+ public List Units = new List();
[ProtoMember(2)]
public uint ErrorCode { get; set; }
}
@@ -306,7 +309,7 @@ namespace NBC
[ProtoIgnore]
public int RouteType => Fantasy.RouteType.MapRoute;
[ProtoMember(1)]
- public MapRolePositionInfo Location { get; set; }
+ public MapUnitPositionInfo Location { get; set; }
[ProtoMember(2)]
public bool IsStop { get; set; }
}
@@ -331,7 +334,7 @@ namespace NBC
[ProtoIgnore]
public int RouteType => Fantasy.RouteType.MapRoute;
[ProtoMember(1)]
- public MapRoleInfo Info { get; set; }
+ public MapUnitInfo Info { get; set; }
}
///
/// 用户离开地图
@@ -380,7 +383,7 @@ namespace NBC
[ProtoMember(1)]
public long Id { get; set; }
[ProtoMember(2)]
- public RoleStateInfo State { get; set; }
+ public UnitStateInfo State { get; set; }
}
///
/// 玩家钓组状态变化
@@ -406,7 +409,7 @@ namespace NBC
[ProtoMember(1)]
public long Id { get; set; }
[ProtoMember(2)]
- public RoleFishingInfo State { get; set; }
+ public UnitFishingInfo State { get; set; }
}
///
/// 玩家钓组变化
@@ -432,7 +435,7 @@ namespace NBC
[ProtoMember(1)]
public long Id { get; set; }
[ProtoMember(2)]
- public RoleGearInfo Gears { get; set; }
+ public UnitGearInfo Gears { get; set; }
}
///
/// 玩家位置变化
@@ -455,6 +458,6 @@ namespace NBC
[ProtoMember(1)]
public long Id { get; set; }
[ProtoMember(2)]
- public MapRolePositionInfo Location { get; set; }
+ public MapUnitPositionInfo Location { get; set; }
}
}
diff --git a/Assets/Scripts/Startup/Init.cs b/Assets/Scripts/Startup/Init.cs
index 36ba4a4ba..80923b9fa 100644
--- a/Assets/Scripts/Startup/Init.cs
+++ b/Assets/Scripts/Startup/Init.cs
@@ -141,10 +141,7 @@ namespace NBF
// //测试登录
// OnLoginButtonClick().Coroutine();
}
-
-
-
private void LoadData()
{
ConfigAssets.Init();
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index f1181cd70..d1992fefa 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -20,6 +20,9 @@ EditorBuildSettings:
- enabled: 1
path: Assets/ResRaw/Maps/Map10/Map10.unity
guid: a1b51c1ebcf71b24db0faa9f8ef610c6
+ - enabled: 1
+ path: Assets/ResRaw/Maps/Map99/Map99.unity
+ guid: 956b354d2875715418f574fcf501363e
m_configObjects:
com.unity.input.settings.actions: {fileID: -944628639613478452, guid: d0e3cb5a99f3d324ea14bfe64485b2e4, type: 3}
m_UseUCBPForAssetBundles: 0
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 432ed6201..51c014eca 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -9,31 +9,31 @@ EditorUserSettings:
value: 18134705175a055722080a3115371d4a0d55006876786860616b0471b8b07a68ffab74f9ee2a3a30300cea1a11320d0beb1a0c25f7060f494b4cc80018eb09361fc211cb1f862d19c51d19dcc413d6ade0d8ddfcddf9f4d9d29195fcfde6ebeae6f0a9c9afa6f8c5b89ff7a1aacececac4eba4d7c9d28bda
flags: 0
RecentlyUsedSceneGuid-0:
- value: 5302565f50030d0f0f595f2315250944444e4c2c2e797562742c4a32b3b16c3b
+ value: 5a09065056055c0e595d0a20447b0b4415164e2b297c75682f7c1866b0b3656c
flags: 0
RecentlyUsedSceneGuid-1:
value: 0704555600540b5d58575c73427b59444515407879792766752b4c66e1b9613e
flags: 0
RecentlyUsedSceneGuid-2:
- value: 0152510407025f025d0b5f77477706444315482e2f7970602c7a4c62e3b96d6a
- flags: 0
- RecentlyUsedSceneGuid-3:
- value: 025005075d000f0c095c0f7145730b4447161e2c787923327a7c4965e0b66669
- flags: 0
- RecentlyUsedSceneGuid-4:
- value: 5703055552020f5a595608704870594445151d7e29292233782f1b36e0e6366c
- flags: 0
- RecentlyUsedSceneGuid-5:
- value: 5309035757065a0a54575f7216265c4444151d28792e72627d2f1935bbb8673a
- flags: 0
- RecentlyUsedSceneGuid-6:
value: 020056535456585e0f0d0a7541210d441215482c2d297f36752c1b65b3b0376e
flags: 0
+ RecentlyUsedSceneGuid-3:
+ value: 5607575f01045803555a5b74167b0c4414164e737a2c7060297b4862bbb1636e
+ flags: 0
+ RecentlyUsedSceneGuid-4:
+ value: 5b0206565505590b545d5e7240730f4014444a7a7c7876602e7a4f63b2b06468
+ flags: 0
+ RecentlyUsedSceneGuid-5:
+ value: 025005075d000f0c095c0f7145730b4447161e2c787923327a7c4965e0b66669
+ flags: 0
+ RecentlyUsedSceneGuid-6:
+ value: 5703055552020f5a595608704870594445151d7e29292233782f1b36e0e6366c
+ flags: 0
RecentlyUsedSceneGuid-7:
- value: 020801035c53500a580c0f7145700c4444164d2e797d7f332c704963b0b06260
+ value: 5309035757065a0a54575f7216265c4444151d28792e72627d2f1935bbb8673a
flags: 0
RecentlyUsedSceneGuid-8:
- value: 5a09065056055c0e595d0a20447b0b4415164e2b297c75682f7c1866b0b3656c
+ value: 5a04020456005d5f5f565b7747720a44474f1e7f7b7c20332b7c4d62b1b6673d
flags: 0
RecentlyUsedSceneGuid-9:
value: 5505015f5c515a085f5b092149760f441716407a787d7564287b1b36e7e1366e