Commit 06fbaaca authored by SherryChaos's avatar SherryChaos

fix bug

parent 245cc661
...@@ -6610,7 +6610,7 @@ RectTransform: ...@@ -6610,7 +6610,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.99994, y: 0} m_AnchoredPosition: {x: -399.99988, y: 0}
m_SizeDelta: {x: -1350, y: 80} m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0} m_Pivot: {x: 1, y: 0}
--- !u!114 &129642814 --- !u!114 &129642814
...@@ -7533,7 +7533,7 @@ RectTransform: ...@@ -7533,7 +7533,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -490.00043, y: 0} m_AnchoredPosition: {x: -490.00037, y: 0}
m_SizeDelta: {x: 490, y: 2000} m_SizeDelta: {x: 490, y: 2000}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!114 &153416284 --- !u!114 &153416284
...@@ -9897,7 +9897,7 @@ RectTransform: ...@@ -9897,7 +9897,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -94.99997} m_AnchoredPosition: {x: 0, y: -95}
m_SizeDelta: {x: 790, y: -190} m_SizeDelta: {x: 790, y: -190}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &204678201 --- !u!114 &204678201
...@@ -17255,7 +17255,7 @@ RectTransform: ...@@ -17255,7 +17255,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.99994, y: 300} m_AnchoredPosition: {x: -399.99988, y: 300}
m_SizeDelta: {x: -1350, y: 80} m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0} m_Pivot: {x: 1, y: 0}
--- !u!114 &365844423 --- !u!114 &365844423
...@@ -34004,7 +34004,7 @@ RectTransform: ...@@ -34004,7 +34004,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0.000030517578} m_AnchoredPosition: {x: 0, y: -0.000030517578}
m_SizeDelta: {x: 0, y: 300} m_SizeDelta: {x: 0, y: 300}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!114 &702608002 --- !u!114 &702608002
...@@ -35899,7 +35899,7 @@ RectTransform: ...@@ -35899,7 +35899,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -419.99994, y: -60} m_AnchoredPosition: {x: -419.99988, y: -60}
m_SizeDelta: {x: 400, y: 760} m_SizeDelta: {x: 400, y: 760}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &736958434 --- !u!114 &736958434
...@@ -37254,7 +37254,7 @@ MonoBehaviour: ...@@ -37254,7 +37254,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 476827028} m_HandleRect: {fileID: 476827028}
m_Direction: 2 m_Direction: 2
m_Value: 1 m_Value: 1
m_Size: 0.62616915 m_Size: 0.40660203
m_NumberOfSteps: 0 m_NumberOfSteps: 0
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:
...@@ -53277,7 +53277,7 @@ RectTransform: ...@@ -53277,7 +53277,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0.000030517578} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 300} m_SizeDelta: {x: 0, y: 300}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!1 &1117266860 --- !u!1 &1117266860
...@@ -65811,7 +65811,7 @@ RectTransform: ...@@ -65811,7 +65811,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.99994, y: 150} m_AnchoredPosition: {x: -399.99988, y: 150}
m_SizeDelta: {x: -1350, y: 80} m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0} m_Pivot: {x: 1, y: 0}
--- !u!114 &1374530642 --- !u!114 &1374530642
...@@ -88508,7 +88508,7 @@ RectTransform: ...@@ -88508,7 +88508,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.99994, y: -150} m_AnchoredPosition: {x: -399.99988, y: -150}
m_SizeDelta: {x: -1350, y: 80} m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0} m_Pivot: {x: 1, y: 0}
--- !u!114 &1800729521 --- !u!114 &1800729521
...@@ -103220,7 +103220,6 @@ GameObject: ...@@ -103220,7 +103220,6 @@ GameObject:
- component: {fileID: 2112309795} - component: {fileID: 2112309795}
- component: {fileID: 2112309794} - component: {fileID: 2112309794}
- component: {fileID: 2112309796} - component: {fileID: 2112309796}
- component: {fileID: 2112309793}
m_Layer: 0 m_Layer: 0
m_Name: Camera_Main m_Name: Camera_Main
m_TagString: MainCamera m_TagString: MainCamera
...@@ -103228,23 +103227,6 @@ GameObject: ...@@ -103228,23 +103227,6 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!114 &2112309793
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2112309792}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
m_Name:
m_EditorClassIdentifier:
isGlobal: 1
priority: 0
blendDistance: 0
weight: 1
sharedProfile: {fileID: 11400000, guid: 1e241ba92e25f5942832856af4a9e983, type: 2}
--- !u!20 &2112309794 --- !u!20 &2112309794
Camera: Camera:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -82,6 +82,9 @@ namespace MDPro3 ...@@ -82,6 +82,9 @@ namespace MDPro3
m_collider.size = new Vector3(10, 10, 10); m_collider.size = new Vector3(10, 10, 10);
m_collider.center = new Vector3(0, 5, 0); m_collider.center = new Vector3(0, 5, 0);
transform.GetChild(0).gameObject.AddComponent<EventSEPlayer>(); transform.GetChild(0).gameObject.AddComponent<EventSEPlayer>();
var animator = transform.GetChild(0).GetComponent<Animator>();
if (animator != null)
animator.cullingMode = AnimatorCullingMode.AlwaysAnimate;
gameObject.SetActive(false); gameObject.SetActive(false);
} }
else else
...@@ -133,7 +136,11 @@ namespace MDPro3 ...@@ -133,7 +136,11 @@ namespace MDPro3
transform.localScale = Vector3.one * 5; transform.localScale = Vector3.one * 5;
if(huge) if(huge)
transform.localScale = Vector3.one * 4f; transform.localScale = Vector3.one * 4f;
//var animator = GetComponent<Animator>();
var animator = GetComponent<Animator>();
if (animator != null)
animator.cullingMode = AnimatorCullingMode.AlwaysAnimate;
//AnimatorControllerParameter[] parameter = animator.parameters; //AnimatorControllerParameter[] parameter = animator.parameters;
//foreach (var param in parameter) //foreach (var param in parameter)
// Debug.Log(": 参数名称:" + param.name + " 参数类型:" + param.type); // Debug.Log(": 参数名称:" + param.name + " 参数类型:" + param.type);
......
...@@ -4451,8 +4451,7 @@ namespace MDPro3 ...@@ -4451,8 +4451,7 @@ namespace MDPro3
} }
} }
else else
if (ES_selectHint == "") ES_selectHint = StringHelper.GetUnsafe(570);//请选择要变成不能使用的卡片区域
ES_selectHint = StringHelper.GetUnsafe(570);//请选择要变成不能使用的卡片区域
hintObj.SetActive(true); hintObj.SetActive(true);
hintText.text = ES_selectHint; hintText.text = ES_selectHint;
break; break;
......
...@@ -856,6 +856,7 @@ namespace MDPro3 ...@@ -856,6 +856,7 @@ namespace MDPro3
task = StringHelper.GetUnsafe(1406); task = StringHelper.GetUnsafe(1406);
break; break;
} }
task = task.Replace("(%d)", "");
tasks.Add(task); tasks.Add(task);
UIManager.ShowPopupConfirm(tasks); UIManager.ShowPopupConfirm(tasks);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment