道友开发

Assets/Res/Config/DaoyouLevelupConfig.json

@@ -2,13 +2,13 @@
   "configList": [
     {
       "ID": 1,
-      "name": null,
+      "name": 2025,
       "exp": 10,
       "guajiGrowup": 0
     },
     {
       "ID": 2,
-      "name": null,
+      "name": 2026,
       "exp": 20,
       "prizeID": [
         1002
@@ -20,7 +20,7 @@
     },
     {
       "ID": 3,
-      "name": null,
+      "name": 2027,
       "exp": 30,
       "prizeID": [
         1002
@@ -32,7 +32,7 @@
     },
     {
       "ID": 4,
-      "name": null,
+      "name": 2028,
       "exp": 40,
       "prizeID": [
         1002
@@ -44,7 +44,7 @@
     },
     {
       "ID": 5,
-      "name": null,
+      "name": 2029,
       "exp": 50,
       "prizeID": [
         1002
@@ -56,7 +56,7 @@
     },
     {
       "ID": 6,
-      "name": null,
+      "name": 2030,
       "exp": 60,
       "prizeID": [
         1002
@@ -68,7 +68,7 @@
     },
     {
       "ID": 7,
-      "name": null,
+      "name": 2031,
       "exp": 70,
       "prizeID": [
         1002
@@ -80,7 +80,7 @@
     },
     {
       "ID": 8,
-      "name": null,
+      "name": 2032,
       "exp": 80,
       "prizeID": [
         1002
@@ -92,7 +92,7 @@
     },
     {
       "ID": 9,
-      "name": null,
+      "name": 2033,
       "exp": 90,
       "prizeID": [
         1002
@@ -104,7 +104,7 @@
     },
     {
       "ID": 10,
-      "name": null,
+      "name": 2034,
       "exp": -1,
       "prizeID": [
         1002

Assets/Res/Config/DaoyouModelConfig.json

@@ -33,7 +33,7 @@
         112
       ],
       "EmotionLvforQuest": 2,
-      "QuestID": 9001,
+      "QuestID": 9003,
       "EmotionLvforspecialGift": [
         3
       ],

Assets/Res/Config/EventConfig.json

@@ -382,6 +382,26 @@
       "EventCount": null,
       "EventName": 175,
       "Description": 1937
+    },
+    {
+      "ID": 9003,
+      "EventLinksId": [
+        9003,
+        9004,
+        9005,
+        9006,
+        9007,
+        9008
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 2035,
+      "Description": 2036
     }
   ]
 }

Assets/Res/Config/EventLinkConfig.json

@@ -603,6 +603,105 @@
       "finishCount": null,
       "optionType": null,
       "ResultType": null
+    },
+    {
+      "ID": 9003,
+      "conciseEventMessage": null,
+      "LanID": [
+        2036
+      ],
+      "NPCID": null,
+      "ConditionType": null,
+      "finishCount": null,
+      "optionType": 1,
+      "optionPara1": [
+        9004,
+        9006
+      ],
+      "optionPara2": [
+        2041,
+        2042
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 9004,
+      "conciseEventMessage": null,
+      "LanID": [
+        2037
+      ],
+      "NPCID": null,
+      "ConditionType": null,
+      "finishCount": null,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        9005,
+        100
+      ]
+    },
+    {
+      "ID": 9005,
+      "conciseEventMessage": null,
+      "LanID": [
+        2038
+      ],
+      "NPCID": null,
+      "ConditionType": null,
+      "finishCount": null,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 9006,
+      "conciseEventMessage": null,
+      "LanID": [
+        2039
+      ],
+      "NPCID": null,
+      "ConditionType": 6,
+      "ConditionPara": [
+        1001
+      ],
+      "finishCount": 10,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 9007,
+      "conciseEventMessage": null,
+      "LanID": [
+        2040
+      ],
+      "NPCID": null,
+      "ConditionType": 6,
+      "ConditionPara": [
+        1001
+      ],
+      "finishCount": null,
+      "optionType": 4,
+      "ResultType": 1,
+      "ResultOptions": [
+        9007
+      ]
+    },
+    {
+      "ID": 9008,
+      "conciseEventMessage": null,
+      "NPCID": null,
+      "ConditionType": null,
+      "finishCount": null,
+      "optionType": 3,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        999
+      ],
+      "ResultType": null
     }
   ]
 }

Assets/Res/Config/EventNPC.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: By5KtH+kWnnzVp19TNDkBXqhRnPwz1K0BJ5YLR1kcS45L3igF4+lG96EcsAT
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/LanguageChineseConfig.json

@@ -7602,11 +7602,11 @@
     },
     {
       "ID": 1901,
-      "txt": "事件10005：一只[怪物2]袭击了你，准备迎战"
+      "txt": "0"
     },
     {
       "ID": 1902,
-      "txt": "事件10006：一只[怪物3]袭击了你，准备迎战"
+      "txt": "0"
     },
     {
       "ID": 1903,
@@ -8095,6 +8095,130 @@
     {
       "ID": 2024,
       "txt": "这位道友离开时会给与玩家丰厚法宝灵韵奖励"
+    },
+    {
+      "ID": 2025,
+      "txt": "好感度1"
+    },
+    {
+      "ID": 2026,
+      "txt": "好感度2"
+    },
+    {
+      "ID": 2027,
+      "txt": "好感度3"
+    },
+    {
+      "ID": 2028,
+      "txt": "好感度4"
+    },
+    {
+      "ID": 2029,
+      "txt": "好感度5"
+    },
+    {
+      "ID": 2030,
+      "txt": "好感度6"
+    },
+    {
+      "ID": 2031,
+      "txt": "好感度7"
+    },
+    {
+      "ID": 2032,
+      "txt": "好感度8"
+    },
+    {
+      "ID": 2033,
+      "txt": "好感度9"
+    },
+    {
+      "ID": 2034,
+      "txt": "好感度10"
+    },
+    {
+      "ID": 2035,
+      "txt": "幽谷剑鸣"
+    },
+    {
+      "ID": 2036,
+      "txt": "你在闭关修炼时，感受到一股凌厉的剑意波动。深入探查，发现一名白衣剑修“清霜”盘坐于谷中，周围剑气环绕，正与一柄散发不祥气息的灵剑对峙。她似在参悟剑诀，却灵气不足，剑灵桀骜。"
+    },
+    {
+      "ID": 2037,
+      "txt": "你上前以剑意对抗剑灵"
+    },
+    {
+      "ID": 2038,
+      "txt": "成功压制剑灵，清霜赠你“霜华剑符”并结下道友之谊"
+    },
+    {
+      "ID": 2039,
+      "txt": "你察觉谷中灵气匮乏，清霜剑意凝滞。神识探查得知，附近秘境可采集“玄冰花”"
+    },
+    {
+      "ID": 2040,
+      "txt": "献上玄冰花，清霜炼化灵气突破瓶颈，赠你“玄霜剑意”"
+    },
+    {
+      "ID": 2041,
+      "txt": "挑战剑灵"
+    },
+    {
+      "ID": 2042,
+      "txt": "收集灵材"
+    },
+    {
+      "ID": 2043,
+      "txt": "0"
+    },
+    {
+      "ID": 2044,
+      "txt": "0"
+    },
+    {
+      "ID": 2045,
+      "txt": "0"
+    },
+    {
+      "ID": 2046,
+      "txt": "0"
+    },
+    {
+      "ID": 2047,
+      "txt": "0"
+    },
+    {
+      "ID": 2048,
+      "txt": "0"
+    },
+    {
+      "ID": 2049,
+      "txt": "0"
+    },
+    {
+      "ID": 2050,
+      "txt": "0"
+    },
+    {
+      "ID": 2051,
+      "txt": "0"
+    },
+    {
+      "ID": 2052,
+      "txt": "0"
+    },
+    {
+      "ID": 2053,
+      "txt": "0"
+    },
+    {
+      "ID": 2054,
+      "txt": "0"
+    },
+    {
+      "ID": 2055,
+      "txt": "0"
     }
   ]
 }

Assets/Res/UI/DaoYouPanel/DaoYouInfoPanel.prefab

@@ -1202,8 +1202,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 9000357914965382018}
   - {fileID: 7200024353796400970}
+  - {fileID: 9000357914965382018}
   - {fileID: 7971548857769117924}
   - {fileID: 8182458364809824195}
   m_Father: {fileID: 5836252166898464303}
@@ -1211,7 +1211,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 32.8, y: -51.9}
-  m_SizeDelta: {x: 672.53723, y: 60.0177}
+  m_SizeDelta: {x: 329.16858, y: 60.0177}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &864881423897064306
 CanvasRenderer:
