lzx 1 ngày trước cách đây
mục cha
commit
90fcf178de

+ 278 - 31
Assets/Res/UI/DaoYouPanel/DaoYouInfoPanel.prefab

@@ -191,6 +191,7 @@ GameObject:
   - component: {fileID: 7861361364591785620}
   - component: {fileID: 2592117225002795013}
   - component: {fileID: 599767346031559948}
+  - component: {fileID: 1029725069993258739}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Fill
@@ -210,7 +211,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 7976174467344622624}
   m_Father: {fileID: 8745201384845463338}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -269,6 +271,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &1029725069993258739
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 68691510019113155}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1 &73317371746886061
 GameObject:
   m_ObjectHideFlags: 0
@@ -798,9 +813,9 @@ RectTransform:
   - {fileID: 5422397682402119819}
   m_Father: {fileID: 149326191559001960}
   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.0013685, y: 110.72443}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0.0013685, y: 664.7244}
   m_SizeDelta: {x: 750, y: 886.7512}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4946174474217477249
@@ -1367,7 +1382,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: 150, y: -95.28037}
+  m_AnchoredPosition: {x: 150, y: -96}
   m_SizeDelta: {x: 300, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8219955351092879517
@@ -2315,10 +2330,10 @@ RectTransform:
   - {fileID: 5836252166898464303}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0.6822316}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 1108.2}
+  m_SizeDelta: {x: 750, y: 0.19995117}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &399209848103943354
 CanvasRenderer:
@@ -3029,7 +3044,7 @@ RectTransform:
   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_AnchoredPosition: {x: 0, y: 0.000061035156}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8486095640457923278
@@ -3734,6 +3749,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &3245384902160382418
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7713905150900871881}
+  - component: {fileID: 4326224566549432808}
+  - component: {fileID: 7148053329663934994}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Select
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7713905150900871881
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3245384902160382418}
+  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: 5836252166898464303}
+  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: -240.5305, y: 239.78943}
+  m_SizeDelta: {x: 110, y: 110}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4326224566549432808
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3245384902160382418}
+  m_CullTransparentMesh: 1
+--- !u!114 &7148053329663934994
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3245384902160382418}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.1573993, g: 1, b: 0, 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: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_juxing_fang_hujiao
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: a168dc0f25a20a224c1e318163e47f34
+  imageH: 110
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3269525500137286496
 GameObject:
   m_ObjectHideFlags: 0
@@ -4435,9 +4539,10 @@ GameObject:
   - component: {fileID: 1947956645310402617}
   - component: {fileID: 234858011452441900}
   - component: {fileID: 2761026854192904416}
+  - component: {fileID: 7246171821947695717}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage (1)
+  m_Name: NameRoot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -4514,6 +4619,21 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &7246171821947695717
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3600457664988807249}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &3641049731285540800
 GameObject:
   m_ObjectHideFlags: 0
@@ -4878,10 +4998,10 @@ RectTransform:
   - {fileID: 6015065027993439653}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.6822316}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.000061035156}
-  m_SizeDelta: {x: 750, y: 515.78}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: -1.2199707}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &2133170375772490070
 CanvasRenderer:
@@ -5395,6 +5515,7 @@ RectTransform:
   - {fileID: 8564065976731006734}
   - {fileID: 5559529533166581890}
   - {fileID: 1744558580528090098}
+  - {fileID: 7713905150900871881}
   - {fileID: 774778019378967937}
   - {fileID: 6714861516730245370}
   - {fileID: 3298569070802226294}
@@ -6324,6 +6445,95 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 1
+--- !u!1 &5148372826667046155
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7976174467344622624}
+  - component: {fileID: 8229155369495215477}
+  - component: {fileID: 1051250069218886472}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7976174467344622624
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5148372826667046155}
+  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: 7861361364591785620}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -100.01, y: 0.00000047683716}
+  m_SizeDelta: {x: 100, y: 22}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &8229155369495215477
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5148372826667046155}
+  m_CullTransparentMesh: 1
+--- !u!114 &1051250069218886472
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5148372826667046155}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.8748327, b: 0, 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: 0}
+  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
+  _icon_name: dec_jianbian_tiao2
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: a168dc0f25a20a224c1e318163e47f34
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &5276004169157575716
 GameObject:
   m_ObjectHideFlags: 0
@@ -6823,7 +7033,7 @@ GameObject:
   - component: {fileID: 7337676148118970194}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: BtnRoot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -6845,10 +7055,10 @@ RectTransform:
   - {fileID: 8584488876590990322}
   m_Father: {fileID: 149326191559001960}
   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: -402.9}
-  m_SizeDelta: {x: 750, y: 97.85}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 151.1}
+  m_SizeDelta: {x: 750, y: 97.850006}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6379878544651680598
 CanvasRenderer:
@@ -7280,9 +7490,10 @@ GameObject:
   - component: {fileID: 1418411134778499142}
   - component: {fileID: 8931983443319189626}
   - component: {fileID: 6691099693272610869}
+  - component: {fileID: 6301324928613682989}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: JingjieRoot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -7359,6 +7570,21 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &6301324928613682989
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5970111009504445614}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &6048444918962297173
 GameObject:
   m_ObjectHideFlags: 0
@@ -7657,9 +7883,9 @@ RectTransform:
   - {fileID: 3093436952733600723}
   m_Father: {fileID: 149326191559001960}
   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.0017529, y: 110.72}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0.0017529, y: 664.72}
   m_SizeDelta: {x: 750, y: 886.75}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6963037805459712225
@@ -7813,8 +8039,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: 273.6597, y: -24.673}
-  m_SizeDelta: {x: 128.3606, y: 32.512}
+  m_AnchoredPosition: {x: 208.07814, y: 5.6}
+  m_SizeDelta: {x: 224.3377, y: 32.512}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &686079759204038695
 CanvasRenderer:
@@ -7846,18 +8072,18 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 24
+    m_FontSize: 30
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 35/100
+  m_Text: 7000.1/8000
 --- !u!1 &6741654833168219823
 GameObject:
   m_ObjectHideFlags: 0
@@ -7869,9 +8095,10 @@ GameObject:
   - component: {fileID: 6226328605185051319}
   - component: {fileID: 1916760802098350641}
   - component: {fileID: 6695956009848624283}
+  - component: {fileID: 7282711932981084345}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage (3)
+  m_Name: MapRoot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -7949,6 +8176,21 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &7282711932981084345
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6741654833168219823}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &6856112115365969682
 GameObject:
   m_ObjectHideFlags: 0
@@ -8175,7 +8417,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -72.6, y: 15.344986}
+  m_AnchoredPosition: {x: -72.600006, y: 15.344971}
   m_SizeDelta: {x: 301, y: 63}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &5830593562695430765
@@ -9144,8 +9386,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: 0, y: -25.6}
-  m_SizeDelta: {x: 413.1909, y: 26.218}
+  m_AnchoredPosition: {x: 57.348297, y: -25.6}
+  m_SizeDelta: {x: 527.8875, y: 26.218}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1514700554931142703
 MonoBehaviour:
@@ -10500,6 +10742,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_Select
+    gameObject: {fileID: 7148053329663934994}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1001 &2591569182256414571
 PrefabInstance:

+ 7 - 5
Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -208,6 +208,7 @@ public class PlayerManager : Singleton<PlayerManager>
 
 
             int count = Random.Range(0, daoYouDatas.Count + 1);
+            count = count > gameConstantConfig.daoyouMaxshowupNum ? gameConstantConfig.daoyouMaxshowupNum : count;
             List<AccountFileInfo.DaoYouGuaiJiData> daoyou = new List<AccountFileInfo.DaoYouGuaiJiData>();
             for (int i = 0; i < count; i++)
             {
@@ -405,7 +406,7 @@ public class PlayerManager : Singleton<PlayerManager>
                 int randomValue1 = Random.Range(0, 101);
                 LogTool.Log("道友随机怪率:" + randomValue1 + " 比例:" + bl);
                 List<AccountFileInfo.ItemData> itemDatas = new List<AccountFileInfo.ItemData>();
-                if (randomValue1 >= bl)
+                if (randomValue1 < bl)
                 {
                     for (var i = 1; i < daoyouModelConfig.guajiBuffID.Length; i++)
                     {
@@ -618,7 +619,7 @@ public class PlayerManager : Singleton<PlayerManager>
         {
             int miao = AccountFileInfo.Instance.playerData.QiankundaiDropTimer + exitMiao;
             miao = miao >= gameConstantConfig.qiankundaiMaxTime
-                ? gameConstantConfig.qiankundaiMaxTime -  AccountFileInfo.Instance.playerData.QiankundaiDropTimer
+                ? gameConstantConfig.qiankundaiMaxTime - AccountFileInfo.Instance.playerData.QiankundaiDropTimer
                 : exitMiao;
             AccountFileInfo.Instance.playerData.QiankundaiDropTimer += miao;
             for (int i = 0; i < miao; i++)
@@ -641,7 +642,7 @@ public class PlayerManager : Singleton<PlayerManager>
                 todayResidueShenShi =
                     AccountFileInfo.Instance.playerData.divineSensePoint + todayResidueShenShi >
                     heroPowerUpConfig.ShenshiMax
-                        ? heroPowerUpConfig.ShenshiMax -AccountFileInfo.Instance.playerData.divineSensePoint 
+                        ? heroPowerUpConfig.ShenshiMax - AccountFileInfo.Instance.playerData.divineSensePoint
                         : todayResidueShenShi;
 
                 miao = (int)(todayResidueShenShi / gameConstantConfig.shenshiPointRecSPD[1]);
@@ -649,7 +650,8 @@ public class PlayerManager : Singleton<PlayerManager>
                 miao = miao > exitMiao ? exitMiao : miao;
 
                 float todayResidue = gameConstantConfig.shenshiPointRecSPD[1] * miao;
-                todayResidue = todayResidue + AccountFileInfo.Instance.playerData.divineSensePoint > heroPowerUpConfig.ShenshiMax
+                todayResidue = todayResidue + AccountFileInfo.Instance.playerData.divineSensePoint >
+                               heroPowerUpConfig.ShenshiMax
                     ? heroPowerUpConfig.ShenshiMax - AccountFileInfo.Instance.playerData.divineSensePoint
                     : todayResidue;
                 AccountFileInfo.Instance.playerData.todayDivineSensePoint += todayResidue;
@@ -662,7 +664,7 @@ public class PlayerManager : Singleton<PlayerManager>
                 float todaySs2 = gameConstantConfig.shenshiPointRecSPD[2] * residueExitMiao;
                 float allShenshi = todaySs2 + AccountFileInfo.Instance.playerData.divineSensePoint;
                 todaySs2 = allShenshi > heroPowerUpConfig.ShenshiMax
-                    ?  heroPowerUpConfig.ShenshiMax -allShenshi
+                    ? heroPowerUpConfig.ShenshiMax - allShenshi
                     : todaySs2;
                 AccountFileInfo.Instance.playerData.divineSensePoint += todaySs2;
             }

+ 13 - 1
Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -506,7 +506,7 @@ namespace Fort23.Mono
                         }
                     }
 
-                    if(!isHave)
+                    if (!isHave)
                         giveWidgetItems[0].OnPointerClick();
                 }
                 else
@@ -531,6 +531,13 @@ namespace Fort23.Mono
             }
 
             widgetItem1.InitWidget(widgetItem.itemInfo);
+            
+            Icon_Select.transform.SetParent(widgetItem.transform);
+            Icon_Select.transform.SetAsFirstSibling();
+            Icon_Select.transform.GetComponent<RectTransform>().anchoredPosition = Vector2.zero;
+            Icon_Select.gameObject.SetActive(true);
+            
+       
             daoyouGiftConfig = default;
 
             foreach (var giftConfig in daoyouGiftConfigs)
@@ -611,6 +618,11 @@ namespace Fort23.Mono
             Slider_Give.value = 0;
             Slider_Give.minValue = 0;
             Slider_Give.maxValue = 0;
+            
+            
+            Icon_Select.transform.SetParent(GiveGite.transform);
+            Icon_Select.gameObject.SetActive(false);
+            
 
             foreach (var giveWidgetItem in giveWidgetItems)
             {

+ 11 - 0
Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanelData.cs

@@ -426,6 +426,17 @@ namespace Fort23.Mono
 	      return _Btn_CiZuiHelp;
 	     }
 	   }
+	  private MyImage _Icon_Select;
+	  public MyImage Icon_Select
+	   {
+	   get{
+	      if (_Icon_Select == null)
+	       {
+	         _Icon_Select  = GetUIUnit<MyImage>("Icon_Select"); 
+	       }
+	      return _Icon_Select;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{