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
28
Issues
28
List
Boards
Labels
Service Desk
Milestones
Merge Requests
5
Merge Requests
5
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
赤子奈落
MDPro3
Commits
513b6fa4
Commit
513b6fa4
authored
Oct 14, 2025
by
SherryChaos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CardInfoDetial show genesys point
parent
ea10b916
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
450 additions
and
9 deletions
+450
-9
Assets/Prefabs/UIWidges/CardInfoDetail.prefab
Assets/Prefabs/UIWidges/CardInfoDetail.prefab
+268
-5
Assets/Scripts/MDPro3/Net/OnlineService.cs
Assets/Scripts/MDPro3/Net/OnlineService.cs
+9
-0
Assets/Scripts/MDPro3/Servant/OcgCore.cs
Assets/Scripts/MDPro3/Servant/OcgCore.cs
+1
-3
Assets/Scripts/MDPro3/UI/UIWidget/Deck/CardInfoDetail.cs
Assets/Scripts/MDPro3/UI/UIWidget/Deck/CardInfoDetail.cs
+12
-0
Assets/Texture/Icons_Types/GUI_T_Icon_Pool_6.png
Assets/Texture/Icons_Types/GUI_T_Icon_Pool_6.png
+0
-0
Assets/Texture/Icons_Types/GUI_T_Icon_Pool_6.png.meta
Assets/Texture/Icons_Types/GUI_T_Icon_Pool_6.png.meta
+143
-0
Assets/Texture/PSD/Card Rarity Icon.psd.meta
Assets/Texture/PSD/Card Rarity Icon.psd.meta
+14
-1
Assets/Texture/PSD/GUI_T_Icon_Pool.psd
Assets/Texture/PSD/GUI_T_Icon_Pool.psd
+0
-0
Assets/Texture/PSD/GUI_T_Icon_Pool.psd.meta
Assets/Texture/PSD/GUI_T_Icon_Pool.psd.meta
+0
-0
Assets/Texture/SpriteAtlas.spriteatlas
Assets/Texture/SpriteAtlas.spriteatlas
+3
-0
No files found.
Assets/Prefabs/UIWidges/CardInfoDetail.prefab
View file @
513b6fa4
...
@@ -11212,6 +11212,7 @@ MonoBehaviour:
...
@@ -11212,6 +11212,7 @@ MonoBehaviour:
-
{
fileID
:
2318537164940282873
}
-
{
fileID
:
2318537164940282873
}
-
{
fileID
:
5968262412313107696
}
-
{
fileID
:
5968262412313107696
}
-
{
fileID
:
3090956439444166884
}
-
{
fileID
:
3090956439444166884
}
-
{
fileID
:
1101497615595243453
}
-
{
fileID
:
8129075300293398380
}
-
{
fileID
:
8129075300293398380
}
-
{
fileID
:
8129588431550377289
}
-
{
fileID
:
8129588431550377289
}
---
!u!225
&225697410143221688
---
!u!225
&225697410143221688
...
@@ -20151,7 +20152,7 @@ RectTransform:
...
@@ -20151,7 +20152,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
:
6
84
,
y
:
-31
}
m_AnchoredPosition
:
{
x
:
5
84
,
y
:
-31
}
m_SizeDelta
:
{
x
:
84
,
y
:
42
}
m_SizeDelta
:
{
x
:
84
,
y
:
42
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&9150139952031509180
---
!u!114
&9150139952031509180
...
@@ -20690,7 +20691,7 @@ RectTransform:
...
@@ -20690,7 +20691,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
:
8
84
,
y
:
-31
}
m_AnchoredPosition
:
{
x
:
7
84
,
y
:
-31
}
m_SizeDelta
:
{
x
:
84
,
y
:
42
}
m_SizeDelta
:
{
x
:
84
,
y
:
42
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&2318537164940282873
---
!u!114
&2318537164940282873
...
@@ -20800,7 +20801,7 @@ RectTransform:
...
@@ -20800,7 +20801,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
:
10
84
,
y
:
-31
}
m_AnchoredPosition
:
{
x
:
9
84
,
y
:
-31
}
m_SizeDelta
:
{
x
:
84
,
y
:
42
}
m_SizeDelta
:
{
x
:
84
,
y
:
42
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&3090956439444166884
---
!u!114
&3090956439444166884
...
@@ -21472,7 +21473,7 @@ RectTransform:
...
@@ -21472,7 +21473,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
:
7
84
,
y
:
-31
}
m_AnchoredPosition
:
{
x
:
6
84
,
y
:
-31
}
m_SizeDelta
:
{
x
:
84
,
y
:
42
}
m_SizeDelta
:
{
x
:
84
,
y
:
42
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&1096901667250210284
---
!u!114
&1096901667250210284
...
@@ -21546,6 +21547,117 @@ MonoBehaviour:
...
@@ -21546,6 +21547,117 @@ MonoBehaviour:
m_FillOrigin
:
0
m_FillOrigin
:
0
m_UseSpriteMesh
:
0
m_UseSpriteMesh
:
0
m_PixelsPerUnitMultiplier
:
1
m_PixelsPerUnitMultiplier
:
1
---
!u!1
&6957273698845843852
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
7859708170043209893
}
-
component
:
{
fileID
:
2355830908432269729
}
-
component
:
{
fileID
:
5246227805284482504
}
-
component
:
{
fileID
:
315923970232900297
}
-
component
:
{
fileID
:
8031085187047713078
}
m_Layer
:
5
m_Name
:
IconGP
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!224
&7859708170043209893
RectTransform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6957273698845843852
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_ConstrainProportionsScale
:
0
m_Children
:
-
{
fileID
:
2534668861936280417
}
m_Father
:
{
fileID
:
7791176924581710415
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0
,
y
:
1
}
m_AnchorMax
:
{
x
:
0
,
y
:
1
}
m_AnchoredPosition
:
{
x
:
1084
,
y
:
-31
}
m_SizeDelta
:
{
x
:
84
,
y
:
42
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&2355830908432269729
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6957273698845843852
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
d45bbefa568ea23d9ad54b33ccf4780f
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
label
:
IconGP
---
!u!114
&5246227805284482504
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6957273698845843852
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
331895ad6d9dba74f9f511d9512d2708
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
decideByUser
:
1
m_AnchoredPosition
:
m_DefaultValue
:
{
x
:
0
,
y
:
0
}
m_MobileValue
:
{
x
:
0
,
y
:
0
}
m_SizeDelta
:
m_DefaultValue
:
{
x
:
84
,
y
:
42
}
m_MobileValue
:
{
x
:
100
,
y
:
50
}
debug
:
0
---
!u!222
&315923970232900297
CanvasRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6957273698845843852
}
m_CullTransparentMesh
:
1
---
!u!114
&8031085187047713078
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6957273698845843852
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
fe87c0e1cc204ed48ad3b37840f39efc
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
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
:
m_Calls
:
[]
m_Sprite
:
{
fileID
:
21300000
,
guid
:
fc0712e351423bb42b56c0f1aef6c775
,
type
:
3
}
m_Type
:
0
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillMethod
:
4
m_FillAmount
:
1
m_FillClockwise
:
1
m_FillOrigin
:
0
m_UseSpriteMesh
:
0
m_PixelsPerUnitMultiplier
:
1
---
!u!1
&7119731024916739392
---
!u!1
&7119731024916739392
GameObject
:
GameObject
:
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
...
@@ -21665,7 +21777,7 @@ RectTransform:
...
@@ -21665,7 +21777,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
:
9
84
,
y
:
-31
}
m_AnchoredPosition
:
{
x
:
8
84
,
y
:
-31
}
m_SizeDelta
:
{
x
:
84
,
y
:
42
}
m_SizeDelta
:
{
x
:
84
,
y
:
42
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&5968262412313107696
---
!u!114
&5968262412313107696
...
@@ -21739,6 +21851,156 @@ MonoBehaviour:
...
@@ -21739,6 +21851,156 @@ MonoBehaviour:
m_FillOrigin
:
0
m_FillOrigin
:
0
m_UseSpriteMesh
:
0
m_UseSpriteMesh
:
0
m_PixelsPerUnitMultiplier
:
1
m_PixelsPerUnitMultiplier
:
1
---
!u!1
&7683462451520474130
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
2534668861936280417
}
-
component
:
{
fileID
:
1101497615595243453
}
-
component
:
{
fileID
:
8184508779287030755
}
-
component
:
{
fileID
:
6237302455509915538
}
m_Layer
:
5
m_Name
:
TextGP
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!224
&2534668861936280417
RectTransform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
7683462451520474130
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_ConstrainProportionsScale
:
0
m_Children
:
[]
m_Father
:
{
fileID
:
7859708170043209893
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchoredPosition
:
{
x
:
0
,
y
:
0
}
m_SizeDelta
:
{
x
:
72
,
y
:
38
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&1101497615595243453
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
7683462451520474130
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
d45bbefa568ea23d9ad54b33ccf4780f
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
label
:
TextGP
---
!u!222
&8184508779287030755
CanvasRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
7683462451520474130
}
m_CullTransparentMesh
:
1
---
!u!114
&6237302455509915538
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
7683462451520474130
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
f4688fdb7df04437aeb418b961361dc5
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
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
:
m_Calls
:
[]
m_text
:
G:0
m_isRightToLeft
:
0
m_fontAsset
:
{
fileID
:
11400000
,
guid
:
6dac441707ef57a4d9063c19bfb51631
,
type
:
2
}
m_sharedMaterial
:
{
fileID
:
72307265282866410
,
guid
:
6dac441707ef57a4d9063c19bfb51631
,
type
:
2
}
m_fontSharedMaterials
:
[]
m_fontMaterial
:
{
fileID
:
0
}
m_fontMaterials
:
[]
m_fontColor32
:
serializedVersion
:
2
rgba
:
4294967295
m_fontColor
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_enableVertexGradient
:
0
m_colorMode
:
3
m_fontColorGradient
:
topLeft
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
topRight
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
bottomLeft
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
bottomRight
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_fontColorGradientPreset
:
{
fileID
:
0
}
m_spriteAsset
:
{
fileID
:
0
}
m_tintAllSprites
:
0
m_StyleSheet
:
{
fileID
:
0
}
m_TextStyleHashCode
:
-1183493901
m_overrideHtmlColors
:
0
m_faceColor
:
serializedVersion
:
2
rgba
:
4294967295
m_fontSize
:
20
m_fontSizeBase
:
50
m_fontWeight
:
400
m_enableAutoSizing
:
1
m_fontSizeMin
:
5
m_fontSizeMax
:
20
m_fontStyle
:
0
m_HorizontalAlignment
:
2
m_VerticalAlignment
:
512
m_textAlignment
:
65535
m_characterSpacing
:
0
m_wordSpacing
:
0
m_lineSpacing
:
0
m_lineSpacingMax
:
0
m_paragraphSpacing
:
0
m_charWidthMaxAdj
:
0
m_TextWrappingMode
:
0
m_wordWrappingRatios
:
0.4
m_overflowMode
:
0
m_linkedTextComponent
:
{
fileID
:
0
}
parentLinkedComponent
:
{
fileID
:
0
}
m_enableKerning
:
0
m_ActiveFontFeatures
:
6e72656b
m_enableExtraPadding
:
0
checkPaddingRequired
:
0
m_isRichText
:
1
m_EmojiFallbackSupport
:
1
m_parseCtrlCharacters
:
1
m_isOrthographic
:
1
m_isCullingEnabled
:
0
m_horizontalMapping
:
0
m_verticalMapping
:
0
m_uvLineOffset
:
0
m_geometrySortingOrder
:
0
m_IsTextObjectScaleStatic
:
0
m_VertexBufferAutoSizeReduction
:
0
m_useMaxVisibleDescender
:
1
m_pageToDisplay
:
1
m_margin
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
m_isUsingLegacyAnimationComponent
:
0
m_isVolumetricText
:
0
m_hasFontAssetChanged
:
0
m_baseMaterial
:
{
fileID
:
0
}
m_maskOffset
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
---
!u!1
&7873445026648965949
---
!u!1
&7873445026648965949
GameObject
:
GameObject
:
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
...
@@ -24402,6 +24664,7 @@ RectTransform:
...
@@ -24402,6 +24664,7 @@ RectTransform:
-
{
fileID
:
8765217717355975033
}
-
{
fileID
:
8765217717355975033
}
-
{
fileID
:
8954285943596975401
}
-
{
fileID
:
8954285943596975401
}
-
{
fileID
:
8401334985521760142
}
-
{
fileID
:
8401334985521760142
}
-
{
fileID
:
7859708170043209893
}
m_Father
:
{
fileID
:
224500740510165780
}
m_Father
:
{
fileID
:
224500740510165780
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0
,
y
:
0
}
m_AnchorMin
:
{
x
:
0
,
y
:
0
}
...
...
Assets/Scripts/MDPro3/Net/OnlineService.cs
View file @
513b6fa4
...
@@ -137,6 +137,15 @@ namespace MDPro3.Net
...
@@ -137,6 +137,15 @@ namespace MDPro3.Net
return
0
;
return
0
;
}
}
public
static
string
GetGenesysPointString
(
int
code
)
{
var
gp
=
GetGenesysPoint
(
code
);
if
(
gp
<
0
)
return
"X"
;
return
gp
.
ToString
();
}
/// <summary>
/// <summary>
/// color for Genesys Points one card score
/// color for Genesys Points one card score
/// </summary>
/// </summary>
...
...
Assets/Scripts/MDPro3/Servant/OcgCore.cs
View file @
513b6fa4
...
@@ -447,7 +447,7 @@ namespace MDPro3.Servant
...
@@ -447,7 +447,7 @@ namespace MDPro3.Servant
}
}
bool
greenOn
;
private
bool
greenOn
;
public
void
GreenBackgroundOn
()
public
void
GreenBackgroundOn
()
{
{
greenBackground
.
gameObject
.
SetActive
(
true
);
greenBackground
.
gameObject
.
SetActive
(
true
);
...
@@ -888,7 +888,6 @@ namespace MDPro3.Servant
...
@@ -888,7 +888,6 @@ namespace MDPro3.Servant
return
false
;
return
false
;
}
}
private
async
UniTask
ProcessMessage
()
private
async
UniTask
ProcessMessage
()
{
{
messageDispatcher
.
Dispose
();
messageDispatcher
.
Dispose
();
...
@@ -1235,7 +1234,6 @@ namespace MDPro3.Servant
...
@@ -1235,7 +1234,6 @@ namespace MDPro3.Servant
}
}
}
}
public
int
GetMyHandCount
()
public
int
GetMyHandCount
()
{
{
if
(
needRefreshMyHand
)
if
(
needRefreshMyHand
)
...
...
Assets/Scripts/MDPro3/UI/UIWidget/Deck/CardInfoDetail.cs
View file @
513b6fa4
using
Cysharp.Threading.Tasks
;
using
Cysharp.Threading.Tasks
;
using
DG.Tweening
;
using
DG.Tweening
;
using
MDPro3.Duel.YGOSharp
;
using
MDPro3.Duel.YGOSharp
;
using
MDPro3.Net
;
using
MDPro3.Servant
;
using
MDPro3.Servant
;
using
MDPro3.UI.ServantUI
;
using
MDPro3.UI.ServantUI
;
using
MDPro3.Utility
;
using
MDPro3.Utility
;
...
@@ -239,6 +240,12 @@ namespace MDPro3.UI
...
@@ -239,6 +240,12 @@ namespace MDPro3.UI
m_IconBETA
=
m_IconBETA
!=
null
?
m_IconBETA
m_IconBETA
=
m_IconBETA
!=
null
?
m_IconBETA
:
Manager
.
GetNestedElement
<
Image
>(
LABEL_IMG_ICON_BETA
);
:
Manager
.
GetNestedElement
<
Image
>(
LABEL_IMG_ICON_BETA
);
private
const
string
LABEL_TXT_GP
=
"TextGP"
;
private
TextMeshProUGUI
m_TextGP
;
protected
TextMeshProUGUI
TextGP
=>
m_TextGP
=
m_TextGP
!=
null
?
m_TextGP
:
Manager
.
GetElement
<
TextMeshProUGUI
>(
LABEL_TXT_GP
);
#
endregion
#
endregion
#
region
Pendulum
Description
Area
#
region
Pendulum
Description
Area
...
@@ -414,6 +421,11 @@ namespace MDPro3.UI
...
@@ -414,6 +421,11 @@ namespace MDPro3.UI
IconDIY
.
gameObject
.
SetActive
((
data
.
Ot
&
4
)
>
0
);
IconDIY
.
gameObject
.
SetActive
((
data
.
Ot
&
4
)
>
0
);
IconBETA
.
gameObject
.
SetActive
(
data
.
isPre
);
IconBETA
.
gameObject
.
SetActive
(
data
.
isPre
);
var
gp
=
OnlineService
.
GetGenesysPoint
(
data
.
GetOriginalID
());
var
gpString
=
OnlineService
.
GetGenesysPointString
(
data
.
GetOriginalID
());
TextGP
.
text
=
string
.
Format
(
"G:{0}"
,
gpString
);
TextGP
.
color
=
OnlineService
.
GetGenesysPointColor
(
gp
);
#
endregion
#
endregion
#
region
Description
Area
#
region
Description
Area
...
...
Assets/Texture/Icons_Types/GUI_T_Icon_Pool_6.png
0 → 100644
View file @
513b6fa4
5.36 KB
Assets/Texture/Icons_Types/GUI_T_Icon_Pool_6.png.meta
0 → 100644
View file @
513b6fa4
fileFormatVersion: 2
guid: fc0712e351423bb42b56c0f1aef6c775
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Texture/PSD/Card Rarity Icon.psd.meta
View file @
513b6fa4
...
@@ -52,7 +52,7 @@ TextureImporter:
...
@@ -52,7 +52,7 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaUsage: 1
alphaIsTransparency:
0
alphaIsTransparency:
1
spriteTessellationDetail: -1
spriteTessellationDetail: -1
textureType: 0
textureType: 0
textureShape: 1
textureShape: 1
...
@@ -106,6 +106,19 @@ TextureImporter:
...
@@ -106,6 +106,19 @@ TextureImporter:
ignorePlatformSupport: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
spriteSheet:
serializedVersion: 2
serializedVersion: 2
sprites: []
sprites: []
...
...
Assets/Texture/
Icons_Types
/GUI_T_Icon_Pool.psd
→
Assets/Texture/
PSD
/GUI_T_Icon_Pool.psd
View file @
513b6fa4
No preview for this file type
Assets/Texture/
Icons_Types
/GUI_T_Icon_Pool.psd.meta
→
Assets/Texture/
PSD
/GUI_T_Icon_Pool.psd.meta
View file @
513b6fa4
File moved
Assets/Texture/SpriteAtlas.spriteatlas
View file @
513b6fa4
...
@@ -234,6 +234,7 @@ SpriteAtlas:
...
@@ -234,6 +234,7 @@ SpriteAtlas:
-
1c67dcd331aba654c9bd5bf1cb62e9b6
:
21300000
-
1c67dcd331aba654c9bd5bf1cb62e9b6
:
21300000
-
74c89dd3140caaf41822b2dfb3c41e3e
:
21300000
-
74c89dd3140caaf41822b2dfb3c41e3e
:
21300000
-
79c360e3cce6f9543bbc1fcd0ef1820b
:
21300000
-
79c360e3cce6f9543bbc1fcd0ef1820b
:
21300000
-
fc0712e351423bb42b56c0f1aef6c775
:
21300000
-
a55d21040be77c9449a55ef7cd89ff1e
:
21300000
-
a55d21040be77c9449a55ef7cd89ff1e
:
21300000
-
c35afa04c123f974f8b61677d55c6ee7
:
21300000
-
c35afa04c123f974f8b61677d55c6ee7
:
21300000
-
f51cae04dc114a34eb0f5765a668c831
:
21300000
-
f51cae04dc114a34eb0f5765a668c831
:
21300000
...
@@ -965,6 +966,7 @@ SpriteAtlas:
...
@@ -965,6 +966,7 @@ SpriteAtlas:
-
{
fileID
:
21300000
,
guid
:
1c67dcd331aba654c9bd5bf1cb62e9b6
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
1c67dcd331aba654c9bd5bf1cb62e9b6
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
74c89dd3140caaf41822b2dfb3c41e3e
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
74c89dd3140caaf41822b2dfb3c41e3e
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
79c360e3cce6f9543bbc1fcd0ef1820b
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
79c360e3cce6f9543bbc1fcd0ef1820b
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
fc0712e351423bb42b56c0f1aef6c775
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
a55d21040be77c9449a55ef7cd89ff1e
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
a55d21040be77c9449a55ef7cd89ff1e
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
c35afa04c123f974f8b61677d55c6ee7
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
c35afa04c123f974f8b61677d55c6ee7
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
f51cae04dc114a34eb0f5765a668c831
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
f51cae04dc114a34eb0f5765a668c831
,
type
:
3
}
...
@@ -1695,6 +1697,7 @@ SpriteAtlas:
...
@@ -1695,6 +1697,7 @@ SpriteAtlas:
-
_images_chain_01
-
_images_chain_01
-
GUI_T_Icon1_Counter_SUMMON
-
GUI_T_Icon1_Counter_SUMMON
-
GUI_DeckEdit_FilterDialog_Icon_Category
-
GUI_DeckEdit_FilterDialog_Icon_Category
-
GUI_T_Icon_Pool_6
-
tex_IconLink1
-
tex_IconLink1
-
GUI_CommonButtonAddDeck_Icon
-
GUI_CommonButtonAddDeck_Icon
-
ChainNumSet_6
-
ChainNumSet_6
...
...
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