浏览代码

修改bug

lzx 1 周之前
父节点
当前提交
1b45e99b3b

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.08221996
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

+ 112 - 0
Assets/Res/UI/BoxPanel/GachaPanel.prefab

@@ -126,6 +126,102 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 86016722660470058}
   m_CullTransparentMesh: 1
+--- !u!1 &94299710562260747
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 122561143660322292}
+  - component: {fileID: 1026066119927368560}
+  - component: {fileID: 4078463886561274769}
+  - component: {fileID: 3993013486696930058}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Tips
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &122561143660322292
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 94299710562260747}
+  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: 5854966778653116823}
+  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: -598}
+  m_SizeDelta: {x: 0, y: -1560.9799}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1026066119927368560
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 94299710562260747}
+  m_CullTransparentMesh: 1
+--- !u!114 &4078463886561274769
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 94299710562260747}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 38
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u603B\u8BA1\uFF1A416"
+--- !u!114 &3993013486696930058
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 94299710562260747}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &203453357012749549
 GameObject:
   m_ObjectHideFlags: 0
@@ -250,6 +346,7 @@ RectTransform:
   - {fileID: 7854499311622563114}
   - {fileID: 9194368947421187015}
   - {fileID: 2574803626736627136}
+  - {fileID: 122561143660322292}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -527,6 +624,21 @@ MonoBehaviour:
     - gameObject: {fileID: 6301372275407792793}
     - gameObject: {fileID: 3514576898811181058}
     - gameObject: {fileID: 7676295276959900716}
+  - key: Text_Tips
+    gameObject: {fileID: 4078463886561274769}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8460248494035766006}
+    - gameObject: {fileID: 7583756930290804199}
+    - gameObject: {fileID: 8691601371041149407}
+    - gameObject: {fileID: 3161106526278752775}
+    - gameObject: {fileID: 983928321077698655}
+    - gameObject: {fileID: 4493318351616086192}
+    - gameObject: {fileID: 7833803437519831564}
+    - gameObject: {fileID: 6301372275407792793}
+    - gameObject: {fileID: 3514576898811181058}
+    - gameObject: {fileID: 7676295276959900716}
   isAssetBundle: 1
 --- !u!1 &694216056308444776
 GameObject:

+ 1 - 1
Assets/Res/UI/BoxPanel/WidgetItemType2.prefab

@@ -1148,7 +1148,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 58.41, y: -21.027552}
-  m_SizeDelta: {x: 0, y: 35.3449}
+  m_SizeDelta: {x: 49, y: 35.3449}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1507516687379950841
 CanvasRenderer:

+ 60 - 54
Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab

@@ -665,8 +665,8 @@ GameObject:
   - component: {fileID: 301218371617702124}
   - component: {fileID: 2251815705129355552}
   - component: {fileID: 8547480128435490556}
-  - component: {fileID: 8302120544150499690}
   - component: {fileID: 6113714825081615785}
+  - component: {fileID: 1568493399877136240}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -736,7 +736,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: x648
---- !u!114 &8302120544150499690
+--- !u!114 &6113714825081615785
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -745,13 +745,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 975401785670832517}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
-  m_EffectDistance: {x: 2, y: -2}
-  m_UseGraphicAlpha: 1
---- !u!114 &6113714825081615785
+  id: 10339
+--- !u!114 &1568493399877136240
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -760,10 +758,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 975401785670832517}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  id: 10339
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 10
 --- !u!1 &1035644628526415440
 GameObject:
   m_ObjectHideFlags: 0
@@ -868,8 +869,8 @@ GameObject:
   - component: {fileID: 8300671560803747450}
   - component: {fileID: 6489511897426837363}
   - component: {fileID: 8018608956383153944}
-  - component: {fileID: 2652679519094550969}
   - component: {fileID: 3041011865347631961}
+  - component: {fileID: 7670590166486466545}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -939,7 +940,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: x648
---- !u!114 &2652679519094550969
+--- !u!114 &3041011865347631961
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -948,13 +949,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 1050126008742067804}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
-  m_EffectDistance: {x: 2, y: -2}
-  m_UseGraphicAlpha: 1
---- !u!114 &3041011865347631961
+  id: 10343
+--- !u!114 &7670590166486466545
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -963,10 +962,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 1050126008742067804}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  id: 10343
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 10
 --- !u!1 &1113902231855745381
 GameObject:
   m_ObjectHideFlags: 0
@@ -1294,8 +1296,8 @@ GameObject:
   - component: {fileID: 7223733148101126973}
   - component: {fileID: 6835024070903822679}
   - component: {fileID: 5443285785340945435}
-  - component: {fileID: 8641416447764666386}
   - component: {fileID: 7425153803128017848}
