Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
MDPro3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Surveil
MDPro3
Commits
06fbaaca
Commit
06fbaaca
authored
Apr 04, 2024
by
SherryChaos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
245cc661
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
31 deletions
+20
-31
Assets/Main.unity
Assets/Main.unity
+10
-28
Assets/Scripts/MDPro3/Mate.cs
Assets/Scripts/MDPro3/Mate.cs
+8
-1
Assets/Scripts/MDPro3/Servants/OcgCore.cs
Assets/Scripts/MDPro3/Servants/OcgCore.cs
+1
-2
Assets/Scripts/MDPro3/Servants/Room.cs
Assets/Scripts/MDPro3/Servants/Room.cs
+1
-0
No files found.
Assets/Main.unity
View file @
06fbaaca
...
...
@@ -6610,7 +6610,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.999
94
, y: 0}
m_AnchoredPosition: {x: -399.999
88
, y: 0}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &129642814
...
...
@@ -7533,7 +7533,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -490.000
43
, y: 0}
m_AnchoredPosition: {x: -490.000
37
, y: 0}
m_SizeDelta: {x: 490, y: 2000}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &153416284
...
...
@@ -9897,7 +9897,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -9
4.99997
}
m_AnchoredPosition: {x: 0, y: -9
5
}
m_SizeDelta: {x: 790, y: -190}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &204678201
...
...
@@ -17255,7 +17255,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.999
94
, y: 300}
m_AnchoredPosition: {x: -399.999
88
, y: 300}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &365844423
...
...
@@ -34004,7 +34004,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, 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_Pivot: {x: 0.5, y: 1}
--- !u!114 &702608002
...
...
@@ -35899,7 +35899,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -419.999
94
, y: -60}
m_AnchoredPosition: {x: -419.999
88
, y: -60}
m_SizeDelta: {x: 400, y: 760}
m_Pivot: {x: 0, y: 1}
--- !u!114 &736958434
...
...
@@ -37254,7 +37254,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 476827028}
m_Direction: 2
m_Value: 1
m_Size: 0.
62616915
m_Size: 0.
40660203
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
...
...
@@ -53277,7 +53277,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, 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_Pivot: {x: 0.5, y: 1}
--- !u!1 &1117266860
...
...
@@ -65811,7 +65811,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.999
94
, y: 150}
m_AnchoredPosition: {x: -399.999
88
, y: 150}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1374530642
...
...
@@ -88508,7 +88508,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.999
94
, y: -150}
m_AnchoredPosition: {x: -399.999
88
, y: -150}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1800729521
...
...
@@ -103220,7 +103220,6 @@ GameObject:
- component: {fileID: 2112309795}
- component: {fileID: 2112309794}
- component: {fileID: 2112309796}
- component: {fileID: 2112309793}
m_Layer: 0
m_Name: Camera_Main
m_TagString: MainCamera
...
...
@@ -103228,23 +103227,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
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
Camera:
m_ObjectHideFlags: 0
Assets/Scripts/MDPro3/Mate.cs
View file @
06fbaaca
...
...
@@ -82,6 +82,9 @@ namespace MDPro3
m_collider
.
size
=
new
Vector3
(
10
,
10
,
10
);
m_collider
.
center
=
new
Vector3
(
0
,
5
,
0
);
transform
.
GetChild
(
0
).
gameObject
.
AddComponent
<
EventSEPlayer
>();
var
animator
=
transform
.
GetChild
(
0
).
GetComponent
<
Animator
>();
if
(
animator
!=
null
)
animator
.
cullingMode
=
AnimatorCullingMode
.
AlwaysAnimate
;
gameObject
.
SetActive
(
false
);
}
else
...
...
@@ -133,7 +136,11 @@ namespace MDPro3
transform
.
localScale
=
Vector3
.
one
*
5
;
if
(
huge
)
transform
.
localScale
=
Vector3
.
one
*
4f
;
//var animator = GetComponent<Animator>();
var
animator
=
GetComponent
<
Animator
>();
if
(
animator
!=
null
)
animator
.
cullingMode
=
AnimatorCullingMode
.
AlwaysAnimate
;
//AnimatorControllerParameter[] parameter = animator.parameters;
//foreach (var param in parameter)
// Debug.Log(": 参数名称:" + param.name + " 参数类型:" + param.type);
...
...
Assets/Scripts/MDPro3/Servants/OcgCore.cs
View file @
06fbaaca
...
...
@@ -4451,8 +4451,7 @@ namespace MDPro3
}
}
else
if
(
ES_selectHint
==
""
)
ES_selectHint
=
StringHelper
.
GetUnsafe
(
570
);
//请选择要变成不能使用的卡片区域
ES_selectHint
=
StringHelper
.
GetUnsafe
(
570
);
//请选择要变成不能使用的卡片区域
hintObj
.
SetActive
(
true
);
hintText
.
text
=
ES_selectHint
;
break
;
...
...
Assets/Scripts/MDPro3/Servants/Room.cs
View file @
06fbaaca
...
...
@@ -856,6 +856,7 @@ namespace MDPro3
task
=
StringHelper
.
GetUnsafe
(
1406
);
break
;
}
task
=
task
.
Replace
(
"(%d)"
,
""
);
tasks
.
Add
(
task
);
UIManager
.
ShowPopupConfirm
(
tasks
);
break
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment