Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

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.05407384
+    - _Alpha: 0.00825125
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

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

Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab

@@ -100,6 +100,7 @@ GameObject:
   - component: {fileID: 2996915339685145454}
   - component: {fileID: 7645501109871432598}
   - component: {fileID: 7480171292643897060}
+  - component: {fileID: 972698312368462541}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_GaiLv
@@ -169,6 +170,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 57.2%
+--- !u!114 &972698312368462541
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 273976862557575735}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10345
 --- !u!1 &276280393870148480
 GameObject:
   m_ObjectHideFlags: 0
@@ -276,6 +290,7 @@ GameObject:
   - component: {fileID: 7616230294427577458}
   - component: {fileID: 2641973346719233169}
   - component: {fileID: 3368294147520607031}
+  - component: {fileID: 801627964597532628}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_GaiLv
@@ -345,6 +360,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 57.2%
+--- !u!114 &801627964597532628
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 333650309939419374}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10348
 --- !u!1 &384269343322849443
 GameObject:
   m_ObjectHideFlags: 0
@@ -638,6 +666,7 @@ GameObject:
   - component: {fileID: 2251815705129355552}
   - component: {fileID: 8547480128435490556}
   - component: {fileID: 8302120544150499690}
+  - component: {fileID: 6113714825081615785}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -722,6 +751,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &6113714825081615785
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 975401785670832517}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10339
 --- !u!1 &1035644628526415440
 GameObject:
   m_ObjectHideFlags: 0
@@ -827,6 +869,7 @@ GameObject:
   - component: {fileID: 6489511897426837363}
   - component: {fileID: 8018608956383153944}
   - component: {fileID: 2652679519094550969}
+  - component: {fileID: 3041011865347631961}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -911,6 +954,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &3041011865347631961
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1050126008742067804}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10343
 --- !u!1 &1113902231855745381
 GameObject:
   m_ObjectHideFlags: 0
@@ -1239,6 +1295,7 @@ GameObject:
   - component: {fileID: 6835024070903822679}
   - component: {fileID: 5443285785340945435}
   - component: {fileID: 8641416447764666386}
+  - component: {fileID: 7425153803128017848}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -1323,6 +1380,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &7425153803128017848
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1497394059788302979}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10342
 --- !u!1 &1501700663442146284
 GameObject:
   m_ObjectHideFlags: 0
@@ -2785,6 +2855,7 @@ GameObject:
   - component: {fileID: 1020755580111855999}
   - component: {fileID: 7819499848898734414}
   - component: {fileID: 233595083899320124}
+  - component: {fileID: 4691126149763750233}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_GaiLv
@@ -2854,6 +2925,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 57.2%
+--- !u!114 &4691126149763750233
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5089696736954208135}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10346
 --- !u!1 &5224817420243648246
 GameObject:
   m_ObjectHideFlags: 0
@@ -3563,6 +3647,7 @@ GameObject:
   - component: {fileID: 1553552100879311145}
   - component: {fileID: 1749525848610587373}
   - component: {fileID: 303764932847384926}
+  - component: {fileID: 8749281574509086637}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_GaiLv
@@ -3632,6 +3717,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 57.2%
+--- !u!114 &8749281574509086637
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7321907789896462625}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10350
 --- !u!1 &7476230505333882773
 GameObject:
   m_ObjectHideFlags: 0
@@ -3920,6 +4018,7 @@ GameObject:
   - component: {fileID: 7232477341919064873}
   - component: {fileID: 3169445059514101149}
   - component: {fileID: 2911314765555782532}
+  - component: {fileID: 2435785671868476975}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -4004,6 +4103,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &2435785671868476975
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8211786058160201744}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10344
 --- !u!1 &8241209294658023724
 GameObject:
   m_ObjectHideFlags: 0
@@ -4016,6 +4128,7 @@ GameObject:
   - component: {fileID: 2019571704989516606}
   - component: {fileID: 2347753902682301191}
   - component: {fileID: 7379481711500463364}
+  - component: {fileID: 6837790045357976236}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -4100,6 +4213,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &6837790045357976236
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8241209294658023724}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10340
 --- !u!1 &8426370114494986623
 GameObject:
   m_ObjectHideFlags: 0
@@ -4358,6 +4484,7 @@ GameObject:
   - component: {fileID: 6534534746643793319}
   - component: {fileID: 680072671824350836}
   - component: {fileID: 5269235145391843916}
+  - component: {fileID: 9043192436549308730}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_GaiLv
@@ -4427,6 +4554,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 57.2%
+--- !u!114 &9043192436549308730
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8669257028166209448}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10347
 --- !u!1 &8890653371124553055
 GameObject:
   m_ObjectHideFlags: 0
@@ -4549,6 +4689,7 @@ GameObject:
   - component: {fileID: 5887267035750045562}
   - component: {fileID: 584594056667099355}
   - component: {fileID: 3656733740707354268}
+  - component: {fileID: 7080381614908417301}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -4633,6 +4774,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &7080381614908417301
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9097259295526567356}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10341
 --- !u!1 &9097704230371347564
 GameObject:
   m_ObjectHideFlags: 0
@@ -4644,6 +4798,7 @@ GameObject:
   - component: {fileID: 1986555005657420446}
   - component: {fileID: 7818776012246767499}
   - component: {fileID: 1305258739368705495}
+  - component: {fileID: 8028858648905026995}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_GaiLv
@@ -4713,6 +4868,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 57.2%
+--- !u!114 &8028858648905026995
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9097704230371347564}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10349
 --- !u!1 &9183658485641831872
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/GameUI/UI/ShopPanel/ShopItemWidgetType2.cs

@@ -33,7 +33,7 @@ namespace Fort23.Mono
             Btn_Buy.onClick.AddListener(async () =>
             {
                 //人名币和看广告一个一个购买
-                if (_shopItemConfig.costItemId == 1031 || _shopItemConfig.costItemId == 1032)
+                if (_shopItemConfig.costItemId == 9999 || _shopItemConfig.costItemId == 1032)
                 {
                     if (_shopItemConfig.buyCount != -1 && _shopItem.buyCount >= _shopItemConfig.buyCount)
                     {
@@ -126,7 +126,7 @@ namespace Fort23.Mono
                 Text_Free.gameObject.SetActive(true);
             }
             //人名币
-            else if (_shopItemConfig.costItemId == 1031)
+            else if (_shopItemConfig.costItemId == 9999)
             {
                 // Icon_adsImage.gameObject.SetActive(false);
                 Csc.ChangeState(2);