+  - component: {fileID: 5779766345448379073}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -1365,7 +1367,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: x648
---- !u!114 &8641416447764666386
+--- !u!114 &7425153803128017848
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1374,13 +1376,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 1497394059788302979}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
-  m_EffectDistance: {x: 2, y: -2}
-  m_UseGraphicAlpha: 1
---- !u!114 &7425153803128017848
+  id: 10342
+--- !u!114 &5779766345448379073
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1389,10 +1389,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 1497394059788302979}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  id: 10342
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 10
 --- !u!1 &1501700663442146284
 GameObject:
   m_ObjectHideFlags: 0
@@ -4017,8 +4020,8 @@ GameObject:
   - component: {fileID: 5020014383864394206}
   - component: {fileID: 7232477341919064873}
   - component: {fileID: 3169445059514101149}
-  - component: {fileID: 2911314765555782532}
   - component: {fileID: 2435785671868476975}
+  - component: {fileID: 6168351925599371341}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -4088,7 +4091,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: x648
---- !u!114 &2911314765555782532
+--- !u!114 &2435785671868476975
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4097,13 +4100,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 8211786058160201744}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
-  m_EffectDistance: {x: 2, y: -2}
-  m_UseGraphicAlpha: 1
---- !u!114 &2435785671868476975
+  id: 10344
+--- !u!114 &6168351925599371341
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4112,10 +4113,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 8211786058160201744}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  id: 10344
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 10
 --- !u!1 &8241209294658023724
 GameObject:
   m_ObjectHideFlags: 0
@@ -4127,8 +4131,8 @@ GameObject:
   - component: {fileID: 7189780938348220856}
   - component: {fileID: 2019571704989516606}
   - component: {fileID: 2347753902682301191}
-  - component: {fileID: 7379481711500463364}
   - component: {fileID: 6837790045357976236}
+  - component: {fileID: 8574818621940364090}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -4198,7 +4202,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: x648
---- !u!114 &7379481711500463364
+--- !u!114 &6837790045357976236
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4207,13 +4211,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 8241209294658023724}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
-  m_EffectDistance: {x: 2, y: -2}
-  m_UseGraphicAlpha: 1
---- !u!114 &6837790045357976236
+  id: 10340
+--- !u!114 &8574818621940364090
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4222,10 +4224,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 8241209294658023724}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  id: 10340
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 10
 --- !u!1 &8426370114494986623
 GameObject:
   m_ObjectHideFlags: 0
@@ -4688,8 +4693,8 @@ GameObject:
   - component: {fileID: 772713840367679477}
   - component: {fileID: 5887267035750045562}
   - component: {fileID: 584594056667099355}
-  - component: {fileID: 3656733740707354268}
   - component: {fileID: 7080381614908417301}
+  - component: {fileID: 4654886383691960012}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -4759,7 +4764,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: x648
---- !u!114 &3656733740707354268
+--- !u!114 &7080381614908417301
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4768,13 +4773,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 9097259295526567356}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
-  m_EffectDistance: {x: 2, y: -2}
-  m_UseGraphicAlpha: 1
---- !u!114 &7080381614908417301
+  id: 10341
+--- !u!114 &4654886383691960012
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4783,10 +4786,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 9097259295526567356}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  id: 10341
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 10
 --- !u!1 &9097704230371347564
 GameObject:
   m_ObjectHideFlags: 0

+ 29 - 14
Assets/Res/UI/XianTuLogPanel/EventMinLogWidget.prefab

@@ -100,6 +100,7 @@ GameObject:
   - component: {fileID: 4186854761324400044}
   - component: {fileID: 5251948896444246358}
   - component: {fileID: 1853759246892402300}
+  - component: {fileID: 7477824339643408650}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_MapName
@@ -119,14 +120,15 @@ 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: 5185917425366916462}
   m_Father: {fileID: 6164727708320999124}
   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: 561, y: -0.00026083}
-  m_SizeDelta: {x: 75.2749, y: 38.428}
-  m_Pivot: {x: 0, y: 0.5}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -35.799988, y: 0}
+  m_SizeDelta: {x: 0, y: 38.428}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &5251948896444246358
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -162,13 +164,27 @@ MonoBehaviour:
     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: "\u5317\u6D77"
+  m_Text: "\u5317\u6D77.\u79D8\u5883"
+--- !u!114 &7477824339643408650
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2892432335616484045}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &4111363363945168130
 GameObject:
   m_ObjectHideFlags: 0
@@ -200,13 +216,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6164727708320999124}
+  m_Father: {fileID: 4186854761324400044}
   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: -80, y: 1.5}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: -27.1, y: 0}
   m_SizeDelta: {x: 25, y: 26}
-  m_Pivot: {x: 1, y: 0.5}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6862860222882056267
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -292,7 +308,6 @@ RectTransform:
   m_Children:
   - {fileID: 625944845005079530}
   - {fileID: 4186854761324400044}
