diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/2.5CurrentExplain.prefab b/Assets/MyGame/aa/UI/Game/ChineseChess/2.5CurrentExplain.prefab index fddfd35c4..026d35849 100644 --- a/Assets/MyGame/aa/UI/Game/ChineseChess/2.5CurrentExplain.prefab +++ b/Assets/MyGame/aa/UI/Game/ChineseChess/2.5CurrentExplain.prefab @@ -30,7 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1936051412412643767} + m_Father: {fileID: 6219655562392175546} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -363,7 +363,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6219655562392175546} - - {fileID: 7663124574089704634} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -458,6 +457,7 @@ RectTransform: - {fileID: 8379532117535856297} - {fileID: 3108680357442528748} - {fileID: 3046872614827101586} + - {fileID: 7663124574089704634} m_Father: {fileID: 1936051412412643767} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/3GameMain.prefab b/Assets/MyGame/aa/UI/Game/ChineseChess/3GameMain.prefab index 7ac0564db..b138f2318 100644 --- a/Assets/MyGame/aa/UI/Game/ChineseChess/3GameMain.prefab +++ b/Assets/MyGame/aa/UI/Game/ChineseChess/3GameMain.prefab @@ -499,9 +499,9 @@ RectTransform: - {fileID: 2242142554979419558} m_Father: {fileID: 6915003179490517050} 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: 190, y: 1.1} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -46, y: 1.1} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1221434324298895783 @@ -664,12 +664,12 @@ MonoBehaviour: btn_HuiQi: {fileID: 7736786247353194216} btn_SheZhi: {fileID: 1337329277101656982} btn_FanHuiDaTing: {fileID: 8119276241258304471} - tmp_Name_Bottom: {fileID: 394202182545534539} - tmp_CoinCount_Bottom: {fileID: 5805709281203068529} - img_Title_Bottom: {fileID: 5212885171862005544} - tmp_Name_Top: {fileID: 125596079223217066} - tmp_CoinCount_Top: {fileID: 5447871153868539989} - img_Title_Top: {fileID: 4433346702574016089} + tmp_Name_Bottom: {fileID: 125596079223217066} + tmp_CoinCount_Bottom: {fileID: 5447871153868539989} + img_Title_Bottom: {fileID: 4433346702574016089} + tmp_Name_Top: {fileID: 394202182545534539} + tmp_CoinCount_Top: {fileID: 5805709281203068529} + img_Title_Top: {fileID: 5212885171862005544} --- !u!1 &3454273065383728345 GameObject: m_ObjectHideFlags: 0 @@ -1082,8 +1082,8 @@ RectTransform: 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: -183, y: -478} - m_SizeDelta: {x: 236, y: 94} + m_AnchoredPosition: {x: -159.23077, y: -478} + m_SizeDelta: {x: 300, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &185177556754811928 CanvasRenderer: @@ -1114,7 +1114,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 32adbc79a13f51f4d9303f7ea7b52c5a, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1674,9 +1674,9 @@ RectTransform: - {fileID: 5819403634889141134} m_Father: {fileID: 1036674348043121168} 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: -19.49997, y: -30.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 105.50003, y: -30.5} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3332333278435428888 @@ -1959,9 +1959,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 1036674348043121168} 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: 33, y: 9.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 158, y: 9.5} m_SizeDelta: {x: 106, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4989037203738116551 @@ -2019,8 +2019,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 28 + m_fontSizeBase: 28 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2252,8 +2252,8 @@ RectTransform: 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: 173.99997, y: 484} - m_SizeDelta: {x: 236, y: 94} + m_AnchoredPosition: {x: 164.12357, y: 484} + m_SizeDelta: {x: 300, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7491550694752821543 CanvasRenderer: @@ -2284,7 +2284,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: d789e7251462997428d7ebfe16224b44, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2534,9 +2534,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6915003179490517050} 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: -36.6, y: 10.6} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 81.4, y: 10.6} m_SizeDelta: {x: 106, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5114861402199646119 @@ -2594,8 +2594,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 28 + m_fontSizeBase: 28 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2998,9 +2998,9 @@ RectTransform: - {fileID: 1851657901559674999} m_Father: {fileID: 6915003179490517050} 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: -89.099945, y: -29.400024} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 28.900055, y: 17.599976} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3847391261964254190 diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/ChineseChessMainPanel.cs b/Assets/MyGame/aa/UI/Game/ChineseChess/ChineseChessMainPanel.cs index 72e621ac6..1c491cf5b 100644 --- a/Assets/MyGame/aa/UI/Game/ChineseChess/ChineseChessMainPanel.cs +++ b/Assets/MyGame/aa/UI/Game/ChineseChess/ChineseChessMainPanel.cs @@ -31,6 +31,31 @@ public class ChineseChessMainPanel : GameMainPanel_Base public TextMeshProUGUI tmp_CoinCount_Top; public Image img_Title_Top; + public static string FormatGold(long gold) + { + if (gold >= 100000000) + { + // 截取两位小数，不四舍五入 + long yi = gold / 100000000; + long remainder = gold % 100000000; + long decimals = remainder * 100 / 100000000; + if (decimals > 0) + return $"{yi}.{decimals:D2}亿"; + return $"{yi}亿"; + } + if (gold >= 10000) + { + // 截取两位小数，不四舍五入 + long wan = gold / 10000; + long remainder = gold % 10000; + long decimals = remainder * 100 / 10000; // 两位小数 + if (decimals > 0) + return $"{wan}.{decimals:D2}万"; + return $"{wan}万"; + } + return gold.ToString(); + } + public void StartGame(string msg) { @@ -44,8 +69,8 @@ public class ChineseChessMainPanel : GameMainPanel_Base case 1: { //等待加入 文字显示 - tmp_Name_Top.text = ""; - tmp_CoinCount_Top.text = "金币：" + ""; + tmp_Name_Top.text = "ID:"; + tmp_CoinCount_Top.text = ""; img_Title_Top.gameObject.SetActive(false); } break; @@ -79,8 +104,8 @@ public class ChineseChessMainPanel : GameMainPanel_Base { if (item.userId == GameManager.Instance.user.BaseInfo.number) { - tmp_Name_Bottom.text = item.userId; - tmp_CoinCount_Bottom.text = "金币：" + item.gold.ToString(); + tmp_Name_Bottom.text ="ID:" + item.userId; + tmp_CoinCount_Bottom.text = FormatGold(item.gold); StartCoroutine(item.DownTexture2d((t2d) => { img_Title_Bottom.sprite = Sprite.Create(t2d, new Rect(0, 0, t2d.width, t2d.height), new Vector2(0.5f, 0.5f)); @@ -88,8 +113,8 @@ public class ChineseChessMainPanel : GameMainPanel_Base } else { - tmp_Name_Top.text = item.userId; - tmp_CoinCount_Top.text = "金币：" + item.gold.ToString(); + tmp_Name_Top.text ="ID:" + item.userId; + tmp_CoinCount_Top.text = FormatGold(item.gold); StartCoroutine(item.DownTexture2d((t2d) => { img_Title_Top.sprite = Sprite.Create(t2d, new Rect(0, 0, t2d.width, t2d.height), new Vector2(0.5f, 0.5f)); diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/He.prefab b/Assets/MyGame/aa/UI/Game/ChineseChess/He.prefab index 5e5aa1650..b588fcb14 100644 --- a/Assets/MyGame/aa/UI/Game/ChineseChess/He.prefab +++ b/Assets/MyGame/aa/UI/Game/ChineseChess/He.prefab @@ -1025,7 +1025,6 @@ GameObject: m_Component: - component: {fileID: 8299892419348715426} - component: {fileID: 9062137769780791438} - - component: {fileID: 6587368610145850833} m_Layer: 5 m_Name: "\u77E9\u5F62 1 \u62F7\u8D1D 15" m_TagString: Untagged @@ -1063,36 +1062,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4490161938676631942} m_CullTransparentMesh: 1 ---- !u!114 &6587368610145850833 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4490161938676631942} - 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: 31627c1bddc983a49badf313396029fd, 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 &4534747003562472996 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessSetCoin.cs b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessSetCoin.cs index 9b3d2480d..a6c38d9a1 100644 --- a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessSetCoin.cs +++ b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessSetCoin.cs @@ -1,4 +1,4 @@ -using Assets.MyGame.Scripts.Net.WebResponses.ChineseChess; +using Assets.MyGame.Scripts.Net.WebResponses.ChineseChess; using System; using System.Collections; using System.Collections.Generic; @@ -22,7 +22,7 @@ public class UIChineseChessSetCoin : SubUIBase if (args != null) { var v = (ChineseChessGameClassList.ChessGameRoom)args; - tmp_CurrGlod.text = GameManager.Instance.user.assets.gold.ToString(); + tmp_CurrGlod.text = ChineseChessMainPanel.FormatGold(GameManager.Instance.user.assets.gold); btn_Enter.onClick.RemoveAllListeners(); btn_Enter.onClick.AddListener(() => { diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/Win.prefab b/Assets/MyGame/aa/UI/Game/ChineseChess/Win.prefab index 84c231025..05660e5f5 100644 --- a/Assets/MyGame/aa/UI/Game/ChineseChess/Win.prefab +++ b/Assets/MyGame/aa/UI/Game/ChineseChess/Win.prefab @@ -1096,7 +1096,6 @@ GameObject: m_Component: - component: {fileID: 7195083326803644191} - component: {fileID: 6764195483667481888} - - component: {fileID: 8085443618088235599} m_Layer: 5 m_Name: "\u77E9\u5F62 1 \u62F7\u8D1D 15" m_TagString: Untagged @@ -1134,36 +1133,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5125300181237001618} m_CullTransparentMesh: 1 ---- !u!114 &8085443618088235599 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5125300181237001618} - 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: 31627c1bddc983a49badf313396029fd, 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 &5244469125280727393 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/defeated.prefab b/Assets/MyGame/aa/UI/Game/ChineseChess/defeated.prefab index d2fe723a1..9663e9008 100644 --- a/Assets/MyGame/aa/UI/Game/ChineseChess/defeated.prefab +++ b/Assets/MyGame/aa/UI/Game/ChineseChess/defeated.prefab @@ -296,7 +296,6 @@ GameObject: m_Component: - component: {fileID: 5105473149810150829} - component: {fileID: 2628137264841433522} - - component: {fileID: 8025364506517241308} m_Layer: 5 m_Name: "\u77E9\u5F62 1 \u62F7\u8D1D 15 (1)" m_TagString: Untagged @@ -334,36 +333,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1734882608727550087} m_CullTransparentMesh: 1 ---- !u!114 &8025364506517241308 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1734882608727550087} - 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: 31627c1bddc983a49badf313396029fd, 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 &2108828741725203316 GameObject: m_ObjectHideFlags: 0 @@ -1165,7 +1134,6 @@ GameObject: m_Component: - component: {fileID: 8993111372196350136} - component: {fileID: 2072138993253472467} - - component: {fileID: 1827412991163666997} - component: {fileID: 724584514142528773} m_Layer: 5 m_Name: defeated @@ -1202,36 +1170,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5673958202430460052} m_CullTransparentMesh: 1 ---- !u!114 &1827412991163666997 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5673958202430460052} - 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: 4a1c9a2cc69d41345a54beb07ebaab22, 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!114 &724584514142528773 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/UIResources/Game/ChineseChess/象棋对战/txk 1.png.meta b/Assets/UIResources/Game/ChineseChess/象棋对战/txk 1.png.meta index 5e43fbb73..c06aa3e0a 100644 --- a/Assets/UIResources/Game/ChineseChess/象棋对战/txk 1.png.meta +++ b/Assets/UIResources/Game/ChineseChess/象棋对战/txk 1.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 40, y: 0, z: 103, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -113,7 +113,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/UIResources/Game/ChineseChess/象棋对战/txk.png.meta b/Assets/UIResources/Game/ChineseChess/象棋对战/txk.png.meta index fccef33ce..643698302 100644 --- a/Assets/UIResources/Game/ChineseChess/象棋对战/txk.png.meta +++ b/Assets/UIResources/Game/ChineseChess/象棋对战/txk.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 99, y: 0, z: 38, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -113,7 +113,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: []