Commit 513b6fa4 authored by SherryChaos's avatar SherryChaos

CardInfoDetial show genesys point

parent ea10b916
...@@ -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>
......
...@@ -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)
......
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
......
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:
...@@ -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: []
......
...@@ -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
......
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