yangwu
/
mergemilitary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复地面材质，跳过UnitySplash，安卓刘海屏适配，AudioManager Bug，Robux2.0问题

This commit is contained in:
yangjing 2022-10-18 16:26:51 +08:00
parent 6e5d4407f7
commit a9766e1247
15 changed files with 155 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Assets/MMOModule/Resources/MMOUI/MMOUISkinPiece.prefab
View File

@ -63,6 +63,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -137,6 +138,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.1882353, g: 0.23137255, b: 0.23921569, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -252,17 +254,18 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 18
m_FontSize: 25
m_FontStyle: 1
m_BestFit: 1
m_MinSize: 18
m_MaxSize: 25
m_MinSize: 2
m_MaxSize: 35
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@ -331,6 +334,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -405,6 +409,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -481,6 +486,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -555,6 +561,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -630,6 +637,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -704,6 +712,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -778,6 +787,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.7058824}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -852,6 +862,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -930,6 +941,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1055,6 +1067,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1135,6 +1148,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1163,6 +1177,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -1253,6 +1268,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1415,6 +1431,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1443,6 +1460,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -1533,6 +1551,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1607,6 +1626,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1718,6 +1738,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1795,6 +1816,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1869,6 +1891,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.7735849, g: 0.7735849, b: 0.7735849, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:

2
Assets/MMOModule/Scripts/MMOCore/MMOUIMgr/MMOUIBase.cs
View File

@ -90,7 +90,7 @@ namespace MMO
}
}
if (Mathf.Abs((float)Screen.height / Screen.width - 2436 / 1125f) <= 0.01f)
if (((float)Screen.height / Screen.width) > 1.95f)
return true;
return false;

7
Assets/MMOModule/Scripts/MMOModule.cs
View File

@ -172,8 +172,6 @@ public partial class MMOModule : MonoBehaviour
return;
}
MMOInnerSDKManager.Instance.LogEvent("Robux_" + IsAccessible);
mDelCheckOver = pDelCheckOver;
MMOUserData.Instance.IsMMOUser = pIsMMOUser;
@ -190,6 +188,11 @@ public partial class MMOModule : MonoBehaviour
}
}
public void LogMMOUser(bool pIsMMO)
{
MMOInnerSDKManager.Instance.LogEvent("Robux_" + pIsMMO);
}
private void OnLoadOver()
{
MMOUserData.Instance.FinishLoading();

2
Assets/MMOModule/Scripts/MMOStorage/MMOUserData.cs
View File

@ -81,8 +81,6 @@ namespace MMO
set
{
mDiamond = value;
DelUpdateDiamond?.Invoke(mDiamond);
Save();
}
}

1
Assets/MMOModule/Scripts/MMOUIs/CustomControls/MMOTaskList/MMOTaskList.cs
View File

@ -131,6 +131,7 @@ namespace MMO
if (tRecord.TaskType == MMOTaskType.GetDiamond)
{
MMOUserData.Instance.Diamond -= tRecord.TargetNum;
MMOModule.Instance.UIMgr.GetUI<MMOUITop>().DiamondBar.PopRes(-tRecord.TargetNum, MMOUserData.Instance.Diamond);
}
MMOUserData.Instance.FinishTask(tTask.TaskType);

23
Assets/Resources/Material/Block_Forbidden.mat
View File

@ -8,17 +8,15 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Block_Forbidden
m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 4800000, guid: dea34df890f55cf479bde59c7a5ed961, type: 3}
m_ShaderKeywords: TCP2_REFLECTIONS_FRESNEL TCP2_RIM_LIGHTING_LIGHTMASK TCP2_UV_NORMALS_FULL
_ALPHABLEND_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- ALWAYS
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -42,6 +40,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DissolveTex:
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}
@ -106,6 +108,10 @@ Material:
m_Texture: {fileID: 2800000, guid: 835fce0f56be3874b8ddbe92b9aca073, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _texcoord:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BlendOp: 0
- _BumpScale: 1
@ -117,6 +123,7 @@ Material:
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DirectIntensityOutline: 1
- _Dissolve: 0
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
@ -132,6 +139,7 @@ Material:
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HardSide: 0
- _HighLightBoundry: 1
- _HighLightSmooth: 0.001
- _IndirectIntensity: 1
@ -207,7 +215,7 @@ Material:
m_Colors:
- _BaseColor: {r: 0.77254903, g: 0.74509805, b: 0.7176471, a: 1}
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 1, g: 0.04438341, b: 0, a: 0.40392157}
- _Color: {r: 1, g: 0.04438341, b: 0, a: 0.34901962}
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _EmiColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
@ -232,3 +240,4 @@ Material:
- _SpecularColor: {r: 0.14150941, g: 0.13969748, b: 0.13817193, a: 1}
- _lightcolor: {r: 1, g: 1, b: 1, a: 1}
- _shadowcolor: {r: 1, g: 0.99412984, b: 0.68235296, a: 1}
m_BuildTextureStacks: []

23
Assets/Resources/Material/Block_Mergable.mat
View File

@ -8,17 +8,15 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Block_Mergable
m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 4800000, guid: dea34df890f55cf479bde59c7a5ed961, type: 3}
m_ShaderKeywords: TCP2_REFLECTIONS_FRESNEL TCP2_RIM_LIGHTING_LIGHTMASK TCP2_UV_NORMALS_FULL
_ALPHABLEND_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- ALWAYS
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -42,6 +40,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DissolveTex:
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}
@ -106,6 +108,10 @@ Material:
m_Texture: {fileID: 2800000, guid: 835fce0f56be3874b8ddbe92b9aca073, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _texcoord:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BlendOp: 0
- _BumpScale: 1
@ -117,6 +123,7 @@ Material:
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DirectIntensityOutline: 1
- _Dissolve: 0
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
@ -132,6 +139,7 @@ Material:
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HardSide: 0
- _HighLightBoundry: 1
- _HighLightSmooth: 0.001
- _IndirectIntensity: 1
@ -207,7 +215,7 @@ Material:
m_Colors:
- _BaseColor: {r: 0.77254903, g: 0.74509805, b: 0.7176471, a: 1}
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 0, g: 1, b: 0.025922537, a: 0.40392157}
- _Color: {r: 0, g: 1, b: 0.025922537, a: 0.34901962}
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _EmiColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
@ -232,3 +240,4 @@ Material:
- _SpecularColor: {r: 0.14150941, g: 0.13969748, b: 0.13817193, a: 1}
- _lightcolor: {r: 1, g: 1, b: 1, a: 1}
- _shadowcolor: {r: 1, g: 0.99412984, b: 0.68235296, a: 1}
m_BuildTextureStacks: []

23
Assets/Resources/Material/Block_Movable.mat
View File

@ -8,17 +8,15 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Block_Movable
m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 4800000, guid: dea34df890f55cf479bde59c7a5ed961, type: 3}
m_ShaderKeywords: TCP2_REFLECTIONS_FRESNEL TCP2_RIM_LIGHTING_LIGHTMASK TCP2_UV_NORMALS_FULL
_ALPHABLEND_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- ALWAYS
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -42,6 +40,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DissolveTex:
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}
@ -106,6 +108,10 @@ Material:
m_Texture: {fileID: 2800000, guid: 835fce0f56be3874b8ddbe92b9aca073, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _texcoord:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BlendOp: 0
- _BumpScale: 1
@ -117,6 +123,7 @@ Material:
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DirectIntensityOutline: 1
- _Dissolve: 0
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
@ -132,6 +139,7 @@ Material:
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HardSide: 0
- _HighLightBoundry: 1
- _HighLightSmooth: 0.001
- _IndirectIntensity: 1
@ -207,7 +215,7 @@ Material:
m_Colors:
- _BaseColor: {r: 0.77254903, g: 0.74509805, b: 0.7176471, a: 1}
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 0.6132076, g: 0.17357485, b: 0, a: 1}
- _Color: {r: 0.9811321, g: 0.972549, b: 0, a: 0.34901962}
- _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
- _EmiColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
@ -232,3 +240,4 @@ Material:
- _SpecularColor: {r: 0.14150941, g: 0.13969748, b: 0.13817193, a: 1}
- _lightcolor: {r: 1, g: 1, b: 1, a: 1}
- _shadowcolor: {r: 0.68235296, g: 1, b: 0.99999994, a: 1}
m_BuildTextureStacks: []

23
Assets/Resources/Material/Block_Picked.mat
View File