@@ -2057,9 +2057,10 @@ GameObject:
   - component: {fileID: 7200024353796400970}
   - component: {fileID: 3753502280856826866}
   - component: {fileID: 4342516847581909157}
+  - component: {fileID: 2036565602186309336}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage (1)
+  m_Name: Btn_Tongyong
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2082,7 +2083,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: 250.42645, y: -26.61435}
+  m_AnchoredPosition: {x: 78.74215, y: -26.61435}
   m_SizeDelta: {x: 157.4843, y: 53.2287}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3753502280856826866
@@ -2135,6 +2136,50 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &2036565602186309336
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2693695568942017612}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4342516847581909157}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &2797678295590786086
 GameObject:
   m_ObjectHideFlags: 0
@@ -2153,7 +2198,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7971548857769117924
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3335,9 +3380,10 @@ GameObject:
   - component: {fileID: 9000357914965382018}
   - component: {fileID: 4363777042122856982}
   - component: {fileID: 4257236003322320501}
+  - component: {fileID: 3971446314272975596}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: Btn_Love
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3360,7 +3406,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: 78.7421, y: -26.61435}
+  m_AnchoredPosition: {x: 250.42645, y: -26.61435}
   m_SizeDelta: {x: 157.4843, y: 53.2287}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4363777042122856982
@@ -3413,6 +3459,50 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &3971446314272975596
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3778389790751610998}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4257236003322320501}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3807718679306676580
 GameObject:
   m_ObjectHideFlags: 0
@@ -3604,7 +3694,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8182458364809824195
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4032,8 +4122,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8564065976731006734}
   - {fileID: 1661125345998149308}
+  - {fileID: 8564065976731006734}
   - {fileID: 5559529533166581890}
   - {fileID: 1744558580528090098}
   - {fileID: 774778019378967937}
@@ -6086,9 +6176,10 @@ GameObject:
   - component: {fileID: 1731587295771662961}
   - component: {fileID: 1114926871017867092}
   - component: {fileID: 2847539438800709531}
+  - component: {fileID: 4478798619529789450}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: Btn_Eveent
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -6163,6 +6254,50 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &4478798619529789450
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7290915808457360133}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2847539438800709531}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &7365316927593469400
 GameObject:
   m_ObjectHideFlags: 0
@@ -7284,4 +7419,19 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_Eveent
+    gameObject: {fileID: 4478798619529789450}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Love
+    gameObject: {fileID: 3971446314272975596}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Tongyong
+    gameObject: {fileID: 2036565602186309336}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0

Assets/Res/UI/DaoYouPanel/DaoYouLevelWidget.prefab

@@ -10,7 +10,6 @@ GameObject:
   m_Component:
   - component: {fileID: 2880765033324115505}
   - component: {fileID: 7711679328970338775}
-  - component: {fileID: 2310353741334179172}
   - component: {fileID: 7691259668365556886}
   m_Layer: 0
   m_HasEditorInfo: 1
@@ -32,6 +31,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 4729149304264285259}
   - {fileID: 3484547320358275108}
   - {fileID: 6942807425051387124}
   - {fileID: 8547621119698932726}
@@ -51,48 +51,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2500841646950126078}
   m_CullTransparentMesh: 1
---- !u!114 &2310353741334179172
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2500841646950126078}
-  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.7960785, g: 0.8431373, b: 0.86274517, 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: 
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
-  packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
 --- !u!114 &7691259668365556886
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -126,6 +84,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_Award
+    gameObject: {fileID: 2901005312392506567}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &3279400316516804331
 GameObject:
@@ -187,7 +150,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -207,6 +170,139 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 1
+--- !u!1 &3646611939224224664
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4729149304264285259}
+  - component: {fileID: 1907140884444541458}
+  - component: {fileID: 1494745574264673938}
+  - component: {fileID: 2901005312392506567}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Award
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4729149304264285259
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3646611939224224664}
+  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: 2880765033324115505}
+  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 &1907140884444541458
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3646611939224224664}
+  m_CullTransparentMesh: 1
+--- !u!114 &1494745574264673938
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3646611939224224664}
+  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.79607844, g: 0.84313726, b: 0.8627451, 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: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &2901005312392506567
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3646611939224224664}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1494745574264673938}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &4617700317211657490
 GameObject:
   m_ObjectHideFlags: 0
@@ -267,7 +363,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.3529412, g: 0.65882355, b: 0.62352943, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -477,7 +573,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -558,7 +654,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.050980397, g: 0.3372549, b: 0.31764707, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:

Assets/Res/UI/DaoYouPanel/DaoYouWidget.prefab

@@ -147,13 +147,13 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -271,6 +271,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_Event
+    gameObject: {fileID: 6416434817620034699}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &4195260018294081106
 GameObject:
@@ -385,11 +390,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5070300881352391495}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -0.0000076293945, y: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.000015258789, y: 0}
   m_SizeDelta: {x: 40.6109, y: 40.6109}
-  m_Pivot: {x: 0, y: 0}
+  m_Pivot: {x: 1, y: 1}
 --- !u!222 &6719389967905816541
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -459,7 +464,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3875262291450751451
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetItem.prefab

@@ -209,6 +209,7 @@ RectTransform:
   - {fileID: 1835098571422434311}
   - {fileID: 3545244106223690488}
   - {fileID: 5126391295778819725}
+  - {fileID: 7511937068176871878}
   m_Father: {fileID: 1515036893769208877}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -224,6 +225,94 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3054887198727531086}
   m_CullTransparentMesh: 1
+--- !u!1 &3270872026193157841
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7511937068176871878}
+  - component: {fileID: 2695798249184252819}
+  - component: {fileID: 1297346207719223719}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_WenHao
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7511937068176871878
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3270872026193157841}
+  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: 6062762002596746888}
+  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: 0}
+  m_SizeDelta: {x: 36, y: 36}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2695798249184252819
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3270872026193157841}
+  m_CullTransparentMesh: 1
+--- !u!114 &1297346207719223719
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3270872026193157841}
+  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: 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: 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_wenhao
+  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: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &6624212208645409916
 GameObject:
   m_ObjectHideFlags: 0
@@ -391,4 +480,9 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_WenHao
+    gameObject: {fileID: 1297346207719223719}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1

Assets/Scripts/GameData/ExcelConfig/EventNPC.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Ci8WsSj8Ui6RqwIF8ubdQFkdVl9DuEcohtjTOj7PJsLK1ApnEQ0QAVKhBmGF
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameData/ExcelConfig/daolvSkill.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: CSxNtyqkUXjEqsG+zMARmIUMr+bvJVKDwolF7IZENnciUvWAUI6bw/xhEPEq
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -429,10 +429,10 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         playerData.ItemListData.Add(diamond);
         playerData.ItemListData.Add(heroExp);
         
-        DaoYouData daoYouData = new DaoYouData();
-        daoYouData.id = 1;
-        daoYouData.favorabilityLv = 1;
-        playerData.daoYouDatas.Add(daoYouData);
+        // DaoYouData daoYouData = new DaoYouData();
+        // daoYouData.id = 1;
+        // daoYouData.favorabilityLv = 1;
+        // playerData.daoYouDatas.Add(daoYouData);
 
 
         //测试道具

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -74,6 +74,24 @@ public class DialogueManager : Singleton<DialogueManager>
             return;
         }
 
+        if (dialogueConfig.NPCID != 0)
+        {
+            EventNPC eventNpc = ConfigComponent.Instance.Get<EventNPC>(dialogueConfig.NPCID);
+            if (eventNpc.ID != 0 && eventNpc.DaoyouID != 0)
+            {
+                if (AccountFileInfo.Instance.playerData.daoYouDatas.FirstOrDefault(dy => dy.id == eventNpc.DaoyouID) == null)
+                {
+                    AccountFileInfo.DaoYouData daoYouData = new AccountFileInfo.DaoYouData();
+                    daoYouData.id =eventNpc.DaoyouID;
+                    daoYouData.favorabilityLv = 1;
+                    AccountFileInfo.Instance.playerData.daoYouDatas.Add(daoYouData);
+                    AccountFileInfo.Instance.SavePlayerData();
+                }
+                
+            
+            }
+        }
+
 
         AccountFileInfo.Instance.SavePlayerData();
 

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -124,7 +124,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
     }
 
 
-    private bool BagIsEvent(int eventID)
+    public bool BagIsEvent(int eventID)
     {
         foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
         {
@@ -137,7 +137,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         return false;
     }
 
-    private bool IsEventTrigger(int eventID)
+    public bool IsEventTrigger(int eventID)
     {
         foreach (var eventList in AccountFileInfo.Instance.playerData.completeEvents)
         {

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -52,11 +52,49 @@ namespace Fort23.Mono
 
             Btn_SendGift.onClick.AddListener(async () =>
             {
+                if (daoYouData.favorabilityLv >= _daoYouLevelWidgets.Count)
+                {
+                    TipMessagePanel.OpenTipMessagePanel("道友等级已到最高");
+                    return;
+                }
+
                 AppBarPanel.ClosePanel();
                 await UpdateGiveGiftRoot();
                 GiveGite.gameObject.SetActive(true);
             });
 
+            Btn_Love.onClick.AddListener(() =>
+            {
+                ClosePoolGive();
+                saiXuanType = 2;
+                List<ItemInfo> showItems = SaiXuan(saiXuanType);
+                CreatItem(showItems);
+            });
+
+            Btn_Tongyong.onClick.AddListener(() =>
+            {
+                ClosePoolGive();
+                saiXuanType = 1;
+                List<ItemInfo> showItems = SaiXuan(saiXuanType);
+                CreatItem(showItems);
+            });
+
+
+            Btn_Eveent.onClick.AddListener(() =>
+            {
+                if (daoYouData.favorabilityLv >= _daoyouModelConfig.EmotionLvforQuest
+                    && !EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.QuestID)
+                    && !EventSystemManager.Instance.IsEventTrigger(_daoyouModelConfig.QuestID))
+                {
+                    AccountFileInfo.EventList eventList = EventSystemManager.Instance.AddEvent(_daoyouModelConfig.QuestID);
+                    AccountFileInfo.Instance.playerData.eventList.Add(eventList);
+                    AccountFileInfo.Instance.SavePlayerData();
+                    EventSystemManager.Instance.TriggerEvent(eventList);
+                    Btn_Eveent.gameObject.SetActive(false);
+                }
+            });
+
+
             Btn_Back.onClick.AddListener(() =>
             {
                 ClosePoolGive();
@@ -67,7 +105,12 @@ namespace Fort23.Mono
             Btn_Add.onClick.AddListener(Add);
             Btn_Reduce.onClick.AddListener(Reduce);
 
-            Btn_Max.onClick.AddListener(() => { Slider_Give.value = (int)widgetItem1.itemInfo.count.Value; });
+            Btn_Max.onClick.AddListener(() =>
+            {
+                if (widgetItem1 == null)
+                    return;
+                Slider_Give.value = (int)widgetItem1.itemInfo.count.Value;
+            });
             Slider_Give.onValueChanged.AddListener((i) =>
             {
                 count = (int)i;
@@ -137,6 +180,18 @@ namespace Fort23.Mono
 
             _daoYouIdleEarningsWidgets.Clear();
 
+            if (daoYouData.favorabilityLv >= _daoyouModelConfig.EmotionLvforQuest
+                && !EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.QuestID)
+                && !EventSystemManager.Instance.IsEventTrigger(_daoyouModelConfig.QuestID))
+            {
+                Btn_Eveent.gameObject.SetActive(true);
+            }
+            else
+            {
+                Btn_Eveent.gameObject.SetActive(false);
+            }
+
+
             Text_Name.text = LanguageManager.Instance.Text(_daoyouModelConfig.name);
 
             int index = 0;
@@ -170,11 +225,15 @@ namespace Fort23.Mono
             {
                 foreach (var i in _daoyouModelConfig.PreferGiftID)
                 {
+                    WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, LoveItemContent);
+                    widgetItems.Add(widgetItem);
                     if (_daoyouModelConfig.shownPreferGiftID.Contains(i) || (daoYouData != null && daoYouData.loveIds.Contains(i)))
                     {
-                        WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, LoveItemContent);
                         widgetItem.InitWidget(new ItemInfo(i, 0));
-                        widgetItems.Add(widgetItem);
+                    }
+                    else
+                    {
+                        widgetItem.ShowWenhao();
                     }
                 }
             }
@@ -190,20 +249,66 @@ namespace Fort23.Mono
         }
 
 
+        List<ItemInfo> allItems = new List<ItemInfo>();
+        private int saiXuanType = 1;
+
         public async CTask UpdateGiveGiftRoot()
         {
             ClosePoolGive();
+            allItems.Clear();
             foreach (var daoyouGiftConfig in daoyouGiftConfigs)
             {
                 if (PlayerManager.Instance.BagController.GetItemCount(daoyouGiftConfig.ItemID) > 0)
                 {
                     ItemInfo itemInfo = PlayerManager.Instance.BagController.GetItemInfo(daoyouGiftConfig.ItemID);
-                    WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, GiveGiftContent);
-                    widgetItem.InitWidget(itemInfo);
-                    widgetItem.OnClick = OnClick;
-                    giveWidgetItems.Add(widgetItem);
+                    allItems.Add(itemInfo);
                 }
             }
+
+            List<ItemInfo> showItems = SaiXuan(saiXuanType);
+            CreatItem(showItems);
+        }
+
+
+        private List<ItemInfo> SaiXuan(int type)
+        {
+            List<ItemInfo> shownItems = new List<ItemInfo>();
+            //全部
+            if (type == 1)
+            {
+                shownItems = allItems.ToList();
+            }
+            //喜欢
+            else if (type == 2)
+            {
+                foreach (var itemInfo in allItems)
+                {
+                    if (_daoyouModelConfig.shownPreferGiftID.Contains(itemInfo.itemID) || (daoYouData != null && daoYouData.loveIds.Contains(itemInfo.itemID)))
+                    {
+                        shownItems.Add(itemInfo);
+                    }
+                }
+            }
+
+            return shownItems;
+        }
+
+        private async CTask CreatItem(List<ItemInfo> shownItems)
+        {
+            // ClosePoolGive();
+
+            foreach (var itemInfo in shownItems)
+            {
+                WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, GiveGiftContent);
+                widgetItem.InitWidget(itemInfo);
+                widgetItem.OnClick = OnClick;
+                giveWidgetItems.Add(widgetItem);
+            }
+
+            if (giveWidgetItems.Count > 0)
+            {
+                giveWidgetItems[0].OnPointerClick();
+            }
         }
 
         DaoyouGiftConfig daoyouGiftConfig = default;
@@ -238,6 +343,8 @@ namespace Fort23.Mono
 
         private void Reduce()
         {
+            if (widgetItem1 == null)
+                return;
             count--;
             if (count < 1)
             {
@@ -249,6 +356,9 @@ namespace Fort23.Mono
 
         private void Add()
         {
+            if (widgetItem1 == null)
+                return;
+
             count++;
             if (count > widgetItem1.itemInfo.count.Value)
             {
@@ -280,6 +390,9 @@ namespace Fort23.Mono
         {
             count = 0;
             daoyouGiftConfig = default;
+            Slider_Give.value = 0;
+            Slider_Give.minValue = 0;
+            Slider_Give.maxValue = 0;
 
             foreach (var giveWidgetItem in giveWidgetItems)
             {
@@ -315,6 +428,8 @@ namespace Fort23.Mono
             }
 
             _daoYouIdleEarningsWidgets.Clear();
+            allItems.Clear();
+            saiXuanType = 1;
 
             ClosePoolGive();
 

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanelData.cs

@@ -305,6 +305,39 @@ namespace Fort23.Mono
 	      return _Slider_Give;
 	     }
 	   }
+	  private Button _Btn_Eveent;
+	  public Button Btn_Eveent
+	   {
+	   get{
+	      if (_Btn_Eveent == null)
+	       {
+	         _Btn_Eveent  = GetUIUnit<Button>("Btn_Eveent"); 
+	       }
+	      return _Btn_Eveent;
+	     }
+	   }
+	  private Button _Btn_Love;
+	  public Button Btn_Love
+	   {
+	   get{
+	      if (_Btn_Love == null)
+	       {
+	         _Btn_Love  = GetUIUnit<Button>("Btn_Love"); 
+	       }
+	      return _Btn_Love;
+	     }
+	   }
+	  private Button _Btn_Tongyong;
+	  public Button Btn_Tongyong
+	   {
+	   get{
+	      if (_Btn_Tongyong == null)
+	       {
+	         _Btn_Tongyong  = GetUIUnit<Button>("Btn_Tongyong"); 
+	       }
+	      return _Btn_Tongyong;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouLevelWidget.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
 using GameLogic.Bag;
@@ -9,6 +10,7 @@ namespace Fort23.Mono
     [UIBinding(prefab = "DaoYouLevelWidget")]
     public partial class DaoYouLevelWidget : UIComponent
     {
+        private AccountFileInfo.DaoYouData daoYouData;
         public DaoyouLevelupConfig _daoyouLevelupConfig;
 
         List<WidgetItem> _widgetItems = new List<WidgetItem>();
@@ -27,13 +29,45 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
+            Btn_Award.onClick.AddListener(() =>
+            {
+                if (daoYouData.awardLevels.Contains(_daoyouLevelupConfig.ID) || daoYouData.favorabilityLv < _daoyouLevelupConfig.ID)
+                {
+                    return;
+                }
+
+                List<ItemInfo> items = new List<ItemInfo>();
+                DaoyouModelConfig daoyouModelConfig = ConfigComponent.Instance.Get<DaoyouModelConfig>(daoYouData.id);
+                for (var i = 0; i < _daoyouLevelupConfig.prizeID?.Length; i++)
+                {
+                    items.Add(new ItemInfo(_daoyouLevelupConfig.prizeID[i], _daoyouLevelupConfig.prizeNum[i]));
+                }
+
+                if (daoyouModelConfig.EmotionLvforspecialGift.Contains(_daoyouLevelupConfig.ID))
+                {
+                    int index = daoyouModelConfig.EmotionLvforspecialGift.ToList().IndexOf(_daoyouLevelupConfig.ID);
+                    items.Add(new ItemInfo(daoyouModelConfig.specialGiftID[index], daoyouModelConfig.specialGiftNum[index]));
+                }
+
+                daoYouData.awardLevels.Add(_daoyouLevelupConfig.ID);
+                if (items.Count > 0)
+                {
+                    PlayerManager.Instance.BagController.AddItem(items);
+                    RewardsPanel.OpenPanel(items);
+                }
+
+                Text_Tips.gameObject.SetActive(true);
+                AccountFileInfo.Instance.SavePlayerData();
+            });
         }
 
         public async void CustomInit(AccountFileInfo.DaoYouData daoYouData, int configId)
         {
+            this.daoYouData = daoYouData;
             _daoyouLevelupConfig = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(configId);
             DaoyouModelConfig daoyouModelConfig = ConfigComponent.Instance.Get<DaoyouModelConfig>(daoYouData.id);
             Text_Level.text = configId.ToString();
+            Text_Name.text = LanguageManager.Instance.Text(_daoyouLevelupConfig.name);
 
             for (var i = 0; i < _daoyouLevelupConfig.prizeID?.Length; i++)
             {
@@ -50,12 +84,30 @@ namespace Fort23.Mono
                 _widgetItems.Add(widgetItem);
             }
 
+            //已经领取奖励
             if (daoYouData.awardLevels.Contains(configId))
             {
                 Text_Tips.gameObject.SetActive(true);
             }
             else
             {
+                //可以领取
+                if (daoYouData.favorabilityLv >= _daoyouLevelupConfig.ID)
+                {
+                    foreach (var widgetItem in _widgetItems)
+                    {
+                        widgetItem.transform.RecoverColor();
+                    }
+                }
+                //不能领取
+                else
+                {
+                    foreach (var widgetItem in _widgetItems)
+                    {
+                        widgetItem.transform.Gray();
+                    }
+                }
+
                 Text_Tips.gameObject.SetActive(false);
             }
         }

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouLevelWidgetData.cs

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

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidget.cs

@@ -5,46 +5,59 @@ using Fort23.UTool;
 
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "DaoYouWidget"  )]
-	public partial class DaoYouWidget : ItemWidgetBasic
-	{
-		private DaoyouModelConfig _daoyouModelConfig;
-		public AccountFileInfo.DaoYouData _daoYouData;
-		private void Init()
-		{
-
-		}
-		public override void AddEvent()
-		{
-
-		}
-		public override void DelEvent()
-		{
-
-		}
-		public override void AddButtonEvent()
-		{
-			base.AddButtonEvent();
-		}
-
-		public void CustomInit(int configId)
-		{
-			_daoyouModelConfig = ConfigComponent.Instance.Get<DaoyouModelConfig>(configId);
-			_daoYouData = AccountFileInfo.Instance.playerData.daoYouDatas.FirstOrDefault(dy => dy.id == configId);
-
-			Text_Name.text = LanguageManager.Instance.Text(_daoyouModelConfig.name);
-			DaoyouLevelupConfig daoyouLevelupConfig = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(configId);
-			Text_DaoyouLvName.text = LanguageManager.Instance.Text(daoyouLevelupConfig.name);
-
-			if (_daoYouData == null)
-			{
-				transform.Gray();
-			}
-			else
-			{
-				transform.RecoverColor();
-			}
-		}
-
-	}
-}
+    [UIBinding(prefab = "DaoYouWidget")]
+    public partial class DaoYouWidget : ItemWidgetBasic
+    {
+        private DaoyouModelConfig _daoyouModelConfig;
+        public AccountFileInfo.DaoYouData _daoYouData;
+
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            base.AddButtonEvent();
+        }
+
+        public void CustomInit(int configId)
+        {
+            _daoyouModelConfig = ConfigComponent.Instance.Get<DaoyouModelConfig>(configId);
+            _daoYouData = AccountFileInfo.Instance.playerData.daoYouDatas.FirstOrDefault(dy => dy.id == configId);
+
+            Text_Name.text = LanguageManager.Instance.Text(_daoyouModelConfig.name);
+
+
+            if (_daoYouData == null)
+            {
+                transform.Gray();
+                Btn_Event.gameObject.SetActive(false);
+            }
+            else
+            {
+                DaoyouLevelupConfig daoyouLevelupConfig = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(_daoYouData.favorabilityLv);
+                Text_DaoyouLvName.text = LanguageManager.Instance.Text(daoyouLevelupConfig.name);
+                if (_daoYouData.favorabilityLv >= _daoyouModelConfig.EmotionLvforQuest
+                    && !EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.QuestID)
+                    && !EventSystemManager.Instance.IsEventTrigger(_daoyouModelConfig.QuestID))
+                {
+                    Btn_Event.gameObject.SetActive(true);
+                }
+                else
+                {
+                    Btn_Event.gameObject.SetActive(false);
+                }
+
+                transform.RecoverColor();
+            }
+        }
+    }
+}

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidgetData.cs

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

Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs

@@ -38,6 +38,7 @@ namespace Fort23.Mono
 
             icon.gameObject.SetActive(true);
             icon.icon_name = itemInfo.config.icon;
+            Icon_WenHao.gameObject.SetActive(false);
 
             if (itemInfo.count.Value > 0)
             {
@@ -49,5 +50,20 @@ namespace Fort23.Mono
                 Text_Count.gameObject.SetActive(false);
             }
         }
+
+        public void ShowWenhao()
+        {
+            Icon_WenHao.gameObject.SetActive(true);
+            icon.gameObject.SetActive(false);
+            Text_Count.gameObject.SetActive(false);
+        }
+
+        public override void DormancyObj()
+        {
+            transform.RecoverColor();
+            
+            
+            base.DormancyObj();
+        }
     }
 }

Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItemData.cs

@@ -8,13 +8,13 @@ namespace Fort23.Mono
 	public partial class WidgetItem 
 	{
 	  #region 自定义数据 
-	  private Button _btnClick;
-	  public Button btnClick
+	  private Object _btnClick;
+	  public Object btnClick
 	   {
 	   get{
 	      if (_btnClick == null)
 	       {
-	         _btnClick  = GetUIUnit<Button>("btnClick"); 
+	         _btnClick  = GetUIUnit<Object>("btnClick"); 
 	       }
 	      return _btnClick;
 	     }
@@ -52,6 +52,17 @@ namespace Fort23.Mono
 	      return _Text_Count;
 	     }
 	   }
+	  private MyImage _Icon_WenHao;
+	  public MyImage Icon_WenHao
+	   {
+	   get{
+	      if (_Icon_WenHao == null)
+	       {
+	         _Icon_WenHao  = GetUIUnit<MyImage>("Icon_WenHao"); 
+	       }
+	      return _Icon_WenHao;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{