diff --git a/UnityProject/Assets/AssetRaw/Materials/JDT9.mat b/UnityProject/Assets/AssetRaw/Materials/JDT9.mat index 5c414738..6e871695 100644 --- a/UnityProject/Assets/AssetRaw/Materials/JDT9.mat +++ b/UnityProject/Assets/AssetRaw/Materials/JDT9.mat @@ -11,7 +11,8 @@ Material: m_Shader: {fileID: 4800000, guid: 8051d8a533a10b541a591e43ef313e96, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _USEONEEM_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -191,7 +192,7 @@ Material: - _UseEmTex_R_A: 0 - _UseMainTex_RGB_A: 0 - _UseMainTex_Ramp_RGB_A: 0 - - _UseOneEM: 0 + - _UseOneEM: 1 - _UseOneNoise: 0 - _UseTur_Mask: 0 - _Use_Flash: 0 diff --git a/UnityProject/Assets/AssetRaw/Materials/gift2_Left.mat.meta b/UnityProject/Assets/AssetRaw/Materials/gift2_Left.mat.meta index 42ae2943..1260ef4c 100644 --- a/UnityProject/Assets/AssetRaw/Materials/gift2_Left.mat.meta +++ b/UnityProject/Assets/AssetRaw/Materials/gift2_Left.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: da3e314ce4d057d4caf1845c582ea0a7 -timeCreated: 1446473620 -licenseType: Store +guid: 3e155059e7e45704fb311a6310cc872f NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/UnityProject/Assets/AssetRaw/Materials/gift3_Left.mat b/UnityProject/Assets/AssetRaw/Materials/gift3_Left.mat index fd943a43..737847fd 100644 --- a/UnityProject/Assets/AssetRaw/Materials/gift3_Left.mat +++ b/UnityProject/Assets/AssetRaw/Materials/gift3_Left.mat @@ -49,7 +49,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 47e7c507a2cbb2e4691f1ead3cddeae9, type: 3} + m_Texture: {fileID: 2800000, guid: 496dd1513d4f4194dbb67cd29868e404, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Main_tex_ramp: @@ -57,7 +57,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Mask_tex: - m_Texture: {fileID: 2800000, guid: 47e7c507a2cbb2e4691f1ead3cddeae9, type: 3} + m_Texture: {fileID: 2800000, guid: 496dd1513d4f4194dbb67cd29868e404, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SG_TEX: @@ -65,7 +65,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SaoGuang_EM: - m_Texture: {fileID: 2800000, guid: 47e7c507a2cbb2e4691f1ead3cddeae9, type: 3} + m_Texture: {fileID: 2800000, guid: 496dd1513d4f4194dbb67cd29868e404, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _TUR_Tex: @@ -146,7 +146,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - - _Base_Color: {r: 1, g: 1, b: 1, a: 0} + - _Base_Color: {r: 1, g: 1, b: 1, a: 1} - _Base_SV: {r: 1, g: 1, b: 0, a: 0} - _CameraFadeParams: {r: 1, g: 0.5, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/UnityProject/Assets/AssetRaw/Materials/gift3_Left.mat.meta b/UnityProject/Assets/AssetRaw/Materials/gift3_Left.mat.meta index af78928d..3cf0d0b1 100644 --- a/UnityProject/Assets/AssetRaw/Materials/gift3_Left.mat.meta +++ b/UnityProject/Assets/AssetRaw/Materials/gift3_Left.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 24d66c9f77cf1e04d94d29e8ba3372ac +guid: 7e81975c1577c3540b8c0ed1351ae931 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/UnityProject/Assets/AssetRaw/Materials/gift4_Left.mat b/UnityProject/Assets/AssetRaw/Materials/gift4_Left.mat index e593a697..3fd7f49f 100644 --- a/UnityProject/Assets/AssetRaw/Materials/gift4_Left.mat +++ b/UnityProject/Assets/AssetRaw/Materials/gift4_Left.mat @@ -49,7 +49,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 0bf3042da7a1e5b46b7defb3d4748b2a, type: 3} + m_Texture: {fileID: 2800000, guid: 496dd1513d4f4194dbb67cd29868e404, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Main_tex_ramp: @@ -57,7 +57,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Mask_tex: - m_Texture: {fileID: 2800000, guid: 0bf3042da7a1e5b46b7defb3d4748b2a, type: 3} + m_Texture: {fileID: 2800000, guid: 496dd1513d4f4194dbb67cd29868e404, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SG_TEX: @@ -65,7 +65,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SaoGuang_EM: - m_Texture: {fileID: 2800000, guid: 0bf3042da7a1e5b46b7defb3d4748b2a, type: 3} + m_Texture: {fileID: 2800000, guid: 496dd1513d4f4194dbb67cd29868e404, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _TUR_Tex: @@ -125,8 +125,8 @@ Material: - _Mode: 2 - _QueueControl: 0 - _QueueOffset: 0 - - _SG_Power: 3 - - _SG_Rotation: 0.65 + - _SG_Power: 10 + - _SG_Rotation: 0.23 - _Saturation: 1 - _SoftParticlesEnabled: 0 - _SoftParticlesFarFadeDistance: 1 @@ -146,7 +146,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - - _Base_Color: {r: 1, g: 1, b: 1, a: 0} + - _Base_Color: {r: 1, g: 1, b: 1, a: 1} - _Base_SV: {r: 1, g: 1, b: 0, a: 0} - _CameraFadeParams: {r: 1, g: 0.5, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/UnityProject/Assets/AssetRaw/Materials/gift4_Left.mat.meta b/UnityProject/Assets/AssetRaw/Materials/gift4_Left.mat.meta index 26ef68c3..42ae2943 100644 --- a/UnityProject/Assets/AssetRaw/Materials/gift4_Left.mat.meta +++ b/UnityProject/Assets/AssetRaw/Materials/gift4_Left.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 28a0f52d4f18c9c49a623633bbbc42c5 +guid: da3e314ce4d057d4caf1845c582ea0a7 +timeCreated: 1446473620 +licenseType: Store NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/UnityProject/Assets/AssetRaw/Materials/gift5_Left.mat b/UnityProject/Assets/AssetRaw/Materials/gift5_Left.mat index dba8af6b..5ff8fcac 100644 --- a/UnityProject/Assets/AssetRaw/Materials/gift5_Left.mat +++ b/UnityProject/Assets/AssetRaw/Materials/gift5_Left.mat @@ -49,7 +49,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 3727f71afb94c7445a323b02469867a8, type: 3} + m_Texture: {fileID: 2800000, guid: 47e7c507a2cbb2e4691f1ead3cddeae9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Main_tex_ramp: @@ -57,7 +57,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Mask_tex: - m_Texture: {fileID: 2800000, guid: 3727f71afb94c7445a323b02469867a8, type: 3} + m_Texture: {fileID: 2800000, guid: 47e7c507a2cbb2e4691f1ead3cddeae9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SG_TEX: @@ -65,7 +65,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SaoGuang_EM: - m_Texture: {fileID: 2800000, guid: 3727f71afb94c7445a323b02469867a8, type: 3} + m_Texture: {fileID: 2800000, guid: 47e7c507a2cbb2e4691f1ead3cddeae9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _TUR_Tex: @@ -125,8 +125,8 @@ Material: - _Mode: 2 - _QueueControl: 0 - _QueueOffset: 0 - - _SG_Power: 3 - - _SG_Rotation: 0.65 + - _SG_Power: 10 + - _SG_Rotation: 0.23 - _Saturation: 1 - _SoftParticlesEnabled: 0 - _SoftParticlesFarFadeDistance: 1 diff --git a/UnityProject/Assets/AssetRaw/Materials/gift6_Left.mat b/UnityProject/Assets/AssetRaw/Materials/gift6_Left.mat index f1c5c27d..4c5d3df3 100644 --- a/UnityProject/Assets/AssetRaw/Materials/gift6_Left.mat +++ b/UnityProject/Assets/AssetRaw/Materials/gift6_Left.mat @@ -49,7 +49,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 6f19048e8088f6442bd9fc34e6574553, type: 3} + m_Texture: {fileID: 2800000, guid: 0bf3042da7a1e5b46b7defb3d4748b2a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Main_tex_ramp: @@ -57,7 +57,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Mask_tex: - m_Texture: {fileID: 2800000, guid: 6f19048e8088f6442bd9fc34e6574553, type: 3} + m_Texture: {fileID: 2800000, guid: 0bf3042da7a1e5b46b7defb3d4748b2a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SG_TEX: @@ -65,7 +65,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SaoGuang_EM: - m_Texture: {fileID: 2800000, guid: 6f19048e8088f6442bd9fc34e6574553, type: 3} + m_Texture: {fileID: 2800000, guid: 0bf3042da7a1e5b46b7defb3d4748b2a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _TUR_Tex: diff --git a/UnityProject/Assets/AssetRaw/Materials/gift7_Left.mat b/UnityProject/Assets/AssetRaw/Materials/gift7_Left.mat index 2f1fdde7..f045425e 100644 --- a/UnityProject/Assets/AssetRaw/Materials/gift7_Left.mat +++ b/UnityProject/Assets/AssetRaw/Materials/gift7_Left.mat @@ -49,7 +49,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: b5ecb746406d3fb4cac4eb3e0b3d9cbc, type: 3} + m_Texture: {fileID: 2800000, guid: 3727f71afb94c7445a323b02469867a8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Main_tex_ramp: @@ -57,7 +57,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Mask_tex: - m_Texture: {fileID: 2800000, guid: b5ecb746406d3fb4cac4eb3e0b3d9cbc, type: 3} + m_Texture: {fileID: 2800000, guid: 3727f71afb94c7445a323b02469867a8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SG_TEX: @@ -65,7 +65,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SaoGuang_EM: - m_Texture: {fileID: 2800000, guid: b5ecb746406d3fb4cac4eb3e0b3d9cbc, type: 3} + m_Texture: {fileID: 2800000, guid: 3727f71afb94c7445a323b02469867a8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _TUR_Tex: @@ -125,7 +125,7 @@ Material: - _Mode: 2 - _QueueControl: 0 - _QueueOffset: 0 - - _SG_Power: 2 + - _SG_Power: 3 - _SG_Rotation: 0.65 - _Saturation: 1 - _SoftParticlesEnabled: 0 diff --git a/UnityProject/Assets/AssetRaw/Materials/gift8_Left.mat b/UnityProject/Assets/AssetRaw/Materials/gift8_Left.mat new file mode 100644 index 00000000..216beefa --- /dev/null +++ b/UnityProject/Assets/AssetRaw/Materials/gift8_Left.mat @@ -0,0 +1,178 @@ +%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: gift8_Left + m_Shader: {fileID: -6465566751694194690, guid: a820fcb5cf012694580d2c8fbe33c5f9, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 0 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - ALWAYS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 883b00317016df94f8308083d83bfa50, type: 3} + 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} + - _EM_Mask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EM_tex: + 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} + - _Flash_EMTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 6f19048e8088f6442bd9fc34e6574553, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Main_tex_ramp: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Mask_tex: + m_Texture: {fileID: 2800000, guid: 6f19048e8088f6442bd9fc34e6574553, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SG_TEX: + m_Texture: {fileID: 2800000, guid: 870639921e73c7944a8fbdafd750c759, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SaoGuang_EM: + m_Texture: {fileID: 2800000, guid: 6f19048e8088f6442bd9fc34e6574553, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TUR_Tex: + 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 + - _Alpha_Int: 3 + - _Base_tex_rotation: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 1 + - _CameraFarFadeDistance: 3 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Contrast: 1 + - _Cull: 0 + - _Cutoff: 0.5 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0 + - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EM_Tex_rotation: 0 + - _EM_U_Offset: 0 + - _EM_V_Offset: 0 + - _EmissionEnabled: 0 + - _Flash_Speed: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _Hue: 0 + - _InvFade: 1 + - _LightingEnabled: 0 + - _MaskTex_Roation: 0 + - _Mask_Edge_power: 0 + - _Mask_Intensity: 1 + - _Mask_Power: 1 + - _Mask_R: 0 + - _Mask_ramp_intensity: 3 + - _Mode: 2 + - _QueueControl: 0 + - _QueueOffset: 0 + - _SG_Power: 3 + - _SG_Rotation: 0.65 + - _Saturation: 1 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 + - _Surface: 1 + - _TUR_intensity: 0.2 + - _TUR_maintex: 0 + - _UseEM_Polar: 0 + - _UseEmTex_R_A: 0 + - _UseMainTex_RGB_A: 0 + - _UseMainTex_Ramp_RGB_A: 0 + - _UseTur_Mask: 0 + - _Use_Flash: 0 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _Base_Color: {r: 1, g: 1, b: 1, a: 0} + - _Base_SV: {r: 1, g: 1, b: 0, a: 0} + - _CameraFadeParams: {r: 1, g: 0.5, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _EM_SV: {r: 1, g: 1, b: 0, a: 0} + - _EM_Tex_color: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FinalColor: {r: 1, g: 1, b: 1, a: 0} + - _Flash_Color: {r: 0, g: 0, b: 0, a: 1} + - _SG_Color: {r: 5.3403134, g: 0.6247157, b: 3.0881546, a: 1} + - _SG_SV: {r: 1, g: 1, b: 0.5, a: 0} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _TUR_SV: {r: 1, g: 1, b: 0, a: 0} + - _T_O: {r: 1, g: 1, b: 0, a: 0} + - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] +--- !u!114 &8587976883371876064 +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 diff --git a/UnityProject/Assets/AssetRaw/Materials/gift8_Left.mat.meta b/UnityProject/Assets/AssetRaw/Materials/gift8_Left.mat.meta new file mode 100644 index 00000000..59165f61 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/Materials/gift8_Left.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d5ce8a7e91868c64ab04129967c81186 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/AssetRaw/Materials/gift9_Left.mat b/UnityProject/Assets/AssetRaw/Materials/gift9_Left.mat new file mode 100644 index 00000000..afd43df6 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/Materials/gift9_Left.mat @@ -0,0 +1,178 @@ +%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: gift9_Left + m_Shader: {fileID: -6465566751694194690, guid: a820fcb5cf012694580d2c8fbe33c5f9, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 0 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - ALWAYS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 883b00317016df94f8308083d83bfa50, type: 3} + 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} + - _EM_Mask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EM_tex: + 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} + - _Flash_EMTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: b5ecb746406d3fb4cac4eb3e0b3d9cbc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Main_tex_ramp: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Mask_tex: + m_Texture: {fileID: 2800000, guid: b5ecb746406d3fb4cac4eb3e0b3d9cbc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SG_TEX: + m_Texture: {fileID: 2800000, guid: 870639921e73c7944a8fbdafd750c759, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SaoGuang_EM: + m_Texture: {fileID: 2800000, guid: b5ecb746406d3fb4cac4eb3e0b3d9cbc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TUR_Tex: + 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 + - _Alpha_Int: 3 + - _Base_tex_rotation: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 1 + - _CameraFarFadeDistance: 3 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Contrast: 1 + - _Cull: 0 + - _Cutoff: 0.5 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0 + - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EM_Tex_rotation: 0 + - _EM_U_Offset: 0 + - _EM_V_Offset: 0 + - _EmissionEnabled: 0 + - _Flash_Speed: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _Hue: 0 + - _InvFade: 1 + - _LightingEnabled: 0 + - _MaskTex_Roation: 0 + - _Mask_Edge_power: 0 + - _Mask_Intensity: 1 + - _Mask_Power: 1 + - _Mask_R: 0 + - _Mask_ramp_intensity: 3 + - _Mode: 2 + - _QueueControl: 0 + - _QueueOffset: 0 + - _SG_Power: 2 + - _SG_Rotation: 0.65 + - _Saturation: 1 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 + - _Surface: 1 + - _TUR_intensity: 0.2 + - _TUR_maintex: 0 + - _UseEM_Polar: 0 + - _UseEmTex_R_A: 0 + - _UseMainTex_RGB_A: 0 + - _UseMainTex_Ramp_RGB_A: 0 + - _UseTur_Mask: 0 + - _Use_Flash: 0 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _Base_Color: {r: 1, g: 1, b: 1, a: 0} + - _Base_SV: {r: 1, g: 1, b: 0, a: 0} + - _CameraFadeParams: {r: 1, g: 0.5, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _EM_SV: {r: 1, g: 1, b: 0, a: 0} + - _EM_Tex_color: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FinalColor: {r: 1, g: 1, b: 1, a: 0} + - _Flash_Color: {r: 0, g: 0, b: 0, a: 1} + - _SG_Color: {r: 5.3403134, g: 0.6247157, b: 3.0881546, a: 1} + - _SG_SV: {r: 1, g: 1, b: 0.5, a: 0} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _TUR_SV: {r: 1, g: 1, b: 0, a: 0} + - _T_O: {r: 1, g: 1, b: 0, a: 0} + - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] +--- !u!114 &8587976883371876064 +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 diff --git a/UnityProject/Assets/AssetRaw/Materials/gift9_Left.mat.meta b/UnityProject/Assets/AssetRaw/Materials/gift9_Left.mat.meta new file mode 100644 index 00000000..8a89c9fc --- /dev/null +++ b/UnityProject/Assets/AssetRaw/Materials/gift9_Left.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7c39410a2bb50dd4fae1fc65630602ee +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_1.webm b/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_1.webm deleted file mode 100644 index de1bd47d..00000000 Binary files a/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_1.webm and /dev/null differ diff --git a/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_2.webm b/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_2.webm index aba9eee4..de1bd47d 100644 Binary files a/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_2.webm and b/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_2.webm differ diff --git a/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_3.webm b/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_3.webm index aa2bb26d..aba9eee4 100644 Binary files a/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_3.webm and b/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_3.webm differ diff --git a/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_4.webm b/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_4.webm index 3e9ae819..aa2bb26d 100644 Binary files a/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_4.webm and b/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_4.webm differ diff --git a/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_4.webm.meta b/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_4.webm.meta index 6780008b..b39b05a0 100644 --- a/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_4.webm.meta +++ b/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_4.webm.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: afec8a41b867c264db906a93ea6733cf +guid: fca3305b763277349bdb89eb5158da0e VideoClipImporter: externalObjects: {} serializedVersion: 2 diff --git a/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_5.webm b/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_5.webm new file mode 100644 index 00000000..3e9ae819 Binary files /dev/null and b/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_5.webm differ diff --git a/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_1.webm.meta b/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_5.webm.meta similarity index 88% rename from UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_1.webm.meta rename to UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_5.webm.meta index 1c2ac330..6780008b 100644 --- a/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_1.webm.meta +++ b/UnityProject/Assets/AssetRaw/Video/SceneVideo/Scene_5.webm.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 482a5648acd12804cb1e37c8b744f298 +guid: afec8a41b867c264db906a93ea6733cf VideoClipImporter: externalObjects: {} serializedVersion: 2 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index 6dbf6ea5..b988d17a 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -169,10 +169,61 @@ namespace GameLogic int teamId = DataGameSceneManager.Instance.m_TeamId; - // 先播放视频 - string videoName = "Scene_" + (teamId + 1); - m_video_Video.loopPointReached += (v) => + if (teamId != 1) + { + // 先播放视频 + string videoName = "Scene_" + (teamId + 1); + + m_video_Video.loopPointReached += (v) => + { + for (int i = 0; i < m_rectBgList.childCount; i++) + { + m_rectBgList.GetChild(i).gameObject.SetActive(false); + } + + for (int i = 0; i < m_rectSdx.childCount; i++) + { + m_rectSdx.GetChild(i).gameObject.SetActive(false); + } + + for (int i = 0; i < m_rectSceneFx.childCount; i++) + { + m_rectSceneFx.GetChild(i).gameObject.SetActive(false); + } + + for (int i = 0; i < m_rectSpeed.childCount; i++) + { + m_rectSpeed.GetChild(i).gameObject.SetActive(false); + } + + + + if (teamId > m_rectBgList.childCount) + { + Log.Error("背景Id错误" + teamId); + return; + } + + m_rectBgList.GetChild(teamId).gameObject.SetActive(true); + m_rectSdx.GetChild(teamId).gameObject.SetActive(true); + m_rectSceneFx.GetChild(teamId).gameObject.SetActive(true); + m_rectSpeed.GetChild(teamId).gameObject.SetActive(true); + + + // 替换UI图 + SwitchUIResource(); + }; + + // 播放音频 + var videoAudioName = "csm_audios"; + GameModule.Audio.Play(TEngine.AudioType.Sound, videoAudioName, false, 0.5f, true); + + var videoClip = GameModule.Resource.LoadAsset(videoName); + m_video_Video.clip = videoClip; + m_video_Video.Play(); + } + else { for (int i = 0; i < m_rectBgList.childCount; i++) { @@ -210,15 +261,9 @@ namespace GameLogic // 替换UI图 SwitchUIResource(); - }; + } - // 播放音频 - var videoAudioName = "csm_audios"; - GameModule.Audio.Play(TEngine.AudioType.Sound, videoAudioName, false, 0.5f, true); - var videoClip = GameModule.Resource.LoadAsset(videoName); - m_video_Video.clip = videoClip; - m_video_Video.Play(); }