diff --git a/Assets/MyGame/Scripts/Net/APIManager.cs b/Assets/MyGame/Scripts/Net/APIManager.cs
index 0b7b33583..b04961661 100644
--- a/Assets/MyGame/Scripts/Net/APIManager.cs
+++ b/Assets/MyGame/Scripts/Net/APIManager.cs
@@ -316,7 +316,7 @@ namespace Assets.MyGame.Scripts.Net
var ut = res.data as UserToken;
if (ut != null) token = ut.token;
#if UNITY_EDITOR
- Debug.Log("微信登录成功 Token" + token);
+ Debug.Log("登录成功 Token" + token);
#endif
diff --git a/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab b/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab
index 590a7f703..1e00dfc40 100644
--- a/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab
+++ b/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab
@@ -143,15 +143,14 @@ MonoBehaviour:
m_text: 11
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
- m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
- type: 2}
+ m_sharedMaterial: {fileID: 2100000, guid: b2c0aeadb94f95f4ca5eadff73b01634, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4278255380
- m_fontColor: {r: 0.077782035, g: 1, b: 0, a: 1}
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -168,15 +167,15 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 35.04
- m_fontSizeBase: 35.04
+ m_fontSize: 25
+ m_fontSizeBase: 25
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 4
- m_VerticalAlignment: 1024
+ m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
@@ -732,6 +731,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 9102294478402522762}
- {fileID: 6049636880704188291}
- {fileID: 4712785516029935978}
m_Father: {fileID: 4887630288584091799}
@@ -769,7 +769,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 698df028996d4c14dace6f08d1aa8452, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 3601e14463d57d048a660d705305cb79, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -1004,8 +1004,8 @@ RectTransform:
m_GameObject: {fileID: 2256120632316597695}
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_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
+ m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 3066473336798849514}
- {fileID: 2317508501387410268}
@@ -1214,6 +1214,81 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2451378010001198535
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7691992234267363685}
+ - component: {fileID: 7549432703612595361}
+ - component: {fileID: 807432808044865854}
+ m_Layer: 0
+ m_Name: SD (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7691992234267363685
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2451378010001198535}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.95, y: 0.95, z: 0.95}
+ m_ConstrainProportionsScale: 1
+ m_Children: []
+ m_Father: {fileID: 2317508501387410268}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0}
+ m_AnchorMax: {x: 0.5, y: 0}
+ m_AnchoredPosition: {x: 0, y: 45.5}
+ m_SizeDelta: {x: 91, y: 91}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7549432703612595361
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2451378010001198535}
+ m_CullTransparentMesh: 1
+--- !u!114 &807432808044865854
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2451378010001198535}
+ 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: a8cffcf98a0b03e44a8cf273c48afcea, 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 &2504611181965863846
GameObject:
m_ObjectHideFlags: 0
@@ -1907,6 +1982,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 3780092583607516872}
- {fileID: 7064753003627587251}
- {fileID: 7838438334751578096}
m_Father: {fileID: 4887630288584091799}
@@ -1944,7 +2020,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 7ed126ca770e0db428d05a7901ad2c28, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 3601e14463d57d048a660d705305cb79, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2033,6 +2109,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 2666127268821536132}
- {fileID: 5007852520857134086}
m_Father: {fileID: 4887630288584091799}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2069,7 +2146,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 37b1b03b88380bc4093dbcc7ecd7a064, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 3601e14463d57d048a660d705305cb79, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2209,6 +2286,81 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3406684503128084143
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2666127268821536132}
+ - component: {fileID: 614025526911807807}
+ - component: {fileID: 9032043479467498162}
+ m_Layer: 0
+ m_Name: JG (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2666127268821536132
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3406684503128084143}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.95, y: 0.95, z: 0.95}
+ m_ConstrainProportionsScale: 1
+ m_Children: []
+ m_Father: {fileID: 3066473336798849514}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0}
+ m_AnchorMax: {x: 0.5, y: 0}
+ m_AnchoredPosition: {x: -0.000030517578, y: 45.5}
+ m_SizeDelta: {x: 91, y: 91}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &614025526911807807
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3406684503128084143}
+ m_CullTransparentMesh: 1
+--- !u!114 &9032043479467498162
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3406684503128084143}
+ 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: 37b1b03b88380bc4093dbcc7ecd7a064, 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 &3507860055950491510
GameObject:
m_ObjectHideFlags: 0
@@ -2677,6 +2829,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 7691992234267363685}
- {fileID: 670606204282681450}
m_Father: {fileID: 4887630288584091799}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2713,7 +2866,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: a8cffcf98a0b03e44a8cf273c48afcea, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 3601e14463d57d048a660d705305cb79, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -3697,6 +3850,81 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &6403645202956704703
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 9102294478402522762}
+ - component: {fileID: 635463759681630186}
+ - component: {fileID: 6850176890403825696}
+ m_Layer: 0
+ m_Name: BZ (3)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &9102294478402522762
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6403645202956704703}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.95, y: 0.95, z: 0.95}
+ m_ConstrainProportionsScale: 1
+ m_Children: []
+ m_Father: {fileID: 8268002276817246579}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &635463759681630186
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6403645202956704703}
+ m_CullTransparentMesh: 1
+--- !u!114 &6850176890403825696
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6403645202956704703}
+ 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: 698df028996d4c14dace6f08d1aa8452, type: 3}
+ m_Type: 3
+ 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 &6463026315962927218
GameObject:
m_ObjectHideFlags: 0
@@ -4183,6 +4411,81 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
+--- !u!1 &7035262963804364155
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3780092583607516872}
+ - component: {fileID: 2585422196654877768}
+ - component: {fileID: 3628234285412126374}
+ m_Layer: 0
+ m_Name: BF (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3780092583607516872
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7035262963804364155}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.95, y: 0.95, z: 0.95}
+ m_ConstrainProportionsScale: 1
+ m_Children: []
+ m_Father: {fileID: 7069774063767299635}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2585422196654877768
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7035262963804364155}
+ m_CullTransparentMesh: 1
+--- !u!114 &3628234285412126374
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7035262963804364155}
+ 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: 7ed126ca770e0db428d05a7901ad2c28, type: 3}
+ m_Type: 3
+ 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 &7188745933962646307
GameObject:
m_ObjectHideFlags: 0
@@ -5823,15 +6126,14 @@ MonoBehaviour:
m_text: 11
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
- m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
- type: 2}
+ m_sharedMaterial: {fileID: 2100000, guid: b2c0aeadb94f95f4ca5eadff73b01634, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4278255380
- m_fontColor: {r: 0.077782035, g: 1, b: 0, a: 1}
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -5848,15 +6150,15 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 35.04
- m_fontSizeBase: 35.04
+ m_fontSize: 25
+ m_fontSizeBase: 25
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 4
- m_VerticalAlignment: 1024
+ m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
diff --git a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
index 249af88b6..2caf57d46 100644
--- a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
+++ b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
@@ -2298,11 +2298,19 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
}
}
- /// bot 进场时初始化运行时状态
+ ///
+ /// bot 进场时初始化运行时状态。
+ /// 按流程图:进场金币 / 入场限制金币 → 判断倍数等级 → 在对应档位区间随机选一个初始档位。
+ /// 这样多个 bot 即使进场金币相同(例如都是 1000),初始炮倍也会不一样。
+ ///
private void InitBotRuntimeState(SitPosData sit, long entryGold)
{
var cfg = GameManager.Instance.botConfig;
- int initIdx = cfg != null && cfg.multiplier != null ? cfg.multiplier.initialLevelIndex : 0;
+ int cfgInitIdx = cfg != null && cfg.multiplier != null ? cfg.multiplier.initialLevelIndex : 0;
+
+ // ⭐ 按流程图:识别进场金币是入场限制金币的多少倍 → 判断等级 → 区间内随机选初始档位
+ int count = GetPaoBeiCount();
+ int initIdx = CalcBotInitialLevelIndex(entryGold, count, cfg, cfgInitIdx);
var s = new BotRuntimeState
{
@@ -2319,6 +2327,76 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
ApplyBotLevelIndex(sit, initIdx);
}
+ ///
+ /// 按进场金币/入场限制金币的倍数,在对应档位区间内随机选一个初始档位。
+ /// 倍数越高,初始档位区间越高;区间内随机,保证多个 bot 即使金币相同炮倍也不同。
+ /// 读不到 roomGoldLimit 或档位不足时,降级用 cfgInitIdx + 随机偏移。
+ ///
+ private int CalcBotInitialLevelIndex(long entryGold, int count, BotConfig cfg, int cfgInitIdx)
+ {
+ if (count <= 1) return Mathf.Max(0, cfgInitIdx);
+
+ // 配置允许的档位范围 [minIdx, maxIdx]
+ int minIdx = Mathf.Max(0, cfg != null && cfg.multiplier != null ? cfg.multiplier.minLevelIndex : 0);
+ int maxIdx = cfg != null && cfg.multiplier != null && cfg.multiplier.maxLevelIndex >= 0
+ ? Mathf.Min(cfg.multiplier.maxLevelIndex, count - 1)
+ : count - 1;
+ if (maxIdx < minIdx) maxIdx = minIdx;
+ if (maxIdx <= minIdx) return minIdx;
+
+ // 读取当前房间的入场金币限制
+ int roomGoldLimit = GetCurrentRoomGoldLimit();
+ if (roomGoldLimit <= 0 || entryGold <= 0)
+ {
+ // 读不到限制 → 在 [minIdx, maxIdx] 全区间随机
+ return Random.Range(minIdx, maxIdx + 1);
+ }
+
+ // ratio = 进场金币 / 入场限制金币
+ float ratio = (float)entryGold / roomGoldLimit;
+ int span = maxIdx - minIdx;
+
+ // 根据 ratio 划分三档区间:低(<1) / 中(1~2) / 高(>2)
+ int lo, hi;
+ if (ratio < 1f)
+ {
+ lo = minIdx;
+ hi = minIdx + Mathf.Max(0, span / 3);
+ }
+ else if (ratio < 2f)
+ {
+ lo = minIdx + Mathf.Max(0, span / 3);
+ hi = minIdx + Mathf.Max(0, span * 2 / 3);
+ }
+ else
+ {
+ lo = minIdx + Mathf.Max(0, span * 2 / 3);
+ hi = maxIdx;
+ }
+ if (lo > hi) lo = hi;
+ // 在 [lo, hi] 区间内随机选一个档位
+ return Random.Range(lo, hi + 1);
+ }
+
+ /// 获取当前房间的入场金币限制(用于 bot 进场按金币倍数判断初始档位)
+ private int GetCurrentRoomGoldLimit()
+ {
+ var roomData = GameManager.Instance?.gameData?.currRoomData;
+ if (roomData == null) return 0;
+ int t = roomData.gameType;
+ int l = roomData.roomLevel;
+ var configs = GameManager.Instance?.gameConfig?.roomConfigs;
+ if (configs != null)
+ {
+ foreach (var item in configs)
+ {
+ if (item.gameType == t && l == item.roomLevel)
+ return item.roomGoldLimit;
+ }
+ }
+ return 0;
+ }
+
/// 获取 bot 运行时状态
private BotRuntimeState GetBotRuntimeState(SitPosData sit)
{
diff --git a/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab b/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab
index e1772616d..beaba030f 100644
--- a/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab
+++ b/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab
@@ -1,5 +1,80 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &181425172293745200
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8709879401096241164}
+ - component: {fileID: 4368169722429212385}
+ - component: {fileID: 1545050402281867397}
+ m_Layer: 0
+ m_Name: BZ (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8709879401096241164
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 181425172293745200}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.95, y: 0.95, z: 0.95}
+ m_ConstrainProportionsScale: 1
+ m_Children: []
+ m_Father: {fileID: 1082327747763755257}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0}
+ m_AnchorMax: {x: 0.5, y: 0}
+ m_AnchoredPosition: {x: -0, y: 45.5}
+ m_SizeDelta: {x: 91, y: 91}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4368169722429212385
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 181425172293745200}
+ m_CullTransparentMesh: 1
+--- !u!114 &1545050402281867397
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 181425172293745200}
+ 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: 698df028996d4c14dace6f08d1aa8452, type: 3}
+ m_Type: 3
+ 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 &533538331419413870
GameObject:
m_ObjectHideFlags: 0
@@ -337,6 +412,81 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &806662669439609837
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5405444490105855938}
+ - component: {fileID: 6401085817361967638}
+ - component: {fileID: 2632714734379493190}
+ m_Layer: 0
+ m_Name: JG (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5405444490105855938
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 806662669439609837}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.95, y: 0.95, z: 0.95}
+ m_ConstrainProportionsScale: 1
+ m_Children: []
+ m_Father: {fileID: 3062198352733159756}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0}
+ m_AnchorMax: {x: 0.5, y: 0}
+ m_AnchoredPosition: {x: -0.000030517578, y: 45.5}
+ m_SizeDelta: {x: 91, y: 91}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6401085817361967638
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 806662669439609837}
+ m_CullTransparentMesh: 1
+--- !u!114 &2632714734379493190
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 806662669439609837}
+ 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: 37b1b03b88380bc4093dbcc7ecd7a064, 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 &895848411451650985
GameObject:
m_ObjectHideFlags: 0
@@ -1651,6 +1801,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 5405444490105855938}
- {fileID: 1949529966753471768}
m_Father: {fileID: 46913393239263610}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1687,7 +1838,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 37b1b03b88380bc4093dbcc7ecd7a064, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 3601e14463d57d048a660d705305cb79, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2047,6 +2198,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 8263722724267867555}
- {fileID: 4765019141919890446}
- {fileID: 4624112360104282621}
m_Father: {fileID: 46913393239263610}
@@ -2084,7 +2236,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 7ed126ca770e0db428d05a7901ad2c28, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 3601e14463d57d048a660d705305cb79, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2210,15 +2362,14 @@ MonoBehaviour:
m_text: 11
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
- m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
- type: 2}
+ m_sharedMaterial: {fileID: 2100000, guid: b2c0aeadb94f95f4ca5eadff73b01634, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4278255380
- m_fontColor: {r: 0.077782035, g: 1, b: 0, a: 1}
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -2235,15 +2386,15 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 35.04
- m_fontSizeBase: 35.04
+ m_fontSize: 25
+ m_fontSizeBase: 25
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 4
- m_VerticalAlignment: 1024
+ m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
@@ -2384,6 +2535,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 8709879401096241164}
- {fileID: 1876885878060653517}
- {fileID: 847684972641035024}
m_Father: {fileID: 46913393239263610}
@@ -2421,7 +2573,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 698df028996d4c14dace6f08d1aa8452, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 3601e14463d57d048a660d705305cb79, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2853,6 +3005,81 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
+--- !u!1 &5231219637480778688
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5502710953979772597}
+ - component: {fileID: 4733429800902147662}
+ - component: {fileID: 2020763411252087935}
+ m_Layer: 0
+ m_Name: SD (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5502710953979772597
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5231219637480778688}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.95, y: 0.95, z: 0.95}
+ m_ConstrainProportionsScale: 1
+ m_Children: []
+ m_Father: {fileID: 7687807567704455831}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0}
+ m_AnchorMax: {x: 0.5, y: 0}
+ m_AnchoredPosition: {x: 0, y: 45.5}
+ m_SizeDelta: {x: 91, y: 91}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4733429800902147662
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5231219637480778688}
+ m_CullTransparentMesh: 1
+--- !u!114 &2020763411252087935
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5231219637480778688}
+ 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: a8cffcf98a0b03e44a8cf273c48afcea, 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 &5345918819539197142
GameObject:
m_ObjectHideFlags: 0
@@ -3146,15 +3373,14 @@ MonoBehaviour:
m_text: 11
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
- m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
- type: 2}
+ m_sharedMaterial: {fileID: 2100000, guid: b2c0aeadb94f95f4ca5eadff73b01634, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4278255380
- m_fontColor: {r: 0.077782035, g: 1, b: 0, a: 1}
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -3171,15 +3397,15 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 35.04
- m_fontSizeBase: 35.04
+ m_fontSize: 25
+ m_fontSizeBase: 25
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 4
- m_VerticalAlignment: 1024
+ m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
@@ -3970,6 +4196,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 5502710953979772597}
- {fileID: 3404005841273128009}
m_Father: {fileID: 46913393239263610}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4006,7 +4233,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: a8cffcf98a0b03e44a8cf273c48afcea, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 3601e14463d57d048a660d705305cb79, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -4183,8 +4410,8 @@ RectTransform:
m_GameObject: {fileID: 6646657068787545170}
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_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
+ m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 3062198352733159756}
- {fileID: 7687807567704455831}
@@ -5907,6 +6134,81 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &9019033054019127453
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8263722724267867555}
+ - component: {fileID: 8295182597409571713}
+ - component: {fileID: 7354630386625113626}
+ m_Layer: 0
+ m_Name: BF (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8263722724267867555
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9019033054019127453}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.95, y: 0.95, z: 0.95}
+ m_ConstrainProportionsScale: 1
+ m_Children: []
+ m_Father: {fileID: 7874687282952866983}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0}
+ m_AnchorMax: {x: 0.5, y: 0}
+ m_AnchoredPosition: {x: 0, y: 45.5}
+ m_SizeDelta: {x: 91, y: 91}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8295182597409571713
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9019033054019127453}
+ m_CullTransparentMesh: 1
+--- !u!114 &7354630386625113626
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9019033054019127453}
+ 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: 7ed126ca770e0db428d05a7901ad2c28, type: 3}
+ m_Type: 3
+ 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 &9123594718076803669
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JJJPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JJJPanel.cs
index af56e8e7b..7cd18905d 100644
--- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JJJPanel.cs
+++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JJJPanel.cs
@@ -29,7 +29,12 @@ public class UIHome_BY_JJJPanel : SubUIBase
APIRequestList.GetRelief((callback) =>
{
UIManager.Instance.ShowBoardError("救济金领取成功");
- RefreshPanel();
+ // 先同步用户数据（更新 reliefGoldCount 和 gold），再刷新面板
+ APIRequestList.GetUser(user =>
+ {
+ GameManager.Instance.UpdataUserData(user);
+ RefreshPanel();
+ });
});
});
}
diff --git a/Assets/UIResources/Home/首页/技能底座.png b/Assets/UIResources/Home/首页/技能底座.png
new file mode 100644
index 000000000..4e16f3c69
Binary files /dev/null and b/Assets/UIResources/Home/首页/技能底座.png differ
diff --git a/Assets/UIResources/Home/首页/技能底座.png.meta b/Assets/UIResources/Home/首页/技能底座.png.meta
new file mode 100644
index 000000000..cc797a8bf
--- /dev/null
+++ b/Assets/UIResources/Home/首页/技能底座.png.meta
@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: 3601e14463d57d048a660d705305cb79
+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: 3
+ 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: 3
+ 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: 3
+ buildTarget: iPhone
+ 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: 3
+ buildTarget: WebGL
+ 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: 3
+ 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
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant: