提交 7f467d61 编写于 作者: 林新发's avatar 林新发

框架更新

上级 bb66c513
...@@ -304,7 +304,6 @@ ...@@ -304,7 +304,6 @@
<None Include="Assets\RawAssets\GuideMask\Shader\GuideMask.shader" /> <None Include="Assets\RawAssets\GuideMask\Shader\GuideMask.shader" />
<None Include="Assets\Scripts\代码目录说明.txt" /> <None Include="Assets\Scripts\代码目录说明.txt" />
<None Include="Assets\LuaFramework\ToLua\readme.txt" /> <None Include="Assets\LuaFramework\ToLua\readme.txt" />
<None Include="Assets\output_log.txt" />
<Reference Include="UnityEngine"> <Reference Include="UnityEngine">
<HintPath>D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath> <HintPath>D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
</Reference> </Reference>
......
fileFormatVersion: 2
guid: 95f00163ba722334cb5544b9c44e18d2
folderAsset: yes
timeCreated: 1476450638
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Utility/LuaUtil.lua Common/LuaUtil.lua
Common/define.lua Common/define.lua
Common/functions.lua Common/functions.lua
Common/protocal.lua Common/protocal.lua
Common/const.lua Common/const.lua
Common/UITool.lua Common/UITool.lua
Common/EventNameDef.lua
-- 入口脚本 -- 入口脚本
Logic/Main.lua Logic/Main.lua
......
fileFormatVersion: 2
guid: 22a026ab84777d94bbf98b62277fabf8
folderAsset: yes
timeCreated: 1476447806
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
...@@ -79,8 +79,6 @@ function LoginPanel:SetUi(binder) ...@@ -79,8 +79,6 @@ function LoginPanel:SetUi(binder)
LanguageMgr:ChangeLanguageType(v) LanguageMgr:ChangeLanguageType(v)
end) end)
language.value = LanguageMgr.languageIndex language.value = LanguageMgr.languageIndex
end end
function LoginPanel:OnHide() function LoginPanel:OnHide()
......
...@@ -69,7 +69,7 @@ Material: ...@@ -69,7 +69,7 @@ Material:
- _Mode: 0 - _Mode: 0
- _OcclusionStrength: 1 - _OcclusionStrength: 1
- _Parallax: 0.02 - _Parallax: 0.02
- _Silder: 83.82081 - _Silder: 85.56396
- _SmoothnessTextureChannel: 0 - _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 1
...@@ -82,7 +82,7 @@ Material: ...@@ -82,7 +82,7 @@ Material:
- _UseUIAlphaClip: 0 - _UseUIAlphaClip: 0
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _Center: {r: 508.19995, g: 277.80994, b: 0, a: 0} - _Center: {r: 0, g: -221.89998, b: 0, a: 0}
- _Color: {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} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
...@@ -5,6 +5,13 @@ ...@@ -5,6 +5,13 @@
/// </summary> /// </summary>
public class ParticleManager public class ParticleManager
{ {
/// <summary>
/// 播放粒子特效
/// </summary>
/// <param name="resId">资源ID</param>
/// <param name="duration">持续事件</param>
/// <param name="cache">是否缓存到对象池中</param>
/// <returns></returns>
public GameObject PlayParticle(int resId, float duration, bool cache) public GameObject PlayParticle(int resId, float duration, bool cache)
{ {
// 取缓存 // 取缓存
......
...@@ -16,12 +16,16 @@ public class GuideMaskBhv : MonoBehaviour ...@@ -16,12 +16,16 @@ public class GuideMaskBhv : MonoBehaviour
Vector3[] corners = new Vector3[4]; Vector3[] corners = new Vector3[4];
float yVelocity = 0f; float yVelocity = 0f;
/// <summary>
/// 执行引导
/// </summary>
/// <param name="target">模板对象</param>
public void DoGuide(GameObject target) public void DoGuide(GameObject target)
{ {
if(null != target) if(null != target)
this.target = target; this.target = target;
// 设置事件透传对象 // 设置事件透传对象
gameObject.GetComponent<EventPermeate>().target = this.target.gameObject; gameObject.GetComponent<EventPermeate>().target = this.target;
var canvas = GlobalObjs.s_canvas; var canvas = GlobalObjs.s_canvas;
target.GetComponent<RectTransform>().GetWorldCorners(corners); target.GetComponent<RectTransform>().GetWorldCorners(corners);
......
因为 它太大了无法显示 source diff 。你可以改为 查看blob
fileFormatVersion: 2
guid: 0e52bf0361692ae438992d640ba81c15
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册