diff --git a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_Underwater__KWS_USE_CAUSTIC__KWS_USE_HALF_LINE_TENSION__KWS_USE_VOLUMETRIC_LIGHT.mat b/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_Underwater__KWS_USE_CAUSTIC__KWS_USE_HALF_LINE_TENSION__KWS_USE_VOLUMETRIC_LIGHT.mat deleted file mode 100644 index 7fe12b253..000000000 --- a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_Underwater__KWS_USE_CAUSTIC__KWS_USE_HALF_LINE_TENSION__KWS_USE_VOLUMETRIC_LIGHT.mat +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: KWS_Stub_Underwater__KWS_USE_CAUSTIC__KWS_USE_HALF_LINE_TENSION__KWS_USE_VOLUMETRIC_LIGHT - m_Shader: {fileID: 4800000, guid: 2538f62f88b4cbe43b6950a2315ce503, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - KWS_USE_CAUSTIC - - KWS_USE_HALF_LINE_TENSION - - KWS_USE_VOLUMETRIC_LIGHT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - KWS_StencilMaskValue: 32 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_Underwater__KWS_USE_CAUSTIC__KWS_USE_HALF_LINE_TENSION__KWS_USE_VOLUMETRIC_LIGHT.mat.meta b/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_Underwater__KWS_USE_CAUSTIC__KWS_USE_HALF_LINE_TENSION__KWS_USE_VOLUMETRIC_LIGHT.mat.meta deleted file mode 100644 index af3993b21..000000000 --- a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_Underwater__KWS_USE_CAUSTIC__KWS_USE_HALF_LINE_TENSION__KWS_USE_VOLUMETRIC_LIGHT.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 82971a15a637fa54cbd094e77f8856bd -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterCustomMesh__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat b/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterCustomMesh__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat deleted file mode 100644 index c0d1999f1..000000000 --- a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterCustomMesh__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat +++ /dev/null @@ -1,38 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: KWS_Stub_WaterCustomMesh__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS - m_Shader: {fileID: 4800000, guid: e2e776d3b3279a14798b747d63cd54c0, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - KWS_REFLECT_SUN - - KWS_SSR_REFLECTION - - KWS_USE_CAUSTIC - - KWS_USE_REFRACTION_DISPERSION - - KWS_USE_REFRACTION_IOR - - KWS_USE_VOLUMETRIC_LIGHT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - KWS_StencilMaskValue: 32 - - srpBatcherFix: 0 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterCustomMesh__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat.meta b/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterCustomMesh__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat.meta deleted file mode 100644 index cc754fa9d..000000000 --- a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterCustomMesh__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1a91529b75f28db46bafe23dcf390947 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePassCustomMesh__KWS_USE_HALF_LINE_TENSION.mat b/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePassCustomMesh__KWS_USE_HALF_LINE_TENSION.mat deleted file mode 100644 index e61cab8fa..000000000 --- a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePassCustomMesh__KWS_USE_HALF_LINE_TENSION.mat +++ /dev/null @@ -1,32 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: KWS_Stub_WaterPrePassCustomMesh__KWS_USE_HALF_LINE_TENSION - m_Shader: {fileID: 4800000, guid: 8b77509398ab5834cb8bf0687588b69f, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - KWS_USE_HALF_LINE_TENSION - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - srpBatcherFix: 0 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePassCustomMesh__KWS_USE_HALF_LINE_TENSION.mat.meta b/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePassCustomMesh__KWS_USE_HALF_LINE_TENSION.mat.meta deleted file mode 100644 index 4e63d45a4..000000000 --- a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePassCustomMesh__KWS_USE_HALF_LINE_TENSION.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9f93cf57fa943ed4e865d916180166e6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePassZoneInstance__KWS_USE_HALF_LINE_TENSION.mat b/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePassZoneInstance__KWS_USE_HALF_LINE_TENSION.mat deleted file mode 100644 index 785c26b84..000000000 --- a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePassZoneInstance__KWS_USE_HALF_LINE_TENSION.mat +++ /dev/null @@ -1,32 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: KWS_Stub_WaterPrePassZoneInstance__KWS_USE_HALF_LINE_TENSION - m_Shader: {fileID: 4800000, guid: 122cfe136ad642e4ca7c0884aa039dbd, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - KWS_USE_HALF_LINE_TENSION - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - srpBatcherFix: 0 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePass__KWS_USE_HALF_LINE_TENSION.mat b/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePass__KWS_USE_HALF_LINE_TENSION.mat deleted file mode 100644 index f1d70ab4c..000000000 --- a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePass__KWS_USE_HALF_LINE_TENSION.mat +++ /dev/null @@ -1,32 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: KWS_Stub_WaterPrePass__KWS_USE_HALF_LINE_TENSION - m_Shader: {fileID: 4800000, guid: 18f50750127ff4c459b80b84582197ff, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - KWS_USE_HALF_LINE_TENSION - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - srpBatcherFix: 0 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePass__KWS_USE_HALF_LINE_TENSION.mat.meta b/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePass__KWS_USE_HALF_LINE_TENSION.mat.meta deleted file mode 100644 index 69871d602..000000000 --- a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePass__KWS_USE_HALF_LINE_TENSION.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: adeefb51fde13d94589db8999a8189fb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterZoneInstance__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat b/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterZoneInstance__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat deleted file mode 100644 index 6ea9430a3..000000000 --- a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterZoneInstance__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat +++ /dev/null @@ -1,38 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: KWS_Stub_WaterZoneInstance__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS - m_Shader: {fileID: 4800000, guid: da0dbc1d3ef7374489f343ff2a5394bd, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - KWS_REFLECT_SUN - - KWS_SSR_REFLECTION - - KWS_USE_CAUSTIC - - KWS_USE_REFRACTION_DISPERSION - - KWS_USE_REFRACTION_IOR - - KWS_USE_VOLUMETRIC_LIGHT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - KWS_StencilMaskValue: 32 - - srpBatcherFix: 0 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterZoneInstance__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat.meta b/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterZoneInstance__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat.meta deleted file mode 100644 index 7944fa20a..000000000 --- a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterZoneInstance__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cda637a6993286d449cb0498dc87d98b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_Water__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat b/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_Water__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat deleted file mode 100644 index 2e3e57bb3..000000000 --- a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_Water__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat +++ /dev/null @@ -1,38 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: KWS_Stub_Water__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS - m_Shader: {fileID: 4800000, guid: 3053b55455b17244e8745591e1aefd6a, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - KWS_REFLECT_SUN - - KWS_SSR_REFLECTION - - KWS_USE_CAUSTIC - - KWS_USE_REFRACTION_DISPERSION - - KWS_USE_REFRACTION_IOR - - KWS_USE_VOLUMETRIC_LIGHT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - KWS_StencilMaskValue: 32 - - srpBatcherFix: 0 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_Water__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat.meta b/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_Water__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat.meta deleted file mode 100644 index 17ea5e18d..000000000 --- a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_Water__KWS_REFLECT_SUN__KWS_SSR_REFLECTION__KWS_USE_CAUSTIC__KWS_USE_REFRACTION_DISPERS.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1d94851b362ff4b4389204b78e04d13c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResRaw/Fgui/CommonNew_atlas0.png b/Assets/ResRaw/Fgui/CommonNew_atlas0.png new file mode 100644 index 000000000..79be651a0 Binary files /dev/null and b/Assets/ResRaw/Fgui/CommonNew_atlas0.png differ diff --git a/Assets/ResRaw/Fgui/CommonNew_atlas0.png.meta b/Assets/ResRaw/Fgui/CommonNew_atlas0.png.meta new file mode 100644 index 000000000..5ff08053e --- /dev/null +++ b/Assets/ResRaw/Fgui/CommonNew_atlas0.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 5eccfaf76f8ca9348869aedab559ae58 +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/ResRaw/Fgui/CommonNew_fui.bytes b/Assets/ResRaw/Fgui/CommonNew_fui.bytes new file mode 100644 index 000000000..fca26b232 Binary files /dev/null and b/Assets/ResRaw/Fgui/CommonNew_fui.bytes differ diff --git a/Assets/Resources/PerformanceTestRunInfo.json.meta b/Assets/ResRaw/Fgui/CommonNew_fui.bytes.meta similarity index 75% rename from Assets/Resources/PerformanceTestRunInfo.json.meta rename to Assets/ResRaw/Fgui/CommonNew_fui.bytes.meta index 5d8a02425..b50e4f964 100644 --- a/Assets/Resources/PerformanceTestRunInfo.json.meta +++ b/Assets/ResRaw/Fgui/CommonNew_fui.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 41ded0e14d6a7ef4eb2d2db4c28097c9 +guid: 6c3278caf91a57144b4cc4b19bfdd6f8 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Fgui/Common/Common_atlas0.png b/Assets/Resources/Fgui/Common/Common_atlas0.png index 816c06968..d850d0358 100644 Binary files a/Assets/Resources/Fgui/Common/Common_atlas0.png and b/Assets/Resources/Fgui/Common/Common_atlas0.png differ diff --git a/Assets/Resources/Fgui/Common/Common_atlas0.png.meta b/Assets/Resources/Fgui/Common/Common_atlas0.png.meta index b48b2f776..2f1a0fef0 100644 --- a/Assets/Resources/Fgui/Common/Common_atlas0.png.meta +++ b/Assets/Resources/Fgui/Common/Common_atlas0.png.meta @@ -25,7 +25,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMipmapLimit: 1 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -37,9 +37,9 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -52,7 +52,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -62,7 +62,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 1 + ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 cookieLightType: 0 @@ -73,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 100 + compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 diff --git a/Assets/Resources/Fgui/Common/Common_fui.bytes b/Assets/Resources/Fgui/Common/Common_fui.bytes index 01270282f..668a126e6 100644 Binary files a/Assets/Resources/Fgui/Common/Common_fui.bytes and b/Assets/Resources/Fgui/Common/Common_fui.bytes differ diff --git a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePassZoneInstance__KWS_USE_HALF_LINE_TENSION.mat.meta b/Assets/Resources/Fgui/CommonNew.meta similarity index 52% rename from Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePassZoneInstance__KWS_USE_HALF_LINE_TENSION.mat.meta rename to Assets/Resources/Fgui/CommonNew.meta index 0b95b4162..8b6f17ed0 100644 --- a/Assets/KriptoFX/WaterSystem2/WaterQualitySettings/Resources/GeneratedShaderFeatureMaterials/KWS_Stub_WaterPrePassZoneInstance__KWS_USE_HALF_LINE_TENSION.mat.meta +++ b/Assets/Resources/Fgui/CommonNew.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: c823611d7631df04bae2221c5a748e92 -NativeFormatImporter: +guid: 00b185a476409184ba51a54aba472db4 +folderAsset: yes +DefaultImporter: externalObjects: {} - mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/Fgui/CommonNew/CommonNew_atlas0.png b/Assets/Resources/Fgui/CommonNew/CommonNew_atlas0.png new file mode 100644 index 000000000..79be651a0 Binary files /dev/null and b/Assets/Resources/Fgui/CommonNew/CommonNew_atlas0.png differ diff --git a/Assets/Resources/Fgui/CommonNew/CommonNew_atlas0.png.meta b/Assets/Resources/Fgui/CommonNew/CommonNew_atlas0.png.meta new file mode 100644 index 000000000..161248c8e --- /dev/null +++ b/Assets/Resources/Fgui/CommonNew/CommonNew_atlas0.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 2ed7c6f7e8b523340bbcc13fffb789f3 +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/Resources/Fgui/CommonNew/CommonNew_fui.bytes b/Assets/Resources/Fgui/CommonNew/CommonNew_fui.bytes new file mode 100644 index 000000000..a64d8388a Binary files /dev/null and b/Assets/Resources/Fgui/CommonNew/CommonNew_fui.bytes differ diff --git a/Assets/Resources/PerformanceTestRunSettings.json.meta b/Assets/Resources/Fgui/CommonNew/CommonNew_fui.bytes.meta similarity index 75% rename from Assets/Resources/PerformanceTestRunSettings.json.meta rename to Assets/Resources/Fgui/CommonNew/CommonNew_fui.bytes.meta index 83c7d6298..c4232e0cb 100644 --- a/Assets/Resources/PerformanceTestRunSettings.json.meta +++ b/Assets/Resources/Fgui/CommonNew/CommonNew_fui.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b401ffb571c7ebd4d8c84d6d20416f10 +guid: e348b58e1d5b8bd4da63050b491c6bed TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Fgui/Main/Main_atlas0.png.meta b/Assets/Resources/Fgui/Main/Main_atlas0.png.meta index 0ce3f0a37..c7eb0f08c 100644 --- a/Assets/Resources/Fgui/Main/Main_atlas0.png.meta +++ b/Assets/Resources/Fgui/Main/Main_atlas0.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -52,7 +52,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/Assets/Resources/Fgui/Main/Main_fui.bytes b/Assets/Resources/Fgui/Main/Main_fui.bytes index f4f408b03..a13549649 100644 Binary files a/Assets/Resources/Fgui/Main/Main_fui.bytes and b/Assets/Resources/Fgui/Main/Main_fui.bytes differ diff --git a/Assets/Resources/PerformanceTestRunInfo.json b/Assets/Resources/PerformanceTestRunInfo.json deleted file mode 100644 index d3290fa4e..000000000 --- a/Assets/Resources/PerformanceTestRunInfo.json +++ /dev/null @@ -1 +0,0 @@ -{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"GraphicsJobs","GpuSkinning":true,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"IL2CPP","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"StandaloneWindows64","StereoRenderingPath":"MultiPass"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.2.2f1","Branch":"6000.2/staging","Changeset":"ea398eefe1c2","Date":1755652437},"Dependencies":["com.fantasy.unity@2025.2.12","com.unity.2d.sprite@1.0.0","com.unity.ai.navigation@2.0.8","com.unity.burst@1.8.25","com.unity.collab-proxy@2.8.2","com.unity.collections@2.5.7","com.unity.ide.rider@3.0.36","com.unity.ide.visualstudio@2.0.23","com.unity.inputsystem@1.14.2","com.unity.jobs@0.70.0-preview.7","com.unity.mathematics@1.3.2","com.unity.multiplayer.center@1.0.0","com.unity.nuget.newtonsoft-json@3.2.1","com.unity.postprocessing@3.5.0","com.unity.render-pipelines.core@17.2.0","com.unity.render-pipelines.high-definition@17.2.0","com.unity.render-pipelines.universal@17.2.0","com.unity.shadergraph@17.2.0","com.unity.terrain-tools@5.3.0","com.unity.test-framework@1.5.1","com.unity.timeline@1.8.9","com.unity.ugui@2.0.0","com.unity.visualscripting@1.9.7","com.unity.modules.accessibility@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.jbooth.microsplat.alpha-hole@3.9.0","com.jbooth.microsplat.anti-tile@3.9.0","com.jbooth.microsplat.core@3.9.0","com.jbooth.microsplat.decal@3.9.0","com.jbooth.microsplat.global-texture@3.9.0","com.jbooth.microsplat.low-poly@3.9.0","com.jbooth.microsplat.mesh-terrain@3.9.0","com.jbooth.microsplat.mesh-workflow@3.9.0","com.jbooth.microsplat.procedural-texture@3.9.0","com.jbooth.microsplat.scatter@3.9.0","com.jbooth.microsplat.snow@3.9.0","com.jbooth.microsplat.streams@3.9.0","com.jbooth.microsplat.terrain-blending@3.9.0","com.jbooth.microsplat.tessellation@3.9.0","com.jbooth.microsplat.texture-clusters@3.9.0","com.jbooth.microsplat.trax@3.9.0","com.jbooth.microsplat.triplanar@3.9.0","com.jbooth.microsplat.wind@3.9.0","com.jbooth.microverse@1.7.0","com.jbooth.microverse.ambiance@1.7.0","com.jbooth.microverse.demo@1.7.0","com.jbooth.microverse.objects@1.7.0","com.jbooth.microverse.roads@1.7.0","com.jbooth.microverse.roads.demo@1.7.0","com.jbooth.microverse.splines@1.7.0","com.jbooth.microverse.vegetation@1.7.0","com.unity.splines@2.8.1","com.unity.modules.subsystems@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.ext.nunit@2.0.5","com.unity.searcher@4.9.3","com.unity.render-pipelines.universal-config@17.0.3","com.unity.visualeffectgraph@17.2.0","com.unity.render-pipelines.high-definition-config@17.2.0","com.unity.rendering.light-transport@1.0.1","com.unity.nuget.mono-cecil@1.11.5","com.unity.test-framework.performance@3.1.0","com.unity.settings-manager@2.1.0"],"Results":[]} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunSettings.json b/Assets/Resources/PerformanceTestRunSettings.json deleted file mode 100644 index 49438ae14..000000000 --- a/Assets/Resources/PerformanceTestRunSettings.json +++ /dev/null @@ -1 +0,0 @@ -{"MeasurementCount":-1} \ No newline at end of file diff --git a/Assets/Resources/config/configs.json b/Assets/Resources/config/configs.json index ad8bec345..0018b8dcb 100644 --- a/Assets/Resources/config/configs.json +++ b/Assets/Resources/config/configs.json @@ -1353,6 +1353,1756 @@ "ConstructionType": 0 } ], + "GoodsConfig": [ + { + "Id": 303001, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 30001 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 303002, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 30002 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 303003, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 30003 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 303004, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 30004 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 303005, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 30005 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 303006, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 30006 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 303007, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 30007 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 303008, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 30008 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 303009, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 30009 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 303010, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 30010 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 303011, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 30011 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 304001, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 40001 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 304002, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 40002 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 304003, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 40003 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 304004, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 40004 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 304005, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 40005 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 304006, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 40006 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 304007, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 40007 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 304008, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 40008 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 304009, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 40009 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 304010, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 40010 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 305001, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 50001 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 305002, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 50002 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 305003, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 50003 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 305004, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 50004 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 305005, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 50005 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 305006, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 50006 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 305007, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 50007 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 305008, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 50008 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 305009, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 50009 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 305010, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 50010 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 305011, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 50011 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 305012, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 50012 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 305013, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 50013 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 305014, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 50014 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 306001, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 60001 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 306002, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 60002 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 306003, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 60003 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 306004, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 60004 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 306005, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 60005 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 306006, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 60006 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 306007, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 60007 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 306008, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 60008 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 306009, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 60009 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 306010, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 60010 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 307001, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 70001 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 307002, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 70002 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 307003, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 70003 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 307004, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 70004 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 308001, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 80001 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 308002, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 80002 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 308003, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 80003 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 308004, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 80004 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 308005, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 80005 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 308006, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 80006 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 308007, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 80007 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 308008, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 80008 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 308009, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 80009 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 308010, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 80010 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 308011, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 80011 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 308012, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 80012 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 308013, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 80013 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309001, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 309001, + "Items": [ + 90001 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309002, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 309001, + "Items": [ + 90002 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309003, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 309001, + "Items": [ + 90003 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309004, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 309001, + "Items": [ + 90004 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309005, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 309005, + "Items": [ + 90005 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309006, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 309005, + "Items": [ + 90006 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309007, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 90007 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309008, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 90008 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309009, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 90009 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309010, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 90010 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309011, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 90011 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309012, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 90012 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309013, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 90013 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309014, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 90014 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309015, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 90015 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309016, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 90016 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309017, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 90017 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309018, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 90018 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309019, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 90019 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 309020, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 90020 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 310001, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 100001 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 310002, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 100002 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 310003, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 100003 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 310004, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 100004 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 310005, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 100005 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 310006, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 100006 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 310007, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 100007 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 310008, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 100008 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 310009, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 100009 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 310010, + "Type": 1, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + 100010 + ], + "Amount": 1, + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + } + ], "FishConfig": [ { "Id": 210001, diff --git a/Assets/Scripts/Generate/Config/GoodsConfig.cs b/Assets/Scripts/Generate/Config/GoodsConfig.cs new file mode 100644 index 000000000..ee9b38952 --- /dev/null +++ b/Assets/Scripts/Generate/Config/GoodsConfig.cs @@ -0,0 +1,101 @@ +using System; +using ProtoBuf; +using Fantasy; +using System.Linq; +using System.Reflection; +using System.Collections.Generic; +using System.Collections.Concurrent; +using NBC; +using Fantasy.Serialize; + +namespace NBF +{ + [ProtoContract] + public sealed partial class GoodsConfig : ASerialize, IConfigTable + { + + [ProtoMember(1)] + public uint Id { get; set; } // Id + [ProtoMember(2)] + public uint Type { get; set; } // 子类型 + [ProtoMember(3)] + public uint[] Shop { get; set; } = Array.Empty(); // 出现商店 + [ProtoMember(4)] + public uint Group { get; set; } // 组 + [ProtoMember(5)] + public uint[] Items { get; set; } = Array.Empty(); // 物品 + [ProtoMember(6)] + public uint Amount { get; set; } // 获得数量 + [ProtoMember(7)] + public uint Price1 { get; set; } // 银币价格 + [ProtoMember(8)] + public uint Price2 { get; set; } // 金币价格 + [ProtoMember(9)] + public uint[] Label { get; set; } = Array.Empty(); // 标签 + [ProtoMember(10)] + public uint Number { get; set; } // 可购买数量 + [ProtoMember(11)] + public uint Disable { get; set; } // 禁用状态 + [ProtoIgnore] + public uint Key => Id; + + #region Static + + private static ConfigContext Context => ConfigTableHelper.Table(); + + public static GoodsConfig Get(uint key) + { + return Context.Get(key); + } + + public static GoodsConfig Get(Predicate match) + { + return Context.Get(match); + } + + public static GoodsConfig Fist() + { + return Context.Fist(); + } + + public static GoodsConfig Last() + { + return Context.Last(); + } + + public static GoodsConfig Fist(Predicate match) + { + return Context.Fist(match); + } + + public static GoodsConfig Last(Predicate match) + { + return Context.Last(match); + } + + public static int Count() + { + return Context.Count(); + } + + public static int Count(Func predicate) + { + return Context.Count(predicate); + } + + public static List GetList() + { + return Context.GetList(); + } + + public static List GetList(Predicate match) + { + return Context.GetList(match); + } + public static void ParseJson(Newtonsoft.Json.Linq.JArray arr) + { + ConfigTableHelper.ParseLine(arr); + } + #endregion + } +} \ No newline at end of file diff --git a/Assets/Scripts/Generate/Config/GoodsConfig.cs.meta b/Assets/Scripts/Generate/Config/GoodsConfig.cs.meta new file mode 100644 index 000000000..15ad623f6 --- /dev/null +++ b/Assets/Scripts/Generate/Config/GoodsConfig.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1db26de84347d9f46ad4b4f07775c91e \ No newline at end of file diff --git a/Assets/Scripts/Generate/NetworkProtocol/CommonProtoData.cs b/Assets/Scripts/Generate/NetworkProtocol/CommonProtoData.cs index 6ff09006c..8437e9463 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/CommonProtoData.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/CommonProtoData.cs @@ -257,6 +257,38 @@ namespace Fantasy public int Abrasion { get; set; } } /// + /// 商店物品信息 + /// + [ProtoContract] + public partial class ShopItemInfo : AMessage + { + public static ShopItemInfo Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + ConfigId = default; + Price = default; + Currency = default; + Sort = default; + Tag = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoMember(1)] + public uint ConfigId { get; set; } + [ProtoMember(2)] + public uint Price { get; set; } + [ProtoMember(3)] + public uint Currency { get; set; } + [ProtoMember(4)] + public uint Sort { get; set; } + [ProtoMember(5)] + public uint Tag { get; set; } + } + /// /// fish信息 /// [ProtoContract] diff --git a/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs b/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs index 73c75a3bb..140324f1e 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs @@ -383,6 +383,55 @@ namespace Fantasy /// /////////// ******** 商店 *******///////////// /// /// + /// 请求商店商品列表 + /// + [ProtoContract] + public partial class C2Game_GetShopItemsRequest : AMessage, ICustomRouteRequest + { + public static C2Game_GetShopItemsRequest Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Shop = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoIgnore] + public Game2C_GetShopItemsResponse ResponseType { get; set; } + public uint OpCode() { return OuterOpcode.C2Game_GetShopItemsRequest; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.GameRoute; + [ProtoMember(1)] + public uint Shop { get; set; } + } + /// + /// 请求商店商品列表响应 + /// + [ProtoContract] + public partial class Game2C_GetShopItemsResponse : AMessage, ICustomRouteResponse + { + public static Game2C_GetShopItemsResponse Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + ErrorCode = default; + Items.Clear(); +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Game2C_GetShopItemsResponse; } + [ProtoMember(1)] + public List Items = new List(); + [ProtoMember(2)] + public uint ErrorCode { get; set; } + } + /// /// 请求购买 /// [ProtoContract] @@ -394,6 +443,7 @@ namespace Fantasy } public override void Dispose() { + BuyId = default; #if FANTASY_NET || FANTASY_UNITY GetScene().MessagePoolComponent.Return(this); #endif @@ -403,6 +453,8 @@ namespace Fantasy public uint OpCode() { return OuterOpcode.C2Game_BuyRequest; } [ProtoIgnore] public int RouteType => Fantasy.RouteType.GameRoute; + [ProtoMember(1)] + public uint BuyId { get; set; } } /// /// 请求购买响应 @@ -417,16 +469,36 @@ namespace Fantasy public override void Dispose() { ErrorCode = default; - Awards.Clear(); #if FANTASY_NET || FANTASY_UNITY GetScene().MessagePoolComponent.Return(this); #endif } public uint OpCode() { return OuterOpcode.Game2C_BuyResponse; } [ProtoMember(1)] - public List Awards = new List(); - [ProtoMember(2)] public uint ErrorCode { get; set; } } + /// + /// 活动奖励推送 + /// + [ProtoContract] + public partial class Game2C_RewardNotify : AMessage, ICustomRouteMessage + { + public static Game2C_RewardNotify Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Awards.Clear(); +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Game2C_RewardNotify; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.GameRoute; + [ProtoMember(1)] + public List Awards = new List(); + } } diff --git a/Assets/Scripts/Generate/NetworkProtocol/NetworkProtocolHelper.cs b/Assets/Scripts/Generate/NetworkProtocol/NetworkProtocolHelper.cs index 2c6701737..3e95e96c3 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/NetworkProtocolHelper.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/NetworkProtocolHelper.cs @@ -126,6 +126,20 @@ namespace Fantasy return (Game2C_SellFishResponse)await session.Call(request); } + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static async FTask C2Game_GetShopItemsRequest(this Session session, C2Game_GetShopItemsRequest request) + { + return (Game2C_GetShopItemsResponse)await session.Call(request); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static async FTask C2Game_GetShopItemsRequest(this Session session, uint shop) + { + using var request = Fantasy.C2Game_GetShopItemsRequest.Create(session.Scene); + request.Shop = shop; + return (Game2C_GetShopItemsResponse)await session.Call(request); + } + [MethodImpl(MethodImplOptions.AggressiveInlining)] public static async FTask C2Game_BuyRequest(this Session session, C2Game_BuyRequest request) { @@ -133,12 +147,27 @@ namespace Fantasy } [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static async FTask C2Game_BuyRequest(this Session session) + public static async FTask C2Game_BuyRequest(this Session session, uint buyId) { using var request = Fantasy.C2Game_BuyRequest.Create(session.Scene); + request.BuyId = buyId; return (Game2C_GetFishsResponse)await session.Call(request); } + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void Game2C_RewardNotify(this Session session, Game2C_RewardNotify message) + { + session.Send(message); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void Game2C_RewardNotify(this Session session, List awards) + { + using var message = Fantasy.Game2C_RewardNotify.Create(session.Scene); + message.Awards = awards; + session.Send(message); + } + [MethodImpl(MethodImplOptions.AggressiveInlining)] public static async FTask C2Map_CreateRoomRequest(this Session session, C2Map_CreateRoomRequest request) { diff --git a/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs b/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs index b33d902dd..e4d8a731a 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs @@ -16,63 +16,66 @@ namespace Fantasy public const uint Game2C_FishChange = 2147493650; public const uint C2Game_SellFishRequest = 2281711382; public const uint Game2C_SellFishResponse = 2415929110; - public const uint C2Game_BuyRequest = 2281711383; - public const uint Game2C_BuyResponse = 2415929111; - public const uint C2Map_CreateRoomRequest = 2281711384; - public const uint Map2C_CreateRoomResponse = 2415929112; + public const uint C2Game_GetShopItemsRequest = 2281711383; + public const uint Game2C_GetShopItemsResponse = 2415929111; + public const uint C2Game_BuyRequest = 2281711384; + public const uint Game2C_BuyResponse = 2415929112; + public const uint Game2C_RewardNotify = 2147493651; + public const uint C2Map_CreateRoomRequest = 2281711385; + public const uint Map2C_CreateRoomResponse = 2415929113; public const uint C2G_ExitRoomRequest = 268445457; public const uint G2C_ExitRoomResponse = 402663185; public const uint C2G_EnterMapRequest = 268445458; public const uint G2C_EnterMapResponse = 402663186; - public const uint Map2C_ChangeMap = 2147493651; + public const uint Map2C_ChangeMap = 2147493652; public const uint C2A_LoginRequest = 268445459; public const uint A2C_LoginResponse = 402663187; public const uint C2G_LoginRequest = 268445460; public const uint G2C_LoginResponse = 402663188; public const uint G2C_RepeatLogin = 134227729; - public const uint C2Game_GetRoleInfoRequest = 2281711385; - public const uint Game2C_GetRoleInfoResponse = 2415929113; - public const uint Map2C_RoleEnterRoomNotify = 2147493652; - public const uint Map2C_RoleExitRoomNotify = 2147493653; - public const uint C2Map_RolePropertyChange = 2147493654; - public const uint Map2C_RoleStateNotify = 2147493655; - public const uint Map2C_RoleGearChangeNotify = 2147493656; - public const uint Map2C_RolePropertyChangeNotify = 2147493657; - public const uint C2Map_Move = 2147493658; - public const uint C2Map_Look = 2147493659; - public const uint Map2C_MoveNotify = 2147493660; - public const uint Map2C_LookeNotify = 2147493661; - public const uint C2S_GetConversationsRequest = 2281711386; - public const uint S2C_GetConversationsResponse = 2415929114; - public const uint C2S_SendMailRequest = 2281711387; - public const uint S2C_SendMailResponse = 2415929115; - public const uint C2S_DeleteMailRequest = 2281711388; - public const uint S2C_DeleteMailResponse = 2415929116; - public const uint S2C_HaveMail = 2147493662; - public const uint S2C_MailState = 2147493663; - public const uint C2S_CreateChannelRequest = 2281711389; - public const uint S2C_CreateChannelResponse = 2415929117; - public const uint C2S_JoinChannelRequest = 2281711390; - public const uint S2C_JoinChannelResponse = 2415929118; - public const uint C2S_SendMessageRequest = 2281711391; - public const uint S2C_SendMessageResponse = 2415929119; - public const uint S2C_Message = 2147493664; - public const uint C2S_CreateClubRequest = 2281711392; - public const uint S2C_CreateClubResponse = 2415929120; - public const uint C2S_GetClubInfoRequest = 2281711393; - public const uint S2C_GetClubInfoResponse = 2415929121; - public const uint C2S_GetMemberListRequest = 2281711394; - public const uint S2C_GetMemberListResponse = 2415929122; - public const uint C2S_GetClubListRequest = 2281711395; - public const uint S2C_GetClubListResponse = 2415929123; - public const uint C2S_JoinClubRequest = 2281711396; - public const uint S2C_JoinClubResponse = 2415929124; - public const uint C2S_LeaveClubRequest = 2281711397; - public const uint S2C_LeaveClubResponse = 2415929125; - public const uint C2S_DissolveClubRequest = 2281711398; - public const uint S2C_DissolveClubResponse = 2415929126; - public const uint C2S_DisposeJoinRequest = 2281711399; - public const uint S2C_DisposeJoinResponse = 2415929127; - public const uint S2C_ClubChange = 2147493665; + public const uint C2Game_GetRoleInfoRequest = 2281711386; + public const uint Game2C_GetRoleInfoResponse = 2415929114; + public const uint Map2C_RoleEnterRoomNotify = 2147493653; + public const uint Map2C_RoleExitRoomNotify = 2147493654; + public const uint C2Map_RolePropertyChange = 2147493655; + public const uint Map2C_RoleStateNotify = 2147493656; + public const uint Map2C_RoleGearChangeNotify = 2147493657; + public const uint Map2C_RolePropertyChangeNotify = 2147493658; + public const uint C2Map_Move = 2147493659; + public const uint C2Map_Look = 2147493660; + public const uint Map2C_MoveNotify = 2147493661; + public const uint Map2C_LookeNotify = 2147493662; + public const uint C2S_GetConversationsRequest = 2281711387; + public const uint S2C_GetConversationsResponse = 2415929115; + public const uint C2S_SendMailRequest = 2281711388; + public const uint S2C_SendMailResponse = 2415929116; + public const uint C2S_DeleteMailRequest = 2281711389; + public const uint S2C_DeleteMailResponse = 2415929117; + public const uint S2C_HaveMail = 2147493663; + public const uint S2C_MailState = 2147493664; + public const uint C2S_CreateChannelRequest = 2281711390; + public const uint S2C_CreateChannelResponse = 2415929118; + public const uint C2S_JoinChannelRequest = 2281711391; + public const uint S2C_JoinChannelResponse = 2415929119; + public const uint C2S_SendMessageRequest = 2281711392; + public const uint S2C_SendMessageResponse = 2415929120; + public const uint S2C_Message = 2147493665; + public const uint C2S_CreateClubRequest = 2281711393; + public const uint S2C_CreateClubResponse = 2415929121; + public const uint C2S_GetClubInfoRequest = 2281711394; + public const uint S2C_GetClubInfoResponse = 2415929122; + public const uint C2S_GetMemberListRequest = 2281711395; + public const uint S2C_GetMemberListResponse = 2415929123; + public const uint C2S_GetClubListRequest = 2281711396; + public const uint S2C_GetClubListResponse = 2415929124; + public const uint C2S_JoinClubRequest = 2281711397; + public const uint S2C_JoinClubResponse = 2415929125; + public const uint C2S_LeaveClubRequest = 2281711398; + public const uint S2C_LeaveClubResponse = 2415929126; + public const uint C2S_DissolveClubRequest = 2281711399; + public const uint S2C_DissolveClubResponse = 2415929127; + public const uint C2S_DisposeJoinRequest = 2281711400; + public const uint S2C_DisposeJoinResponse = 2415929128; + public const uint S2C_ClubChange = 2147493666; } } diff --git a/Assets/Scripts/Init.cs b/Assets/Scripts/Init.cs index db34f26b6..47927bd4b 100644 --- a/Assets/Scripts/Init.cs +++ b/Assets/Scripts/Init.cs @@ -96,6 +96,7 @@ namespace NBF private void AddUIPackages() { App.UI.AddPackage("Common/Common"); + App.UI.AddPackage("CommonNew/CommonNew"); App.UI.AddPackage("CommonFlag/CommonFlag"); App.UI.AddPackage("CommonIcon/CommonIcon"); } diff --git a/Assets/Scripts/UI/Binders/ShopBinder.cs b/Assets/Scripts/UI/Binders/ShopBinder.cs index fc81e673c..ff8548f0a 100644 --- a/Assets/Scripts/UI/Binders/ShopBinder.cs +++ b/Assets/Scripts/UI/Binders/ShopBinder.cs @@ -9,7 +9,7 @@ namespace NBF [UIExtensionAutoBind] public static void BindAll() { - UIObjectFactory.SetPackageItemExtension(ShopGearItem.URL, typeof(ShopGearItem)); + UIObjectFactory.SetPackageItemExtension(ShopItem.URL, typeof(ShopItem)); } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/List/ClassifyList.cs b/Assets/Scripts/UI/Common/List/ClassifyList.cs index a848e153e..0dd1a94ec 100644 --- a/Assets/Scripts/UI/Common/List/ClassifyList.cs +++ b/Assets/Scripts/UI/Common/List/ClassifyList.cs @@ -129,9 +129,9 @@ namespace NBF { var itemData = _listData[index]; - if (itemData is ShopGearData) + if (itemData is ShopItemInfo) { - return ShopGearItem.URL; + return ShopItem.URL; } if (itemData is ItemInfo itemInfo) diff --git a/Assets/Scripts/UI/Common2Binder.cs b/Assets/Scripts/UI/Common2Binder.cs new file mode 100644 index 000000000..1f278ac13 --- /dev/null +++ b/Assets/Scripts/UI/Common2Binder.cs @@ -0,0 +1,28 @@ +/**注册组件绑定关系。本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/ + +using FairyGUI; + +namespace NBF +{ + public static class Common2Binder + { + [UIExtensionAutoBind] + public static void BindAll() + { + UIObjectFactory.SetPackageItemExtension(SelectPages.URL, typeof(SelectPages)); + UIObjectFactory.SetPackageItemExtension(BottomMenu.URL, typeof(BottomMenu)); + UIObjectFactory.SetPackageItemExtension(CommonInput.URL, typeof(CommonInput)); + UIObjectFactory.SetPackageItemExtension(ClassifyList.URL, typeof(ClassifyList)); + UIObjectFactory.SetPackageItemExtension(CommonMenu.URL, typeof(CommonMenu)); + UIObjectFactory.SetPackageItemExtension(MarqueeTag.URL, typeof(MarqueeTag)); + UIObjectFactory.SetPackageItemExtension(BtnTextInputControl.URL, typeof(BtnTextInputControl)); + UIObjectFactory.SetPackageItemExtension(CommonItemList.URL, typeof(CommonItemList)); + UIObjectFactory.SetPackageItemExtension(BtnTitleInputControl.URL, typeof(BtnTitleInputControl)); + UIObjectFactory.SetPackageItemExtension(NoticeItem.URL, typeof(NoticeItem)); + UIObjectFactory.SetPackageItemExtension(CommonSubMenu.URL, typeof(CommonSubMenu)); + UIObjectFactory.SetPackageItemExtension(BtnInputControl.URL, typeof(BtnInputControl)); + UIObjectFactory.SetPackageItemExtension(ListTitleItem.URL, typeof(ListTitleItem)); + UIObjectFactory.SetPackageItemExtension(ModelViewer.URL, typeof(ModelViewer)); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Common2Binder.cs.meta b/Assets/Scripts/UI/Common2Binder.cs.meta new file mode 100644 index 000000000..e1d3d0064 --- /dev/null +++ b/Assets/Scripts/UI/Common2Binder.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1f891cc748e825346b263bab6ed92a69 \ No newline at end of file diff --git a/Assets/Scripts/UI/CommonNewBinder.cs b/Assets/Scripts/UI/CommonNewBinder.cs new file mode 100644 index 000000000..5c3adf9e0 --- /dev/null +++ b/Assets/Scripts/UI/CommonNewBinder.cs @@ -0,0 +1,14 @@ +/**注册组件绑定关系。本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/ + +using FairyGUI; + +namespace NBF +{ + public static class CommonNewBinder + { + [UIExtensionAutoBind] + public static void BindAll() + { + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/CommonNewBinder.cs.meta b/Assets/Scripts/UI/CommonNewBinder.cs.meta new file mode 100644 index 000000000..426dbcf62 --- /dev/null +++ b/Assets/Scripts/UI/CommonNewBinder.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d63faf326c6305c419050dd92f09a3ba \ No newline at end of file diff --git a/Assets/Scripts/UI/Login/LoginPanel.cs b/Assets/Scripts/UI/Login/LoginPanel.cs index 245de4389..6b4cc733a 100644 --- a/Assets/Scripts/UI/Login/LoginPanel.cs +++ b/Assets/Scripts/UI/Login/LoginPanel.cs @@ -30,9 +30,9 @@ namespace NBF { await LoginHelper.Login(InputAccount.text); - BagPanel.Show(); + // BagPanel.Show(); // BagSlotPanel.Show(); - // FishingShopPanel.Show(); + FishingShopPanel.Show(); Del(); } diff --git a/Assets/Scripts/UI/Shops/ShopGearItem.Designer.cs b/Assets/Scripts/UI/ShopGearItem.Designer.cs similarity index 100% rename from Assets/Scripts/UI/Shops/ShopGearItem.Designer.cs rename to Assets/Scripts/UI/ShopGearItem.Designer.cs diff --git a/Assets/Scripts/UI/ShopGearItem.Designer.cs.meta b/Assets/Scripts/UI/ShopGearItem.Designer.cs.meta new file mode 100644 index 000000000..635dca037 --- /dev/null +++ b/Assets/Scripts/UI/ShopGearItem.Designer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 92579122ea9d5304082e11a70b36b7e1 \ No newline at end of file diff --git a/Assets/Scripts/UI/ShopGearItem.cs b/Assets/Scripts/UI/ShopGearItem.cs new file mode 100644 index 000000000..68884d10d --- /dev/null +++ b/Assets/Scripts/UI/ShopGearItem.cs @@ -0,0 +1,15 @@ +// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖 + +using UnityEngine; +using FairyGUI; +using NBC; + +namespace NBF +{ + public partial class ShopGearItem : GButton + { + private void OnInited() + { + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/ShopGearItem.cs.meta b/Assets/Scripts/UI/ShopGearItem.cs.meta new file mode 100644 index 000000000..61664551b --- /dev/null +++ b/Assets/Scripts/UI/ShopGearItem.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d9f9ed6de5b3acd40916c6a8a0aa1b1b \ No newline at end of file diff --git a/Assets/Scripts/UI/Shops/FishingShopPanel.cs b/Assets/Scripts/UI/Shops/FishingShopPanel.cs index 26c54905e..c5d94429f 100644 --- a/Assets/Scripts/UI/Shops/FishingShopPanel.cs +++ b/Assets/Scripts/UI/Shops/FishingShopPanel.cs @@ -9,11 +9,6 @@ using UIPanel = NBC.UIPanel; namespace NBF { - public class ShopGearData - { - public string title; - } - public partial class FishingShopPanel : UIPanel { protected override void OnInit() @@ -22,33 +17,33 @@ namespace NBF this.AutoAddClick(OnClick); IsShowCursor = true; - List tabItemList = new List(); - for (int i = 0; i < 10; i++) - { - TabItemData tabItem = new TabItemData(); - tabItem.Key = $"Tab_{i}"; - for (int j = 0; j < 5; j++) - { - TabItemData tabSubItem = new TabItemData(); - tabSubItem.Key = $"SubTab_{j}"; - var count = Random.Range(2, 5); - for (int k = 0; k < count; k++) - { - var item = new ShopGearData - { - title = $"Item:{i}-{j}-{k}" - }; - tabSubItem.Items.Add(item); - } - - tabItem.Children.Add(tabSubItem); - } - - tabItemList.Add(tabItem); - } - - ItemList.SetPanel(this); - ItemList.SetData(tabItemList, true, true); + // List tabItemList = new List(); + // for (int i = 0; i < 10; i++) + // { + // TabItemData tabItem = new TabItemData(); + // tabItem.Key = $"Tab_{i}"; + // for (int j = 0; j < 5; j++) + // { + // TabItemData tabSubItem = new TabItemData(); + // tabSubItem.Key = $"SubTab_{j}"; + // var count = Random.Range(2, 5); + // for (int k = 0; k < count; k++) + // { + // var item = new ShopGearData + // { + // title = $"Item:{i}-{j}-{k}" + // }; + // tabSubItem.Items.Add(item); + // } + // + // tabItem.Children.Add(tabSubItem); + // } + // + // tabItemList.Add(tabItem); + // } + // + // ItemList.SetPanel(this); + // ItemList.SetData(tabItemList, true, true); } protected override void OnShow() @@ -65,8 +60,8 @@ namespace NBF private void OnClickItem(object item) { - if (item is not ShopGearItem shopGearItem) return; - Log.Info($"click item ={shopGearItem.GearData.title}"); + if (item is not ShopItem shopGearItem) return; + // Log.Info($"click item ={shopGearItem.GearData.title}"); } private void OnClick(GComponent btn) diff --git a/Assets/Scripts/UI/Shops/ShopItem.Designer.cs b/Assets/Scripts/UI/Shops/ShopItem.Designer.cs new file mode 100644 index 000000000..8f28ead4d --- /dev/null +++ b/Assets/Scripts/UI/Shops/ShopItem.Designer.cs @@ -0,0 +1,33 @@ +/**本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/ + + +using FairyGUI; +using FairyGUI.Utils; +using NBC; + +namespace NBF +{ + public partial class ShopItem + { + public const string URL = "ui://hxr7rc7poome9"; + + public GImage back; + public GImage Quality; + public GTextField TextCoin; + public GLoader CoinIcon; + public GTextField TextCoin_2; + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + back = (GImage)GetChild("back"); + Quality = (GImage)GetChild("Quality"); + TextCoin = (GTextField)GetChild("TextCoin"); + CoinIcon = (GLoader)GetChild("CoinIcon"); + TextCoin_2 = (GTextField)GetChild("TextCoin"); + OnInited(); + UILanguage.TrySetComponentLanguage(this); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Shops/ShopGearItem.Designer.cs.meta b/Assets/Scripts/UI/Shops/ShopItem.Designer.cs.meta similarity index 100% rename from Assets/Scripts/UI/Shops/ShopGearItem.Designer.cs.meta rename to Assets/Scripts/UI/Shops/ShopItem.Designer.cs.meta diff --git a/Assets/Scripts/UI/Shops/ShopGearItem.cs b/Assets/Scripts/UI/Shops/ShopItem.cs similarity index 59% rename from Assets/Scripts/UI/Shops/ShopGearItem.cs rename to Assets/Scripts/UI/Shops/ShopItem.cs index e5de871c7..7f5163553 100644 --- a/Assets/Scripts/UI/Shops/ShopGearItem.cs +++ b/Assets/Scripts/UI/Shops/ShopItem.cs @@ -6,18 +6,18 @@ using NBC; namespace NBF { - public partial class ShopGearItem : ListItemBase + public partial class ShopItem : ListItemBase { - public ShopGearData GearData; + // public ShopGearData GearData; private void OnInited() { } protected override void OnSetData(object showData) { - GearData = showData as ShopGearData; - if(GearData == null) return; - title = GearData.title; + // GearData = showData as ShopGearData; + // if(GearData == null) return; + // title = GearData.title; } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Shops/ShopGearItem.cs.meta b/Assets/Scripts/UI/Shops/ShopItem.cs.meta similarity index 100% rename from Assets/Scripts/UI/Shops/ShopGearItem.cs.meta rename to Assets/Scripts/UI/Shops/ShopItem.cs.meta diff --git a/FGUIProject/assets/Common/package.xml b/FGUIProject/assets/Common/package.xml index 0048a30dc..47214121d 100644 --- a/FGUIProject/assets/Common/package.xml +++ b/FGUIProject/assets/Common/package.xml @@ -44,8 +44,6 @@ - - diff --git a/FGUIProject/assets/CommonNew/Com/LoadingTag.xml b/FGUIProject/assets/CommonNew/Com/LoadingTag.xml new file mode 100644 index 000000000..914925555 --- /dev/null +++ b/FGUIProject/assets/CommonNew/Com/LoadingTag.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/FGUIProject/assets/Common/Images/Loading_1.png b/FGUIProject/assets/CommonNew/Images/Loading_1.png similarity index 100% rename from FGUIProject/assets/Common/Images/Loading_1.png rename to FGUIProject/assets/CommonNew/Images/Loading_1.png diff --git a/FGUIProject/assets/Common/Images/Loading_2.png b/FGUIProject/assets/CommonNew/Images/Loading_2.png similarity index 100% rename from FGUIProject/assets/Common/Images/Loading_2.png rename to FGUIProject/assets/CommonNew/Images/Loading_2.png diff --git a/FGUIProject/assets/CommonNew/package.xml b/FGUIProject/assets/CommonNew/package.xml new file mode 100644 index 000000000..dc38b2a0d --- /dev/null +++ b/FGUIProject/assets/CommonNew/package.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/FGUIProject/assets/Main/Shop/FishingShopPanel.xml b/FGUIProject/assets/Main/Shop/FishingShopPanel.xml index 66cf48c3d..5146263cc 100644 --- a/FGUIProject/assets/Main/Shop/FishingShopPanel.xml +++ b/FGUIProject/assets/Main/Shop/FishingShopPanel.xml @@ -13,5 +13,6 @@ + \ No newline at end of file diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 920c9d7e1..ffa4e242b 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -4,7 +4,7 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 1 + m_CurrentQuality: 2 m_QualitySettings: - serializedVersion: 5 name: Low