1
This commit is contained in:
@@ -947,6 +947,7 @@ MonoBehaviour:
|
||||
m_Markers:
|
||||
m_Objects:
|
||||
- {fileID: 1502395114745208191}
|
||||
- {fileID: 7963013957328152710}
|
||||
--- !u!114 &-2178049273803912431
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 1
|
||||
@@ -2732,25 +2733,7 @@ MonoBehaviour:
|
||||
m_BlendOutDuration: -1
|
||||
m_MixInCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_Curve: []
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
@@ -3302,25 +3285,7 @@ MonoBehaviour:
|
||||
m_RotationOrder: 4
|
||||
m_MixOutCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_Curve: []
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
@@ -3630,6 +3595,22 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 0}
|
||||
m_Name: ActivationPlayableAsset
|
||||
m_EditorClassIdentifier: Unity.Timeline:UnityEngine.Timeline:ActivationPlayableAsset
|
||||
--- !u!114 &7963013957328152710
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 1
|
||||
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: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
|
||||
m_Name: Signal Emitter
|
||||
m_EditorClassIdentifier:
|
||||
m_Time: 10.883333333333333
|
||||
m_Retroactive: 0
|
||||
m_EmitOnce: 0
|
||||
m_Asset: {fileID: 11400000, guid: 1508e534c5cd88d459d245dd3557a1c6, type: 2}
|
||||
--- !u!114 &8366673868339050521
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 1
|
||||
|
||||
@@ -0,0 +1,188 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &-6356002851461107523
|
||||
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: 7
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: 4052_01 1
|
||||
m_Shader: {fileID: 4800000, guid: 40d1d1bdf1ce4704bbd337945e74d2ff, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords:
|
||||
- _NORMALMAP
|
||||
m_InvalidKeywords:
|
||||
- _METALLICSPECGLOSSMAP
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _BaseMap:
|
||||
m_Texture: {fileID: 2800000, guid: d2105b46cdcc58141aa60d8e323141f9, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Base_Map:
|
||||
m_Texture: {fileID: 2800000, guid: e53d3449fce6e284ebc6ffabe633c893, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _BumpMap:
|
||||
m_Texture: {fileID: 2800000, guid: b1bce06a19d5e3e4cab61fe5ce3a87c4, type: 3}
|
||||
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}
|
||||
- _Emi_Map:
|
||||
m_Texture: {fileID: 2800000, guid: 11c7a79bd65ddf04cbda61e20cd0a682, type: 3}
|
||||
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}
|
||||
- _GradientMaskMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _HeightMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: e53d3449fce6e284ebc6ffabe633c893, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Mask_Map:
|
||||
m_Texture: {fileID: 2800000, guid: 67919cf743759b74dbf98b79658ca3a1, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
m_Texture: {fileID: 2800000, guid: e838962000d3d524596347621334ae5a, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Normal:
|
||||
m_Texture: {fileID: 2800000, guid: 400f5717fb05d6347b3741754979fd95, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Normal_Map:
|
||||
m_Texture: {fileID: 2800000, guid: 400f5717fb05d6347b3741754979fd95, type: 3}
|
||||
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}
|
||||
- _SSS_Map:
|
||||
m_Texture: {fileID: 2800000, guid: 241efeb7f48825645b329f3ca2619d53, type: 3}
|
||||
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}
|
||||
- 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:
|
||||
- _AlphaClip: 0
|
||||
- _AlphaToMask: 0
|
||||
- _Blend: 0
|
||||
- _BlendModePreserveSpecular: 1
|
||||
- _Brightness: 0.62
|
||||
- _BumpScale: 1
|
||||
- _ClearCoatMask: 0
|
||||
- _ClearCoatSmoothness: 0
|
||||
- _ClipOffset: 0
|
||||
- _Contrast: 1.66
|
||||
- _Cull: 2
|
||||
- _Cutoff: 0.5
|
||||
- _DetailAlbedoMapScale: 1
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
- _DstBlendAlpha: 0
|
||||
- _EnvironmentReflections: 1
|
||||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0.4472136
|
||||
- _GlossyReflections: 1
|
||||
- _GradientOffset: 0.35
|
||||
- _HightLight: 0
|
||||
- _Metal: 1.16
|
||||
- _Metallic: 0
|
||||
- _Mode: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _QueueControl: 0
|
||||
- _QueueOffset: 0
|
||||
- _ReceiveShadows: 1
|
||||
- _RimPower: 2.1
|
||||
- _Scale: 4.58
|
||||
- _Smoothness: 0.519
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecSize: 0.488
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _SrcBlendAlpha: 1
|
||||
- _StepEdge: 2
|
||||
- _Surface: 0
|
||||
- _UVSec: 0
|
||||
- _VertexOffsetIntensity: 44.6
|
||||
- _VertexOffsetNoise: 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}
|
||||
- _ColorBottom: {r: 0, g: 1, b: 0, a: 1}
|
||||
- _ColorTop: {r: 0, g: 1, b: 1, a: 1}
|
||||
- _Emi_Color: {r: 4.8671436, g: 4.8671436, b: 4.8671436, a: 0}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _HardRimColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SSS_Color: {r: 0.35835853, g: 0.3443396, b: 1, a: 0}
|
||||
- _SoftRimColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
- _Tint: {r: 1, g: 1, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 06514269e7d97d643945b1823d0c4b90
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,189 @@
|
||||
%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: 4052_02 1
|
||||
m_Shader: {fileID: 4800000, guid: 40d1d1bdf1ce4704bbd337945e74d2ff, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords:
|
||||
- _NORMALMAP
|
||||
m_InvalidKeywords:
|
||||
- _METALLICSPECGLOSSMAP
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _BaseMap:
|
||||
m_Texture: {fileID: 2800000, guid: 1437e85c1f64179458b4692d853fa843, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Base_Map:
|
||||
m_Texture: {fileID: 2800000, guid: 29b7a112a06eddb40ae0187f5bbc1c0c, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _BumpMap:
|
||||
m_Texture: {fileID: 2800000, guid: 2ab2646678349624c91c1faa6e13eb3c, type: 3}
|
||||
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}
|
||||
- _Emi_Map:
|
||||
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}
|
||||
- _GradientMaskMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _HeightMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 29b7a112a06eddb40ae0187f5bbc1c0c, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Mask_Map:
|
||||
m_Texture: {fileID: 2800000, guid: c0f9de1a9fc1eb74588464c1d41a2695, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
m_Texture: {fileID: 2800000, guid: c0f9de1a9fc1eb74588464c1d41a2695, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Normal:
|
||||
m_Texture: {fileID: 2800000, guid: 2ab2646678349624c91c1faa6e13eb3c, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Normal_Map:
|
||||
m_Texture: {fileID: 2800000, guid: 2ab2646678349624c91c1faa6e13eb3c, type: 3}
|
||||
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}
|
||||
- _SSS_Map:
|
||||
m_Texture: {fileID: 2800000, guid: f699776302610cb41b079e5aa5384700, type: 3}
|
||||
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}
|
||||
- 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:
|
||||
- _AlphaClip: 0
|
||||
- _AlphaToMask: 0
|
||||
- _Blend: 0
|
||||
- _BlendModePreserveSpecular: 1
|
||||
- _Brightness: 0.62
|
||||
- _BumpScale: 1
|
||||
- _ClearCoatMask: 0
|
||||
- _ClearCoatSmoothness: 0
|
||||
- _ClipOffset: 0
|
||||
- _Contrast: 3.67
|
||||
- _Cull: 2
|
||||
- _Cutoff: 0.5
|
||||
- _DetailAlbedoMapScale: 1
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
- _DstBlendAlpha: 0
|
||||
- _EnvironmentReflections: 1
|
||||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0.4472136
|
||||
- _GlossyReflections: 1
|
||||
- _GradientOffset: 0.35
|
||||
- _HightLight: 0.093
|
||||
- _Metal: 2
|
||||
- _Metallic: 0
|
||||
- _Mode: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _QueueControl: 0
|
||||
- _QueueOffset: 0
|
||||
- _ReceiveShadows: 1
|
||||
- _RimPower: 2.1
|
||||
- _Scale: 4.58
|
||||
- _Smoothness: 0.38
|
||||
- _SmoothnessDetail: 0.345
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecSize: 0.488
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _SrcBlendAlpha: 1
|
||||
- _StepEdge: 0.5
|
||||
- _Surface: 0
|
||||
- _UVSec: 0
|
||||
- _VertexOffsetIntensity: 44.6
|
||||
- _VertexOffsetNoise: 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}
|
||||
- _ColorBottom: {r: 0, g: 1, b: 0, a: 1}
|
||||
- _ColorTop: {r: 0, g: 1, b: 1, a: 1}
|
||||
- _Emi_Color: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _HardRimColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SSS_Color: {r: 1.7868379, g: 1.7868379, b: 1.7868379, a: 0}
|
||||
- _SoftRimColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
- _Tint: {r: 1, g: 1, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!114 &3507258755273110519
|
||||
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: 7
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e738622785c0a8e459f7b866626fc3e7
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,94 @@
|
||||
%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: cjb_136_Temp 1
|
||||
m_Shader: {fileID: 4800000, guid: 40d1d1bdf1ce4704bbd337945e74d2ff, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _GradientMaskMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _HeightMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 4e3df2bb4b5dd57488c1ddb9d7e8d479, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Normal:
|
||||
m_Texture: {fileID: 2800000, guid: cb9c2462d9a79b94d8dc335b21afdba8, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _faxian:
|
||||
m_Texture: {fileID: 2800000, guid: cb9c2462d9a79b94d8dc335b21afdba8, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _zhuse01:
|
||||
m_Texture: {fileID: 2800000, guid: 4e3df2bb4b5dd57488c1ddb9d7e8d479, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _zhuse02:
|
||||
m_Texture: {fileID: 2800000, guid: 4e3df2bb4b5dd57488c1ddb9d7e8d479, type: 3}
|
||||
m_Scale: {x: 0.074, y: 0.85}
|
||||
m_Offset: {x: 0, y: 0.12}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _Brightness: 0.62
|
||||
- _BumpScale: 1
|
||||
- _ClipOffset: 0
|
||||
- _Cutoff: 0.5
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0.5
|
||||
- _GlossyReflections: 1
|
||||
- _GradientOffset: 0.35
|
||||
- _Metallic: 0
|
||||
- _Mode: 0
|
||||
- _NormalStrength: 1
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _RimPower: 2.1
|
||||
- _Scale: 4.58
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecSize: 0.488
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _UVSec: 0
|
||||
- _VertexOffsetIntensity: 44.6
|
||||
- _VertexOffsetNoise: 0
|
||||
- _ZWrite: 1
|
||||
- _guang: -0.89
|
||||
- _node_1217: -0.73
|
||||
m_Colors:
|
||||
- _Color: {r: 0.43, g: 0.58, b: 0.3, a: 1}
|
||||
- _ColorBottom: {r: 0, g: 1, b: 0, a: 1}
|
||||
- _ColorTop: {r: 0, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _HardRimColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SoftRimColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _Tint: {r: 1, g: 1, b: 0, a: 1}
|
||||
- _node_9597: {r: 0.2607348, g: 0.4044118, b: 0.06839316, a: 1}
|
||||
- _secai: {r: 0.430065, g: 0.5808823, b: 0.3075259, a: 1}
|
||||
- _zhu_color: {r: 0.4313726, g: 0.5803922, b: 0.3058824, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 009086b9ca7c7ae4ab7edbb03352bc83
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,100 @@
|
||||
%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: cjb_144 2
|
||||
m_Shader: {fileID: 4800000, guid: 40d1d1bdf1ce4704bbd337945e74d2ff, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _GradientMaskMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _HeightMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: bc63cfadbbdb937438d2d575c0239b74, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Normal:
|
||||
m_Texture: {fileID: 2800000, guid: 12f3081d4c0584c43a018dbe461cd898, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _nmtex:
|
||||
m_Texture: {fileID: 2800000, guid: 12f3081d4c0584c43a018dbe461cd898, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _samplerCube:
|
||||
m_Texture: {fileID: 2700000, guid: 0000000deadbeef15deadf00d0000000, type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _zhu_tex:
|
||||
m_Texture: {fileID: 2800000, guid: bc63cfadbbdb937438d2d575c0239b74, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _Brightness: 0.62
|
||||
- _BumpScale: 1
|
||||
- _ClipOffset: 0
|
||||
- _Cutoff: 0.5
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0.5
|
||||
- _GlossyReflections: 1
|
||||
- _GradientOffset: 0.35
|
||||
- _Metallic: 0
|
||||
- _Mode: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _RimPower: 2.1
|
||||
- _Scale: 4.58
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecSize: 0.488
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _UVSec: 0
|
||||
- _VertexOffsetIntensity: 44.6
|
||||
- _VertexOffsetNoise: 0
|
||||
- _ZWrite: 1
|
||||
- _bian_01: 0.28
|
||||
- _bian_02: 0.1
|
||||
- _gls: 0.14
|
||||
- _guang: 1
|
||||
- _met: 0.027
|
||||
- _node_1083: 1.71
|
||||
- _node_6763: 0.711
|
||||
- _node_7607: -0.043
|
||||
- _zhu_01: 1
|
||||
m_Colors:
|
||||
- _1: {r: 0.5, g: 0.5, b: 0.5, a: 1}
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _ColorBottom: {r: 0, g: 1, b: 0, a: 1}
|
||||
- _ColorTop: {r: 0, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _HardRimColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SoftRimColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _Tint: {r: 1, g: 1, b: 0, a: 1}
|
||||
- _bian_cl: {r: 0.6, g: 0.7, b: 0.1617647, a: 1}
|
||||
- _node_5144: {r: 0.1137255, g: 0.1921569, b: 0.2705882, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ba0a7cb45026e8941b59ebeeaaa93835
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,160 @@
|
||||
// ============================================================
|
||||
// 文件：FishOutOfScreenDetector.cs
|
||||
// 职责：出界检测（第二层）——挂在比屏幕大一圈的大 Box2D 触发器上，
|
||||
// 统一收所有鱼的 OnTriggerEnter2D / OnTriggerExit2D，
|
||||
// 当一条"沿路线移动(isMove=true)"的鱼的所有碰撞器都离开触发区、
|
||||
// 且路线进度 > progressThreshold 时，静默回收这条鱼。
|
||||
//
|
||||
// 场景布置（两层）：
|
||||
// 第一层：贴屏幕四边的 4 个碰撞器 → 挡/反弹子弹（本脚本不管）
|
||||
// 第二层：比屏幕大一圈的一个 BoxCollider2D(IsTrigger=true) → 本脚本挂它上面
|
||||
//
|
||||
// 使用前提：
|
||||
// 1. 第二层触发器所在物体需要一个 Kinematic 或 Dynamic 的 Rigidbody2D，
|
||||
// 否则 Trigger 事件不会触发（Static 的 Rigidbody2D 不算）
|
||||
// 2. Physics2D 层碰撞矩阵里，第二层所在层必须与 Fish 层勾选
|
||||
// 3. 鱼身上的碰撞器 tag / layer 都是 Fish（可在 Inspector 里改过滤值）
|
||||
// ============================================================
|
||||
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
/// <summary>
|
||||
/// 出界检测：鱼离开"比屏幕大一圈"的触发器，且路线走过一半以上时，静默回收这条鱼。
|
||||
/// </summary>
|
||||
public class FishOutOfScreenDetector : MonoBehaviour
|
||||
{
|
||||
[Header("鱼碰撞器过滤")]
|
||||
[Tooltip("鱼的 tag，留空表示不按 tag 过滤")]
|
||||
public string fishTag = "Fish";
|
||||
[Tooltip("鱼所在的 layer 名，留空表示不按 layer 过滤")]
|
||||
public string fishLayer = "Fish";
|
||||
|
||||
[Header("出界判定")]
|
||||
[Tooltip("路线进度必须超过这个值才允许出界回收(0~1)。\n" +
|
||||
"防止出生点在屏外、正往屏内游的鱼被误删")]
|
||||
[Range(0f, 1f)]
|
||||
public float progressThreshold = 0.5f;
|
||||
|
||||
[Header("调试")]
|
||||
public bool enableLog = false;
|
||||
|
||||
/// <summary>鱼 → 当前仍在触发区内的碰撞器集合（一条鱼可能有多个碰撞器）</summary>
|
||||
private readonly Dictionary<MonsterContral, HashSet<Collider2D>> _tracked =
|
||||
new Dictionary<MonsterContral, HashSet<Collider2D>>();
|
||||
|
||||
/// <summary>碰撞器 → 所属鱼（Exit 时快速反查，避免再 GetComponentInParent）</summary>
|
||||
private readonly Dictionary<Collider2D, MonsterContral> _colliderOwner =
|
||||
new Dictionary<Collider2D, MonsterContral>();
|
||||
|
||||
private int _fishLayerId = -1;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
_fishLayerId = string.IsNullOrEmpty(fishLayer) ? -1 : LayerMask.NameToLayer(fishLayer);
|
||||
if (!string.IsNullOrEmpty(fishLayer) && _fishLayerId < 0)
|
||||
Debug.LogWarning($"[出界检测] 找不到 layer: {fishLayer}，请检查 Layer 配置");
|
||||
}
|
||||
|
||||
/// <summary>这个碰撞器是不是"要检测的鱼"（tag + layer 都符合才受理）</summary>
|
||||
private bool IsFishCollider(Collider2D col)
|
||||
{
|
||||
if (col == null) return false;
|
||||
// ⭐ 用字符串比较而不是 CompareTag：tag 未在 Tag Manager 里定义时 CompareTag 会抛异常
|
||||
if (!string.IsNullOrEmpty(fishTag) && col.gameObject.tag != fishTag) return false;
|
||||
if (_fishLayerId >= 0 && col.gameObject.layer != _fishLayerId) return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>进入触发区：登记这条鱼（开始出发时存起来）</summary>
|
||||
private void OnTriggerEnter2D(Collider2D other)
|
||||
{
|
||||
if (!IsFishCollider(other)) return;
|
||||
|
||||
// 鱼脚本挂在根节点，碰撞器可能是子物体 → 往上找
|
||||
var monster = other.GetComponentInParent<MonsterContral>();
|
||||
if (monster == null) return;
|
||||
// ⭐ 只处理沿路线移动的怪
|
||||
if (!monster.isMove) return;
|
||||
|
||||
// 同一个碰撞器重复进入（池复用/漏收 Exit）：先清掉旧登记再重新登记
|
||||
if (_colliderOwner.TryGetValue(other, out var oldOwner) && oldOwner != null)
|
||||
{
|
||||
if (_tracked.TryGetValue(oldOwner, out var oldSet)) oldSet.Remove(other);
|
||||
}
|
||||
_colliderOwner.Remove(other);
|
||||
|
||||
if (!_tracked.TryGetValue(monster, out var set))
|
||||
{
|
||||
set = new HashSet<Collider2D>();
|
||||
_tracked[monster] = set;
|
||||
}
|
||||
set.Add(other);
|
||||
_colliderOwner[other] = monster;
|
||||
|
||||
if (enableLog)
|
||||
Debug.Log($"[出界检测] 进入触发区 guid={monster.guid} collider={other.name} 该鱼碰撞器数={set.Count}");
|
||||
}
|
||||
|
||||
/// <summary>离开触发区：全部碰撞器都离开后，再按路线进度决定是否回收</summary>
|
||||
private void OnTriggerExit2D(Collider2D other)
|
||||
{
|
||||
if (other == null) return;
|
||||
// 没登记过的碰撞器（不是鱼/被过滤/没收到 Enter）：忽略
|
||||
if (!_colliderOwner.TryGetValue(other, out var monster)) return;
|
||||
|
||||
_colliderOwner.Remove(other);
|
||||
|
||||
if (monster == null || !_tracked.TryGetValue(monster, out var set)) return;
|
||||
set.Remove(other);
|
||||
|
||||
// ⭐ 这条鱼还有别的碰撞器贴着触发区 → 不回收，继续等
|
||||
if (set.Count > 0)
|
||||
{
|
||||
if (enableLog)
|
||||
Debug.Log($"[出界检测] 离开触发区 guid={monster.guid} collider={other.name} 剩余碰撞器={set.Count}");
|
||||
return;
|
||||
}
|
||||
|
||||
// 所有碰撞器都离开了 → 先把这条鱼从列表里删掉
|
||||
_tracked.Remove(monster);
|
||||
|
||||
TryRecycle(monster);
|
||||
}
|
||||
|
||||
/// <summary>所有碰撞器都出界后：路线进度超过阈值才回收</summary>
|
||||
private void TryRecycle(MonsterContral monster)
|
||||
{
|
||||
if (monster == null || monster.gameObject == null) return;
|
||||
// 已被击杀/回池（池对象会失活）→ 不做
|
||||
if (!monster.gameObject.activeInHierarchy) return;
|
||||
if (!monster.isMove) return;
|
||||
|
||||
var line = monster.monsterData != null ? monster.monsterData.moveLine : null;
|
||||
if (line == null || line.moveTime <= 0f) return; // 没有路线时长的（非路线鱼）不处理
|
||||
|
||||
float progress = monster.moveTime / line.moveTime;
|
||||
if (progress <= progressThreshold)
|
||||
{
|
||||
if (enableLog)
|
||||
Debug.Log($"[出界检测] 已出界但进度不足({progress:F2} <= {progressThreshold:F2})，只清列表不回收 guid={monster.guid}");
|
||||
return;
|
||||
}
|
||||
|
||||
var mgr = CreateFishManager.Instance;
|
||||
if (mgr == null || mgr.fishDatas_hashCodekey == null) return;
|
||||
// 已经不在鱼列表里（被击杀/已回收）→ 不做，避免刷 NOT_FOUND
|
||||
if (!mgr.fishDatas_hashCodekey.ContainsKey(monster.guid))
|
||||
{
|
||||
if (enableLog)
|
||||
Debug.Log($"[出界检测] 出界但已不在鱼列表(可能已被击杀) guid={monster.guid}");
|
||||
return;
|
||||
}
|
||||
|
||||
if (enableLog)
|
||||
Debug.Log($"[出界检测] 出界回收 guid={monster.guid} 进度={progress:F2} 位置={monster.transform.position}");
|
||||
|
||||
// 静默回收：无死亡粒子/无金币特效，直接从鱼列表移除并回池
|
||||
mgr.Id_DieFish_NotFX(monster.guid);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ccd5485cb78bc22459d6860f93b0c2ec
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -12272,7 +12272,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8713415552060225148, guid: 1bcb895f3655d5548a9ffb4474b98605,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8713415552060225148, guid: 1bcb895f3655d5548a9ffb4474b98605,
|
||||
type: 3}
|
||||
|
||||
@@ -0,0 +1,133 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &-7740761104824829334
|
||||
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: 7
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: New Material
|
||||
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap:
|
||||
RenderType: Opaque
|
||||
disabledShaderPasses: []
|
||||
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}
|
||||
- _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}
|
||||
- _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}
|
||||
- _MetallicGlossMap:
|
||||
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}
|
||||
- _SpecGlossMap:
|
||||
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:
|
||||
- _AlphaClip: 0
|
||||
- _AlphaToMask: 0
|
||||
- _Blend: 0
|
||||
- _BlendModePreserveSpecular: 1
|
||||
- _BumpScale: 1
|
||||
- _ClearCoatMask: 0
|
||||
- _ClearCoatSmoothness: 0
|
||||
- _Cull: 2
|
||||
- _Cutoff: 0.5
|
||||
- _DetailAlbedoMapScale: 1
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
- _DstBlendAlpha: 0
|
||||
- _EnvironmentReflections: 1
|
||||
- _GlossMapScale: 0
|
||||
- _Glossiness: 0
|
||||
- _GlossyReflections: 0
|
||||
- _Metallic: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.005
|
||||
- _QueueOffset: 0
|
||||
- _ReceiveShadows: 1
|
||||
- _Smoothness: 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}
|
||||
m_BuildTextureStacks: []
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f0630226b7543554cb753e80c8f79084
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -108,15 +108,28 @@ public class RankLineItem : MonoBehaviour
|
||||
int count = gift.isRandom ? gift.minCount : gift.count;
|
||||
var data = new BackPackPropItemData { count = count, giftType = gift.type };
|
||||
|
||||
// 道具(type==3)才需要查道具表拿图标与子类型；金币/钻石用本地 sprite
|
||||
if (gift.type == 3 && !string.IsNullOrEmpty(gift.otherId))
|
||||
// 服务端排行奖励items实际下发type=0（非约定值3），只要带otherId就按道具处理；金币(1)/钻石(2)用本地sprite
|
||||
bool isProp = gift.type != 1 && gift.type != 2 && !string.IsNullOrEmpty(gift.otherId);
|
||||
if (isProp)
|
||||
{
|
||||
data.giftType = 3;
|
||||
|
||||
// 图标来源优先级：本地道具表propConfig → 后端下发的product → 固定结构/uploads/编号.png兜底
|
||||
var match = GameManager.Instance?.gameConfig?.propConfig?.Find(p => p.number == gift.otherId);
|
||||
if (match != null)
|
||||
if (match != null && !string.IsNullOrEmpty(match.imageUrl))
|
||||
{
|
||||
data.url = APIManager.baseURL + match.imageUrl;
|
||||
data.propEnum = (PropEnum)match.type;
|
||||
}
|
||||
else if (gift.product != null && !string.IsNullOrEmpty(gift.product.imageUrl))
|
||||
{
|
||||
data.url = APIManager.baseURL + gift.product.imageUrl;
|
||||
data.propEnum = (PropEnum)gift.product.type;
|
||||
}
|
||||
else
|
||||
{
|
||||
data.url = APIManager.baseURL + "/uploads/" + gift.otherId + ".png";
|
||||
}
|
||||
}
|
||||
|
||||
GameObject obj = Instantiate(backPackPropItemPrefab.gameObject, backPackPropItemRarent);
|
||||
|
||||
@@ -1287,8 +1287,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 345.31, y: 4.0001}
|
||||
m_SizeDelta: {x: 260.38, y: 100}
|
||||
m_AnchoredPosition: {x: 329.91388, y: 4.0001}
|
||||
m_SizeDelta: {x: 291.1723, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &6574031337005296295
|
||||
MonoBehaviour:
|
||||
@@ -2457,7 +2457,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 53.75006, y: 9.294495}
|
||||
m_AnchoredPosition: {x: 53.75006, y: -87}
|
||||
m_SizeDelta: {x: 951, y: 94}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8650438328523187941
|
||||
@@ -3895,7 +3895,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 217, y: 11}
|
||||
m_AnchoredPosition: {x: 217, y: 22}
|
||||
m_SizeDelta: {x: 90, y: 90}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4058723255558925021
|
||||
@@ -4701,8 +4701,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 345.31, y: 4.0001}
|
||||
m_SizeDelta: {x: 260.38, y: 100}
|
||||
m_AnchoredPosition: {x: 329.91388, y: 4.0001}
|
||||
m_SizeDelta: {x: 291.1723, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &5683221018590234893
|
||||
MonoBehaviour:
|
||||
|
||||
@@ -175,14 +175,22 @@ public class UIHome_BY_RankPanel : SubUIBase
|
||||
return gold.ToString("N0");
|
||||
}
|
||||
|
||||
/// <summary>根据排行类型和排名查找奖励道具</summary>
|
||||
/// <summary>根据排行类型和排名查找奖励道具（服务端gold/diamond在奖励层级而非items里，合成type=1/2条目与items合并显示）</summary>
|
||||
private List<GiftConfig> GetRankRewards(int rank)
|
||||
{
|
||||
if (_rankingRewardConfig == null || !_rankingRewardConfig.isEnabled) return null;
|
||||
var group = _rankingRewardConfig.groups?.Find(g => g.rankingType == _currentRankType);
|
||||
if (group?.rewards == null) return null;
|
||||
var match = group.rewards.Find(r => rank >= r.rankMin && rank <= r.rankMax);
|
||||
return match?.items;
|
||||
if (match == null) return null;
|
||||
|
||||
var list = new List<GiftConfig>();
|
||||
if (match.gold > 0)
|
||||
list.Add(new GiftConfig { type = 1, isRandom = false, count = (int)match.gold });
|
||||
if (match.diamond > 0)
|
||||
list.Add(new GiftConfig { type = 2, isRandom = false, count = match.diamond });
|
||||
if (match.items != null) list.AddRange(match.items);
|
||||
return list.Count > 0 ? list : null;
|
||||
}
|
||||
|
||||
private void ClearRankList()
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 854 KiB |
@@ -0,0 +1,153 @@
|
||||
fileFormatVersion: 2
|
||||
guid: acbc4a95fb78e1c4899a123c50c543bb
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
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: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
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: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
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: 3
|
||||
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
|
||||
- serializedVersion: 3
|
||||
buildTarget: iPhone
|
||||
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: 3
|
||||
buildTarget: WebGL
|
||||
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: 3
|
||||
buildTarget: Android
|
||||
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: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -24,7 +24,7 @@ Material:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 9a2580af97c700b4aa5d000cd64dc98b, type: 3}
|
||||
m_Texture: {fileID: 2800000, guid: 1c8844eb8ed78f24b966cc583ddd425d, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
|
||||
Reference in New Issue
Block a user