@ -8,17 +8,15 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Block_Picked
m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 4800000, guid: dea34df890f55cf479bde59c7a5ed961, type: 3}
m_ShaderKeywords: TCP2_REFLECTIONS_FRESNEL TCP2_RIM_LIGHTING_LIGHTMASK TCP2_UV_NORMALS_FULL
_ALPHABLEND_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- ALWAYS
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -42,6 +40,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DissolveTex:
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}
@ -106,6 +108,10 @@ Material:
m_Texture: {fileID: 2800000, guid: 835fce0f56be3874b8ddbe92b9aca073, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _texcoord:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BlendOp: 0
- _BumpScale: 1
@ -117,6 +123,7 @@ Material:
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DirectIntensityOutline: 1
- _Dissolve: 0
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
@ -132,6 +139,7 @@ Material:
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HardSide: 0
- _HighLightBoundry: 1
- _HighLightSmooth: 0.001
- _IndirectIntensity: 1
@ -207,7 +215,7 @@ Material:
m_Colors:
- _BaseColor: {r: 0.77254903, g: 0.74509805, b: 0.7176471, a: 1}
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 0.6132076, g: 0.17357485, b: 0, a: 1}
- _Color: {r: 0, g: 0.6392157, b: 1, a: 0.34901962}
- _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
- _EmiColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
@ -232,3 +240,4 @@ Material:
- _SpecularColor: {r: 0.14150941, g: 0.13969748, b: 0.13817193, a: 1}
- _lightcolor: {r: 1, g: 1, b: 1, a: 1}
- _shadowcolor: {r: 0.68235296, g: 1, b: 0.99999994, a: 1}
m_BuildTextureStacks: []

10
Assets/Scripts/Core/AudioManager/AudioManager.cs
View File

@ -81,7 +81,7 @@ public class AudioManager : D_MonoSingleton<AudioManager>
if (tClip == null)
return;
if (mMusicPlayer.enabled)
if (mMusicPlayer.clip != tClip)
{
mMusicPlayer.clip = tClip;
mMusicPlayer.loop = true;
@ -147,18 +147,20 @@ public class AudioManager : D_MonoSingleton<AudioManager>
if (tClip == null)
return null;
if (mSoundPlayer.enabled)
{
AudioSource tLoopAudio = gameObject.AddComponent<AudioSource>();
tLoopAudio.clip = tClip;
tLoopAudio.loop = true;
tLoopAudio.volume *= pVolumeScale;
if (mSoundPlayer.enabled)
{
tLoopAudio.Play();
}
return tLoopAudio;
}
return null;
}
public void StopSoundLoop(AudioSource pAudioSrc)
{
if (pAudioSrc == null)

36
Assets/Scripts/Core/SkipSplash.cs Normal file
View File

@ -0,0 +1,36 @@
/* ---------------------------------------------------------------- */
/* Skip Unity Splash Screen */
/* Create by psygames */
/* https://github.com/psygames/UnitySkipSplash */
/* ---------------------------------------------------------------- */
#if !UNITY_EDITOR
using UnityEngine;
using UnityEngine.Rendering;
public class SkipSplash
{
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSplashScreen)]
private static void BeforeSplashScreen()
{
#if UNITY_WEBGL
Application.focusChanged += Application_focusChanged;
#else
System.Threading.Tasks.Task.Run(AsyncSkip);
#endif
}
#if UNITY_WEBGL
private static void Application_focusChanged(bool obj)
{
Application.focusChanged -= Application_focusChanged;
SplashScreen.Stop(SplashScreen.StopBehavior.StopImmediate);
}
#else
private static void AsyncSkip()
{
SplashScreen.Stop(SplashScreen.StopBehavior.StopImmediate);
}
#endif
}
#endif

11
Assets/Scripts/Core/SkipSplash.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 975b24b136a404fe88d0bf8293d93815
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Scripts/Core/UITools/XAdaptor.cs
View File

@ -43,7 +43,7 @@ public class XAdaptor : MonoBehaviour
}
}
if (Mathf.Abs((float)Screen.height / Screen.width - 2436 / 1125f) <= 0.01f)
if (((float)Screen.height / Screen.width) > 1.95f)
return true;
return false;

1
Assets/Scripts/Storage/PlayerData.cs
View File

@ -225,6 +225,7 @@ public class PlayerData : StorageBase<PlayerData>
{
case Touka.FunctionType.Function_wangz:
IsMMOUser = pOn;
MMOModule.Instance.LogMMOUser(IsMMOUser);
Debug.Log("Usersource is mmo :" + IsMMOUser);
break;
case Touka.FunctionType.Function_IP:

2
Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterface.cs
View File

@ -11,7 +11,7 @@ namespace Touka
{
private static TKGNativeInterface _instance;
private string UnitySDKVersion = "2.2.7";
private string UnitySDKVersion = "2.2.8";
public static TKGNativeInterface Instance
{