-  - {fileID: 5185917425366916462}
   - {fileID: 4889064071604139111}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 1 - 1
Assets/Res/UI/XianTuLogPanel/XianTuLogPanel.prefab

@@ -3153,7 +3153,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2541634502081460392, guid: 034392a467bb69a46b538612078936bc, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 126
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2541634502081460392, guid: 034392a467bb69a46b538612078936bc, type: 3}
       propertyPath: m_AnchoredPosition.x

+ 1 - 1
Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
+    - _pos: {r: -0.0000014305115, g: -5, b: -30, a: 0}
   m_BuildTextureStacks: []

+ 16 - 5
Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs

@@ -22,7 +22,7 @@ namespace Fort23.Mono
 
         private OpenBoxConfig _openBoxConfig;
 
-
+        private WidgetItemType2 widgetItem;
         private AccountFileInfo.SummonData SummonData;
 
 
@@ -67,12 +67,22 @@ namespace Fort23.Mono
                     ItemInfo itemInfo1 = new ItemInfo(itemInfo.itemID, (long)(itemInfo.count.Value * (beLv - 1)));
                     PlayerManager.Instance.BagController.AddItem(itemInfo1);
                 }
-                
-                foreach (var widgetItemType2 in widgetItems)
+
+                if (itemInfos.Count == 1)
                 {
-                    widgetItemType2.Play(beLv);
+                    widgetItem.Play(beLv);
+                }
+                else
+                {
+                    foreach (var widgetItemType2 in widgetItems)
+                    {
+                        widgetItemType2.Play(beLv);
+                    }
                 }
 
+
+                Text_Tips.text = $"已获得{beLv}倍奖励";
+                Text_Tips.gameObject.SetActive(true);
                 // UIManager.Instance.HideUIUIPanel<GachaPanel>();
             });
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel<GachaPanel>(); });
@@ -80,6 +90,7 @@ namespace Fort23.Mono
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
+            Text_Tips.gameObject.SetActive(false);
             itemInfos = uiData[0] as List<ItemInfo>;
             type = (int)uiData[1];
             _openBoxConfig = ConfigComponent.Instance.Get<OpenBoxConfig>((int)uiData[2]);
@@ -149,7 +160,7 @@ namespace Fort23.Mono
             {
                 for (var i = 0; i < itemInfos.Count; i++)
                 {
-                    WidgetItemType2 widgetItem =
+                    widgetItem =
                         await UIManager.Instance.CreateGComponentForObject<WidgetItemType2>(WidgetItemType2Gam, null);
                     widgetItem.InitWidget(itemInfos[i]);
                 }

+ 11 - 0
Assets/Scripts/GameUI/UI/BoxPanel/GachaPanelData.cs

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

+ 4 - 0
Assets/Scripts/GameUI/UI/XianTuLogPanel/EventLogWidget.cs

@@ -47,6 +47,10 @@ namespace Fort23.Mono
                 foreach (var eventConfig in configs)
                 {
                     AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(cl => cl.eventID == eventConfig.ID);
+                    if (eventList == null)
+                    {
+                        eventList = AccountFileInfo.Instance.playerData.eventList.FirstOrDefault(cl => cl.eventID == eventConfig.ID);
+                    }
                     EventMinLogWidget eventMinLogWidget = await UIManager.Instance.CreateGComponent<EventMinLogWidget>(null, Connect);
                     eventMinLogWidget.CustomInit(eventConfig.ID, eventList,places);
                     eventMinLogWidgets.Add(eventMinLogWidget);

+ 1 - 1
Assets/Scripts/GameUI/UI/XianTuLogPanel/EventMinLogWidget.cs

@@ -50,7 +50,7 @@ namespace Fort23.Mono
                 Text_MapName.gameObject.SetActive(false);
             }
 
-            if (eventList == null)
+            if (eventList == null || !eventList.isCompleted)
             {
                 Text_Name.text = "???";
             }

+ 1 - 0
XiuXianGame.sln.DotSettings.user

@@ -36,6 +36,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIGrouping_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5004a53079e04c2991f89460a5186cf010fc00_003Fb1_003F69de2d9e_003FIGrouping_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIMGUIContainer_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F56d039fe633a4adf8fb266a0b1797e6c17a000_003F2c_003F134ee6ec_003FIMGUIContainer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AINotifyCompletion_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003F64_003Fbb31faf9_003FINotifyCompletion_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AInspectorElement_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f63769030ae497a94b35af8517071579d5a00_003F1d_003F9bcca412_003FInspectorElement_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AInt32_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003F6f_003F6f797d5f_003FInt32_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AInt64_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fc2_003Fd9090dcf_003FInt64_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AInvokableCall_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F9e_003F8ce0e7b8_003FInvokableCall_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>