最新制作备份提交
This commit is contained in:
parent
f3653dd5e0
commit
be94b40486
@ -115,8 +115,8 @@ Material:
|
|||||||
- _WorkflowMode: 1
|
- _WorkflowMode: 1
|
||||||
- _ZWrite: 0
|
- _ZWrite: 0
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
|
- _BaseColor: {r: 1, g: 1, b: 1, a: 0.2}
|
||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
- _Color: {r: 1, g: 1, b: 1, a: 0.2}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
Binary file not shown.
@ -3974,6 +3974,8 @@ MonoBehaviour:
|
|||||||
- {fileID: 2011619230}
|
- {fileID: 2011619230}
|
||||||
redMaterial: {fileID: 2100000, guid: 37ff2ca219a96324f937ab6e2e95840f, type: 2}
|
redMaterial: {fileID: 2100000, guid: 37ff2ca219a96324f937ab6e2e95840f, type: 2}
|
||||||
blueMaterial: {fileID: 2100000, guid: 4b7c5f61612317846a93db8ba071955f, type: 2}
|
blueMaterial: {fileID: 2100000, guid: 4b7c5f61612317846a93db8ba071955f, type: 2}
|
||||||
|
touMingMaterial: {fileID: 2100000, guid: db447544f0b31e64db0fba83a8cef85d, type: 2}
|
||||||
|
noTouMingMaterial: {fileID: 2100000, guid: 982e8b865a1ebc5428090725207a2873, type: 2}
|
||||||
selectJingLuoName:
|
selectJingLuoName:
|
||||||
interactionManager: {fileID: 0}
|
interactionManager: {fileID: 0}
|
||||||
timelineManager: {fileID: 0}
|
timelineManager: {fileID: 0}
|
||||||
@ -19061,7 +19063,7 @@ PrefabInstance:
|
|||||||
- target: {fileID: 7720670350496005072, guid: 2fcc585133d55174b945e1146b751a7e,
|
- target: {fileID: 7720670350496005072, guid: 2fcc585133d55174b945e1146b751a7e,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.y
|
propertyPath: m_LocalPosition.y
|
||||||
value: 0
|
value: -0.02768574
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7720670350496005072, guid: 2fcc585133d55174b945e1146b751a7e,
|
- target: {fileID: 7720670350496005072, guid: 2fcc585133d55174b945e1146b751a7e,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|||||||
@ -61,6 +61,18 @@ namespace YiLiao.JingLuoXueWei
|
|||||||
[Header("穴位变色的材质")]
|
[Header("穴位变色的材质")]
|
||||||
public Material blueMaterial;
|
public Material blueMaterial;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 旯极芵隴第窐ヶ
|
||||||
|
/// </summary>
|
||||||
|
[Header("旯极芵隴第窐ヶ")]
|
||||||
|
public Material touMingMaterial;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 旯极祥芵隴第窐ヶ
|
||||||
|
/// </summary>
|
||||||
|
[Header("旯极祥芵隴第窐ヶ")]
|
||||||
|
public Material noTouMingMaterial;
|
||||||
|
|
||||||
[HideInInspector]
|
[HideInInspector]
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 选择的经络
|
/// 选择的经络
|
||||||
@ -174,12 +186,12 @@ namespace YiLiao.JingLuoXueWei
|
|||||||
{
|
{
|
||||||
if (allRedJingLuoRenderer[i].gameObject.name.Contains(name))
|
if (allRedJingLuoRenderer[i].gameObject.name.Contains(name))
|
||||||
{
|
{
|
||||||
allRedJingLuoRenderer[i].material.color = new Color(1, 0, 0, 0);
|
allRedJingLuoRenderer[i].material.SetColor("_BaseColor", new Color(1, 0, 0, 0));
|
||||||
allRedJingLuoRenderer[i].material.SetFloat("_Mode", 1);
|
allRedJingLuoRenderer[i].material.SetFloat("_Mode", 0f);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
allRedJingLuoRenderer[i].material.color = new Color(1, 0, 1, 0);
|
allRedJingLuoRenderer[i].material.SetColor("_BaseColor", new Color(1, 0, 1, 0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -187,12 +199,12 @@ namespace YiLiao.JingLuoXueWei
|
|||||||
{
|
{
|
||||||
if (allBlueJingLuoRenderer[i].gameObject.name.Contains(name))
|
if (allBlueJingLuoRenderer[i].gameObject.name.Contains(name))
|
||||||
{
|
{
|
||||||
allBlueJingLuoRenderer[i].material.color = new Color(0, 0, 1, 0);
|
allBlueJingLuoRenderer[i].material.SetColor("_BaseColor", new Color(0, 0, 1, 0));
|
||||||
allBlueJingLuoRenderer[i].material.SetFloat("_Mode", 1);
|
allBlueJingLuoRenderer[i].material.SetFloat("_Mode", 0f);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
allBlueJingLuoRenderer[i].material.color = new Color(1, 0, 1, 0);
|
allBlueJingLuoRenderer[i].material.SetColor("_BaseColor", new Color(1, 0, 1, 0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -204,13 +216,13 @@ namespace YiLiao.JingLuoXueWei
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < allRedJingLuoRenderer.Count; i++)
|
for (int i = 0; i < allRedJingLuoRenderer.Count; i++)
|
||||||
{
|
{
|
||||||
allRedJingLuoRenderer[i].material.color = new Color(1, 0, 1, 0);
|
allRedJingLuoRenderer[i].material.SetColor("_BaseColor", new Color(1, 0, 1, 0));
|
||||||
allRedJingLuoRenderer[i].material.SetFloat("_Mode", 0);
|
allRedJingLuoRenderer[i].material.SetFloat("_Mode", 1f);
|
||||||
}
|
}
|
||||||
for (int i = 0; i < allBlueJingLuoRenderer.Count; i++)
|
for (int i = 0; i < allBlueJingLuoRenderer.Count; i++)
|
||||||
{
|
{
|
||||||
allBlueJingLuoRenderer[i].material.color = new Color(1, 0, 1, 0);
|
allBlueJingLuoRenderer[i].material.SetColor("_BaseColor", new Color(1, 0, 1, 0));
|
||||||
allBlueJingLuoRenderer[i].material.SetFloat("_Mode", 0);
|
allBlueJingLuoRenderer[i].material.SetFloat("_Mode", 1f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -52,7 +52,7 @@ public class LeftBigBtnPanel : UIBase
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 当前选择的经络
|
/// 当前选择的经络
|
||||||
/// </summary>
|
/// </summary>
|
||||||
string selectJingLuoName;
|
string selectJingLuoName = "";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 控制是否透明按钮
|
/// 控制是否透明按钮
|
||||||
@ -176,16 +176,19 @@ public class LeftBigBtnPanel : UIBase
|
|||||||
public void XunXingClick()
|
public void XunXingClick()
|
||||||
{
|
{
|
||||||
isOpenXunXing = !isOpenXunXing;
|
isOpenXunXing = !isOpenXunXing;
|
||||||
if (isOpenXunXing)
|
if (!string.IsNullOrEmpty(selectJingLuoName))
|
||||||
{
|
{
|
||||||
xunXing_Btn.GetComponent<BtnImage>().OnEnterBtn();
|
if (isOpenXunXing)
|
||||||
gameManager.ChangeJingLuoDefaultColor();
|
{
|
||||||
gameManager.ChangeJingLuoColor(selectJingLuoName);
|
xunXing_Btn.GetComponent<BtnImage>().OnEnterBtn();
|
||||||
}
|
gameManager.ChangeJingLuoDefaultColor();
|
||||||
else
|
gameManager.ChangeJingLuoColor(selectJingLuoName);
|
||||||
{
|
}
|
||||||
gameManager.ChangeJingLuoDefaultColor();
|
else
|
||||||
xunXing_Btn.GetComponent<BtnImage>().OnExitBtn();
|
{
|
||||||
|
gameManager.ChangeJingLuoDefaultColor();
|
||||||
|
xunXing_Btn.GetComponent<BtnImage>().OnExitBtn();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -199,11 +202,15 @@ public class LeftBigBtnPanel : UIBase
|
|||||||
{
|
{
|
||||||
touMing_Btn.GetComponent<BtnImage>().OnEnterBtn();
|
touMing_Btn.GetComponent<BtnImage>().OnEnterBtn();
|
||||||
//TODO 透明身体
|
//TODO 透明身体
|
||||||
|
gameManager.transform.parent.FindFirst<Renderer>("b_r3").material = gameManager.touMingMaterial;
|
||||||
|
gameManager.transform.parent.FindFirst<Renderer>("b_l3").material = gameManager.touMingMaterial;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
touMing_Btn.GetComponent<BtnImage>().OnExitBtn();
|
touMing_Btn.GetComponent<BtnImage>().OnExitBtn();
|
||||||
//TODO 取消透明身体
|
//TODO 取消透明身体
|
||||||
|
gameManager.transform.parent.FindFirst<Renderer>("b_r3").material = gameManager.noTouMingMaterial;
|
||||||
|
gameManager.transform.parent.FindFirst<Renderer>("b_l3").material = gameManager.noTouMingMaterial;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
118880
ps_driver_sdk.1.log
118880
ps_driver_sdk.1.log
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
117354
ps_driver_sdk.3.log
117354
ps_driver_sdk.3.log
File diff suppressed because it is too large
Load Diff
118963
ps_driver_sdk.5.log
118963
ps_driver_sdk.5.log
File diff suppressed because it is too large
Load Diff
117688
ps_driver_sdk.6.log
117688
ps_driver_sdk.6.log
File diff suppressed because it is too large
Load Diff
121998
ps_driver_sdk.7.log
121998
ps_driver_sdk.7.log
File diff suppressed because it is too large
Load Diff
58651
ps_driver_sdk.8.log
Normal file
58651
ps_driver_sdk.8.log
Normal file
File diff suppressed because it is too large
Load Diff
61169
ps_driver_sdk.9.log
Normal file
61169
ps_driver_sdk.9.log
Normal file
File diff suppressed because it is too large
Load Diff
10789
ps_driver_sdk.log
10789
ps_driver_sdk.log
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user