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

# Conflicts:
#	Assets/Res/Config/UnlockConfig.json   resolved by origin/master(远端) version
#	Assets/Scripts/GameData/ExcelConfig/UnlockConfig.cs   resolved by origin/master(远端) version

Assets/Res/Config/EventConfig.json

@@ -949,127 +949,6 @@
       "EventName": 4027,
       "Description": 4102
     },
-    {
-      "ID": 11,
-      "EventLinksId": [
-        1101,
-        1102,
-        1103,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1003
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 0,
-      "SmallPlacesId": 0,
-      "XiantuID": 0,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 0,
-      "Description": 0
-    },
-    {
-      "ID": 12,
-      "EventLinksId": [
-        1201,
-        1202,
-        1203,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1005
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 0,
-      "SmallPlacesId": 0,
-      "XiantuID": 0,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 0,
-      "Description": 0
-    },
-    {
-      "ID": 13,
-      "EventLinksId": [
-        1301,
-        1302,
-        1303,
-        1304,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1006
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 0,
-      "SmallPlacesId": 0,
-      "XiantuID": 0,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 0,
-      "Description": 0
-    },
-    {
-      "ID": 14,
-      "EventLinksId": [
-        1401,
-        1402,
-        1403,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 0,
-      "SmallPlacesId": 0,
-      "XiantuID": 0,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 0,
-      "Description": 0
-    },
     {
       "ID": 10001,
       "EventLinksId": [

Assets/Res/Config/UnlockConfig.json

@@ -1,2184 +1,3 @@
 {
-  "configList": [
-    {
-      "ID": 186,
-      "ulockFunction": 338,
-      "ulockCondition": 2,
-      "ulockValue": 2,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 193,
-      "ulockFunction": 515,
-      "ulockCondition": 2,
-      "ulockValue": 2,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 118,
-      "ulockFunction": 317,
-      "ulockCondition": 2,
-      "ulockValue": 3,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 188,
-      "ulockFunction": 510,
-      "ulockCondition": 2,
-      "ulockValue": 3,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 123,
-      "ulockFunction": 324,
-      "ulockCondition": 2,
-      "ulockValue": 6,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 124,
-      "ulockFunction": 325,
-      "ulockCondition": 2,
-      "ulockValue": 6,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 135,
-      "ulockFunction": 311,
-      "ulockCondition": 2,
-      "ulockValue": 8,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 179,
-      "ulockFunction": 507,
-      "ulockCondition": 2,
-      "ulockValue": 10,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 178,
-      "ulockFunction": 506,
-      "ulockCondition": 2,
-      "ulockValue": 7,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 187,
-      "ulockFunction": 339,
-      "ulockCondition": 2,
-      "ulockValue": 6,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 197,
-      "ulockFunction": 340,
-      "ulockCondition": 2,
-      "ulockValue": 4,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 199,
-      "ulockFunction": 521,
-      "ulockCondition": 2,
-      "ulockValue": 4,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 125,
-      "ulockFunction": 326,
-      "ulockCondition": 2,
-      "ulockValue": 33,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 130,
-      "ulockFunction": 307,
-      "ulockCondition": 2,
-      "ulockValue": 18,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 117,
-      "ulockFunction": 316,
-      "ulockCondition": 2,
-      "ulockValue": 12,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 198,
-      "ulockFunction": 520,
-      "ulockCondition": 2,
-      "ulockValue": 33,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    },
-    {
-      "ID": 200,
-      "ulockFunction": 522,
-      "ulockCondition": 2,
-      "ulockValue": 5,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 203,
-      "ulockFunction": 525,
-      "ulockCondition": 2,
-      "ulockValue": 33,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 116,
-      "ulockFunction": 315,
-      "ulockCondition": 2,
-      "ulockValue": 6,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 121,
-      "ulockFunction": 214,
-      "ulockCondition": 2,
-      "ulockValue": 6,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 134,
-      "ulockFunction": 308,
-      "ulockCondition": 2,
-      "ulockValue": 6,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 153,
-      "ulockFunction": 501,
-      "ulockCondition": 2,
-      "ulockValue": 6,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 156,
-      "ulockFunction": 504,
-      "ulockCondition": 2,
-      "ulockValue": 6,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 154,
-      "ulockFunction": 502,
-      "ulockCondition": 2,
-      "ulockValue": 6,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 155,
-      "ulockFunction": 503,
-      "ulockCondition": 2,
-      "ulockValue": 6,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 196,
-      "ulockFunction": 519,
-      "ulockCondition": 2,
-      "ulockValue": 7,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 107,
-      "ulockFunction": 201,
-      "ulockCondition": 2,
-      "ulockValue": 9,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 109,
-      "ulockFunction": 203,
-      "ulockCondition": 2,
-      "ulockValue": 9,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 111,
-      "ulockFunction": 205,
-      "ulockCondition": 2,
-      "ulockValue": 16,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 201,
-      "ulockFunction": 523,
-      "ulockCondition": 2,
-      "ulockValue": 7,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 168,
-      "ulockFunction": 331,
-      "ulockCondition": 2,
-      "ulockValue": 29,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 177,
-      "ulockFunction": 239,
-      "ulockCondition": 2,
-      "ulockValue": 43,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 108,
-      "ulockFunction": 202,
-      "ulockCondition": 2,
-      "ulockValue": 26,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 202,
-      "ulockFunction": 524,
-      "ulockCondition": 2,
-      "ulockValue": 10,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 127,
-      "ulockFunction": 328,
-      "ulockCondition": 2,
-      "ulockValue": 6,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 191,
-      "ulockFunction": 513,
-      "ulockCondition": 2,
-      "ulockValue": 12,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1001,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 11,
-      "functionValue": 20,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1020,
-      "ulockFunction": 518,
-      "ulockCondition": 2,
-      "ulockValue": 23,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 129,
-      "ulockFunction": 306,
-      "ulockCondition": 2,
-      "ulockValue": 18,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 184,
-      "ulockFunction": 241,
-      "ulockCondition": 2,
-      "ulockValue": 141,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 169,
-      "ulockFunction": 332,
-      "ulockCondition": 1,
-      "ulockValue": 68,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    },
-    {
-      "ID": 180,
-      "ulockFunction": 508,
-      "ulockCondition": 2,
-      "ulockValue": 136,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 122,
-      "ulockFunction": 215,
-      "ulockCondition": 2,
-      "ulockValue": 61,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 142,
-      "ulockFunction": 222,
-      "ulockCondition": 2,
-      "ulockValue": 46,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 136,
-      "ulockFunction": 330,
-      "ulockCondition": 2,
-      "ulockValue": 46,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 915,
-      "ulockFunction": 336,
-      "ulockCondition": 2,
-      "ulockValue": 46,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 119,
-      "ulockFunction": 321,
-      "ulockCondition": 2,
-      "ulockValue": 46,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 115,
-      "ulockFunction": 303,
-      "ulockCondition": 2,
-      "ulockValue": 46,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 204,
-      "ulockFunction": 526,
-      "ulockCondition": 2,
-      "ulockValue": 15,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 113,
-      "ulockFunction": 212,
-      "ulockCondition": 2,
-      "ulockValue": 58,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 114,
-      "ulockFunction": 301,
-      "ulockCondition": 2,
-      "ulockValue": 58,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 175,
-      "ulockFunction": 334,
-      "ulockCondition": 1,
-      "ulockValue": 9999,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    },
-    {
-      "ID": 137,
-      "ulockFunction": 217,
-      "ulockCondition": 2,
-      "ulockValue": 66,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 131,
-      "ulockFunction": 319,
-      "ulockCondition": 2,
-      "ulockValue": 46,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 120,
-      "ulockFunction": 213,
-      "ulockCondition": 2,
-      "ulockValue": 36,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 170,
-      "ulockFunction": 333,
-      "ulockCondition": 2,
-      "ulockValue": 0,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 916,
-      "ulockFunction": 337,
-      "ulockCondition": 2,
-      "ulockValue": 206,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 195,
-      "ulockFunction": 517,
-      "ulockCondition": 2,
-      "ulockValue": 206,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 171,
-      "ulockFunction": 234,
-      "ulockCondition": 2,
-      "ulockValue": 126,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 167,
-      "ulockFunction": 233,
-      "ulockCondition": 2,
-      "ulockValue": 126,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 181,
-      "ulockFunction": 335,
-      "ulockCondition": 2,
-      "ulockValue": 128,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 143,
-      "ulockFunction": 223,
-      "ulockCondition": 2,
-      "ulockValue": 81,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 101,
-      "ulockFunction": 2,
-      "ulockCondition": 1,
-      "ulockValue": 9999,
-      "functionValue": 1,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    },
-    {
-      "ID": 102,
-      "ulockFunction": 2,
-      "ulockCondition": 1,
-      "ulockValue": 9999,
-      "functionValue": 2,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    },
-    {
-      "ID": 103,
-      "ulockFunction": 2,
-      "ulockCondition": 1,
-      "ulockValue": 9999,
-      "functionValue": 3,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    },
-    {
-      "ID": 104,
-      "ulockFunction": 2,
-      "ulockCondition": 1,
-      "ulockValue": 9999,
-      "functionValue": 4,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    },
-    {
-      "ID": 182,
-      "ulockFunction": 509,
-      "ulockCondition": 2,
-      "ulockValue": 31,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1002,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 21,
-      "functionValue": 30,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 133,
-      "ulockFunction": 309,
-      "ulockCondition": 2,
-      "ulockValue": 541,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 166,
-      "ulockFunction": 505,
-      "ulockCondition": 1,
-      "ulockValue": 35,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    },
-    {
-      "ID": 172,
-      "ulockFunction": 235,
-      "ulockCondition": 2,
-      "ulockValue": 241,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 144,
-      "ulockFunction": 224,
-      "ulockCondition": 2,
-      "ulockValue": 121,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 173,
-      "ulockFunction": 236,
-      "ulockCondition": 2,
-      "ulockValue": 436,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 183,
-      "ulockFunction": 240,
-      "ulockCondition": 2,
-      "ulockValue": 1981,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1003,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 31,
-      "functionValue": 40,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 145,
-      "ulockFunction": 225,
-      "ulockCondition": 2,
-      "ulockValue": 166,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 151,
-      "ulockFunction": 231,
-      "ulockCondition": 2,
-      "ulockValue": 941,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 112,
-      "ulockFunction": 209,
-      "ulockCondition": 2,
-      "ulockValue": 941,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 185,
-      "ulockFunction": 242,
-      "ulockCondition": 2,
-      "ulockValue": 941,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 174,
-      "ulockFunction": 237,
-      "ulockCondition": 2,
-      "ulockValue": 641,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 148,
-      "ulockFunction": 228,
-      "ulockCondition": 2,
-      "ulockValue": 1961,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 149,
-      "ulockFunction": 229,
-      "ulockCondition": 2,
-      "ulockValue": 1961,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 150,
-      "ulockFunction": 230,
-      "ulockCondition": 2,
-      "ulockValue": 1961,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 146,
-      "ulockFunction": 226,
-      "ulockCondition": 2,
-      "ulockValue": 216,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 152,
-      "ulockFunction": 232,
-      "ulockCondition": 2,
-      "ulockValue": 1141,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 147,
-      "ulockFunction": 227,
-      "ulockCondition": 2,
-      "ulockValue": 296,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 176,
-      "ulockFunction": 238,
-      "ulockCondition": 2,
-      "ulockValue": 9999,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1004,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 41,
-      "functionValue": 50,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1005,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 51,
-      "functionValue": 60,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 138,
-      "ulockFunction": 218,
-      "ulockCondition": 2,
-      "ulockValue": 181,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 139,
-      "ulockFunction": 219,
-      "ulockCondition": 2,
-      "ulockValue": 181,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 140,
-      "ulockFunction": 220,
-      "ulockCondition": 2,
-      "ulockValue": 181,
-      "functionValue": 0,
-      "lockType": 2,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1006,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 71,
-      "functionValue": 70,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1007,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 91,
-      "functionValue": 80,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1008,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 111,
-      "functionValue": 90,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1009,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 131,
-      "functionValue": 100,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1010,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 151,
-      "functionValue": 110,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1011,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 171,
-      "functionValue": 120,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1012,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 191,
-      "functionValue": 130,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1013,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 211,
-      "functionValue": 140,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1014,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 231,
-      "functionValue": 150,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1015,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 251,
-      "functionValue": 160,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1016,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 271,
-      "functionValue": 170,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1017,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 291,
-      "functionValue": 180,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1018,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 311,
-      "functionValue": 190,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1019,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 331,
-      "functionValue": 200,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 128,
-      "ulockFunction": 329,
-      "ulockCondition": 1,
-      "ulockValue": 999,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    },
-    {
-      "ID": 132,
-      "ulockFunction": 216,
-      "ulockCondition": 1,
-      "ulockValue": 9999,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    },
-    {
-      "ID": 190,
-      "ulockFunction": 512,
-      "ulockCondition": 2,
-      "ulockValue": 9999,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 192,
-      "ulockFunction": 514,
-      "ulockCondition": 2,
-      "ulockValue": 9999,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 194,
-      "ulockFunction": 516,
-      "ulockCondition": 2,
-      "ulockValue": 9999,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 189,
-      "ulockFunction": 511,
-      "ulockCondition": 1,
-      "ulockValue": 9999,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    },
-    {
-      "ID": 205,
-      "ulockFunction": 527,
-      "ulockCondition": 2,
-      "ulockValue": 126,
-      "functionValue": 0,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1021,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 351,
-      "functionValue": 210,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1022,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 371,
-      "functionValue": 220,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1023,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 391,
-      "functionValue": 230,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1024,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 411,
-      "functionValue": 240,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1025,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 431,
-      "functionValue": 250,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1026,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 451,
-      "functionValue": 260,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1027,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 471,
-      "functionValue": 270,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1028,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 491,
-      "functionValue": 280,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1029,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 511,
-      "functionValue": 290,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1030,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 531,
-      "functionValue": 300,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1031,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 551,
-      "functionValue": 310,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1032,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 571,
-      "functionValue": 320,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1033,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 591,
-      "functionValue": 330,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1034,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 611,
-      "functionValue": 340,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1035,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 631,
-      "functionValue": 350,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1036,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 651,
-      "functionValue": 360,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1037,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 671,
-      "functionValue": 370,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1038,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 691,
-      "functionValue": 380,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1039,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 711,
-      "functionValue": 390,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1040,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 731,
-      "functionValue": 400,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1041,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 751,
-      "functionValue": 410,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1042,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 771,
-      "functionValue": 420,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1043,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 791,
-      "functionValue": 430,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1044,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 811,
-      "functionValue": 440,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1045,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 831,
-      "functionValue": 450,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1046,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 851,
-      "functionValue": 460,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1047,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 871,
-      "functionValue": 470,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1048,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 891,
-      "functionValue": 480,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1049,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 911,
-      "functionValue": 490,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1050,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 931,
-      "functionValue": 500,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1051,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 951,
-      "functionValue": 510,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1052,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 971,
-      "functionValue": 520,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1053,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 991,
-      "functionValue": 530,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1054,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1011,
-      "functionValue": 540,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1055,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1031,
-      "functionValue": 550,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1056,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1051,
-      "functionValue": 560,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1057,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1071,
-      "functionValue": 570,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1058,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1091,
-      "functionValue": 580,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1059,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1111,
-      "functionValue": 590,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1060,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1131,
-      "functionValue": 600,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1061,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1151,
-      "functionValue": 610,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1062,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1171,
-      "functionValue": 620,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1063,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1191,
-      "functionValue": 630,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1064,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1211,
-      "functionValue": 640,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1065,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1231,
-      "functionValue": 650,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1066,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1251,
-      "functionValue": 660,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1067,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1271,
-      "functionValue": 670,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1068,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1291,
-      "functionValue": 680,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1069,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1311,
-      "functionValue": 690,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1070,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1331,
-      "functionValue": 700,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1071,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1351,
-      "functionValue": 710,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1072,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1371,
-      "functionValue": 720,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1073,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1391,
-      "functionValue": 730,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1074,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1411,
-      "functionValue": 740,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1075,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1431,
-      "functionValue": 750,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1076,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1451,
-      "functionValue": 760,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1077,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1471,
-      "functionValue": 770,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1078,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1491,
-      "functionValue": 780,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1079,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1511,
-      "functionValue": 790,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1080,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1531,
-      "functionValue": 800,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1081,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1551,
-      "functionValue": 810,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1082,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1571,
-      "functionValue": 820,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1083,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1591,
-      "functionValue": 830,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1084,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1611,
-      "functionValue": 840,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1085,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1631,
-      "functionValue": 850,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1086,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1651,
-      "functionValue": 860,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1087,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1671,
-      "functionValue": 870,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1088,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1691,
-      "functionValue": 880,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1089,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1711,
-      "functionValue": 890,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1090,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1731,
-      "functionValue": 900,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1091,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1751,
-      "functionValue": 910,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1092,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1771,
-      "functionValue": 920,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1093,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1791,
-      "functionValue": 930,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1094,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1811,
-      "functionValue": 940,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1095,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1831,
-      "functionValue": 950,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1096,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1851,
-      "functionValue": 960,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1097,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1871,
-      "functionValue": 970,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1098,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1891,
-      "functionValue": 980,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1099,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1911,
-      "functionValue": 990,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 1100,
-      "ulockFunction": 4,
-      "ulockCondition": 2,
-      "ulockValue": 1931,
-      "functionValue": 1000,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2001,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 128,
-      "functionValue": 5,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2002,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 234,
-      "functionValue": 10,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2003,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 336,
-      "functionValue": 15,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2004,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 446,
-      "functionValue": 20,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2005,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 536,
-      "functionValue": 25,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2006,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 636,
-      "functionValue": 30,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2007,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 736,
-      "functionValue": 35,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2008,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 836,
-      "functionValue": 40,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2009,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 936,
-      "functionValue": 45,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2010,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 1036,
-      "functionValue": 50,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2011,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 1136,
-      "functionValue": 55,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2012,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 1236,
-      "functionValue": 60,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2013,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 1336,
-      "functionValue": 65,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2014,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 1436,
-      "functionValue": 70,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2015,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 1536,
-      "functionValue": 75,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2016,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 1636,
-      "functionValue": 80,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2017,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 1736,
-      "functionValue": 85,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 2018,
-      "ulockFunction": 601,
-      "ulockCondition": 2,
-      "ulockValue": 1836,
-      "functionValue": 90,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 407063
-    },
-    {
-      "ID": 206,
-      "ulockFunction": 602,
-      "ulockCondition": 1,
-      "ulockValue": 6,
-      "functionValue": 18,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    },
-    {
-      "ID": 207,
-      "ulockFunction": 602,
-      "ulockCondition": 1,
-      "ulockValue": 1001,
-      "functionValue": 19,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    },
-    {
-      "ID": 208,
-      "ulockFunction": 603,
-      "ulockCondition": 1,
-      "ulockValue": 51,
-      "functionValue": 19,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    },
-    {
-      "ID": 209,
-      "ulockFunction": -1,
-      "ulockCondition": 1,
-      "ulockValue": 125,
-      "functionValue": -1,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    },
-    {
-      "ID": 210,
-      "ulockFunction": -1,
-      "ulockCondition": 1,
-      "ulockValue": 142,
-      "functionValue": -1,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    },
-    {
-      "ID": 212,
-      "ulockFunction": -1,
-      "ulockCondition": 2,
-      "ulockValue": 116,
-      "functionValue": -1,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    },
-    {
-      "ID": 213,
-      "ulockFunction": 602,
-      "ulockCondition": 1,
-      "ulockValue": 50,
-      "functionValue": 22,
-      "lockType": 1,
-      "PlayerGuideID": 0,
-      "UnlockTipsID": 400027
-    }
-  ]
+  "configList": []
 }

Assets/Res/Config/UnlockConfig.json.meta

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

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -795,16 +795,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5411678273692701274}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3275273584098972649}
+  m_Father: {fileID: 6037835178821244997}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 42.7, y: -1301.9}
+  m_AnchoredPosition: {x: 70.20461, y: -14.436279}
   m_SizeDelta: {x: 252.6799, y: 63.2714}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3547886679702880668
@@ -2253,7 +2253,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3275273584098972649
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2270,7 +2270,6 @@ RectTransform:
   - {fileID: 5617782115550842872}
   - {fileID: 3450449309247689875}
   - {fileID: 6037835178821244997}
-  - {fileID: 4876923545589450363}
   m_Father: {fileID: 1803833552231621266}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -2348,7 +2347,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: 4876923545589450363}
   m_Father: {fileID: 3275273584098972649}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
   m_AnchorMin: {x: 0.5, y: 0.5}

Assets/Res/UI/DivineSence/BossInfoHeadWidget.prefab

@@ -0,0 +1,373 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &2810307340547890845
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 310654629828528603}
+  - component: {fileID: 8408634538511667268}
+  - component: {fileID: 1953072881066838063}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Boss
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &310654629828528603
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2810307340547890845}
+  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: 293117866278963511}
+  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: 104, y: 104}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8408634538511667268
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2810307340547890845}
+  m_CullTransparentMesh: 1
+--- !u!114 &1953072881066838063
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2810307340547890845}
+  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_touxiang
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  packInfo:
+    packName: mainUI
+    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
+    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
+    lasetJsonGUID: dfb4c3d9c19aa8c5a48b193f37a82226
+  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 &3196028676890684697
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 293117866278963511}
+  - component: {fileID: 4049818242548623024}
+  - component: {fileID: 3128904966796160624}
+  - component: {fileID: 3637274179364948525}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: BossInfoHeadWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &293117866278963511
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3196028676890684697}
+  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:
+  - {fileID: 310654629828528603}
+  - {fileID: 1289024867470926365}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 391.09186, y: 5.4057236}
+  m_SizeDelta: {x: 104, y: 104}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &4049818242548623024
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3196028676890684697}
+  m_CullTransparentMesh: 1
+--- !u!114 &3128904966796160624
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3196028676890684697}
+  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: 0
+  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: 1953072881066838063}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &3637274179364948525
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3196028676890684697}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_Name
+    gameObject: {fileID: 3195684101753423275}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &3964832250591165952
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1289024867470926365}
+  - component: {fileID: 3784525030634623470}
+  - component: {fileID: 8881386805482311671}
+  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 &1289024867470926365
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3964832250591165952}
+  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:
+  - {fileID: 6562329879155009941}
+  m_Father: {fileID: 293117866278963511}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -1.1246986, y: -2.9468002}
+  m_SizeDelta: {x: 67.3991, y: 25.5364}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &3784525030634623470
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3964832250591165952}
+  m_CullTransparentMesh: 1
+--- !u!114 &8881386805482311671
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3964832250591165952}
+  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.26666668, g: 0.2627451, b: 0.25882354, 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: a0625ec79d61afda18672ed59c9364f7
+  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 &6000461969436042767
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6562329879155009941}
+  - component: {fileID: 7333021691553683711}
+  - component: {fileID: 3195684101753423275}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6562329879155009941
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6000461969436042767}
+  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: 1289024867470926365}
+  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.0000038146973, y: 0}
+  m_SizeDelta: {x: 68, y: 26}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7333021691553683711
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6000461969436042767}
+  m_CullTransparentMesh: 1
+--- !u!114 &3195684101753423275
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6000461969436042767}
+  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: 0.95294124, g: 0.95294124, b: 0.95294124, 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: 22
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5BF9\u624B"

Assets/Res/UI/DivineSence/BossInfoHeadWidget.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: BnoYvC2rUyrEtf+IkAJ/4H5kSPbgC4Emuu/zJm5lpb85pGwmWZ5A9tHeOFeT
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/DivineSence/BossInfoPanel.prefab

@@ -93,11 +93,6 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Btn_Boss
-    gameObject: {fileID: 3173684499818704379}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: Btn_Player
     gameObject: {fileID: 8715733716981131665}
     isAssetBundle: 0
@@ -123,6 +118,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: BossInfoHeadRoot
+    gameObject: {fileID: 2979420774195494274}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1269031383078709346
 GameObject:
@@ -644,7 +644,7 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!1 &2334866695078534422
+--- !u!1 &2267643018947363913
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -652,87 +652,85 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 227574704470149712}
-  - component: {fileID: 8346951105134842831}
-  - component: {fileID: 2052970940613807012}
+  - component: {fileID: 2979420774195494274}
+  - component: {fileID: 5708432058350787540}
+  - component: {fileID: 404020427549872622}
+  - component: {fileID: 474322218102519098}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Icon_Boss
+  m_Name: BossInfoHeadRoot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &227574704470149712
+--- !u!224 &2979420774195494274
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2334866695078534422}
+  m_GameObject: {fileID: 2267643018947363913}
   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: 249517005427477180}
+  m_Father: {fileID: 896431442660292529}
   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: 104, y: 104}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8346951105134842831
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -9, y: 6}
+  m_SizeDelta: {x: 0, y: 97.4525}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &5708432058350787540
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2334866695078534422}
+  m_GameObject: {fileID: 2267643018947363913}
   m_CullTransparentMesh: 1
---- !u!114 &2052970940613807012
+--- !u!114 &404020427549872622
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2334866695078534422}
+  m_GameObject: {fileID: 2267643018947363913}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, 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_touxiang
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
-  packInfo:
-    packName: mainUI
-    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
-    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
-    lasetJsonGUID: dfb4c3d9c19aa8c5a48b193f37a82226
-  imageH: 100
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 21.26
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &474322218102519098
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2267643018947363913}
+  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 &2553589566839113697
 GameObject:
   m_ObjectHideFlags: 0
@@ -1003,98 +1001,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!1 &3115849258910854802
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 249517005427477180}
-  - component: {fileID: 4563540043197424955}
-  - component: {fileID: 3173684499818704379}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Btn_Boss
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &249517005427477180
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3115849258910854802}
-  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:
-  - {fileID: 227574704470149712}
-  - {fileID: 1622599921359364502}
-  m_Father: {fileID: 896431442660292529}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 391.09186, y: 5.4057236}
-  m_SizeDelta: {x: 104, y: 104}
-  m_Pivot: {x: 0, y: 1}
---- !u!222 &4563540043197424955
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3115849258910854802}
-  m_CullTransparentMesh: 1
---- !u!114 &3173684499818704379
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3115849258910854802}
-  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: 0
-  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: 2052970940613807012}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &3375656862256571646
 GameObject:
   m_ObjectHideFlags: 0
@@ -1186,96 +1092,6 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!1 &3486563111491861899
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1622599921359364502}
-  - component: {fileID: 3738689416693109349}
-  - component: {fileID: 8945887737405312124}
-  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 &1622599921359364502
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3486563111491861899}
-  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:
-  - {fileID: 6662300493550397982}
-  m_Father: {fileID: 249517005427477180}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -1.1246986, y: -2.9468002}
-  m_SizeDelta: {x: 67.3991, y: 25.5364}
-  m_Pivot: {x: 0.5, y: 0}
---- !u!222 &3738689416693109349
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3486563111491861899}
-  m_CullTransparentMesh: 1
---- !u!114 &8945887737405312124
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3486563111491861899}
-  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.26666668, g: 0.2627451, b: 0.25882354, 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: a0625ec79d61afda18672ed59c9364f7
-  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 &3552915526930824737
 GameObject:
   m_ObjectHideFlags: 0
@@ -2265,86 +2081,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u73A9\u5BB6"
---- !u!1 &6062626984644945284
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6662300493550397982}
-  - component: {fileID: 7107536877011786612}
-  - component: {fileID: 3116053902683538976}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Text (Legacy) (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6662300493550397982
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6062626984644945284}
-  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: 1622599921359364502}
-  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.0000038146973, y: 0}
-  m_SizeDelta: {x: 68, y: 26}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7107536877011786612
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6062626984644945284}
-  m_CullTransparentMesh: 1
---- !u!114 &3116053902683538976
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6062626984644945284}
-  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: 0.95294124, g: 0.95294124, b: 0.95294124, 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: 22
-    m_FontStyle: 1
-    m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u5BF9\u624B"
 --- !u!1 &6574328215683376462
 GameObject:
   m_ObjectHideFlags: 0
@@ -2455,7 +2191,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2153304345151142974}
-  - {fileID: 249517005427477180}
+  - {fileID: 2979420774195494274}
   m_Father: {fileID: 2569128129379278262}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -36,7 +36,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: 19.70581}
+  m_AnchoredPosition: {x: 0, y: 18}
   m_SizeDelta: {x: 0, y: -39.4115}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2840349042557368767
@@ -69,10 +69,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 36
+    m_FontSize: 28
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 2
     m_MaxSize: 41
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -473,14 +473,14 @@ RectTransform:
   m_GameObject: {fileID: 1213606337501340908}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 1723988732018600186}
   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.00086117, y: -19.368}
+  m_AnchoredPosition: {x: -0.00086117, y: -14}
   m_SizeDelta: {x: 0, y: 39.411}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1665665082766802650
@@ -1599,8 +1599,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: 96.5, y: -518.2}
-  m_SizeDelta: {x: 543.1503, y: 100}
+  m_AnchoredPosition: {x: 0.0019042, y: -518.2}
+  m_SizeDelta: {x: 750, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6922482407468544096
 CanvasRenderer:
@@ -2314,8 +2314,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: 132.5, y: -3.2299805}
-  m_SizeDelta: {x: 253, y: 80}
+  m_AnchoredPosition: {x: 103.21329, y: -3.2299805}
+  m_SizeDelta: {x: 439.9846, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8390928313110045558
 CanvasRenderer:
@@ -2346,7 +2346,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -3114,7 +3114,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 78.1464
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4345,10 +4345,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 40
+    m_FontSize: 32
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 4
+    m_MinSize: 3
     m_MaxSize: 41
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -4883,6 +4883,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 8626833803530248980}
   - {fileID: 317265118546245604}
   - {fileID: 4212652325341776174}
   - {fileID: 3478042439320372479}
@@ -5049,6 +5050,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: ItemWidgetType1Game
+    gameObject: {fileID: 1741321682879132432}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1 &9056821549282551153
 GameObject:
@@ -5087,8 +5093,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: -126, y: -3.2299805}
-  m_SizeDelta: {x: 253, y: 80}
+  m_AnchoredPosition: {x: -258, y: -3.2299805}
+  m_SizeDelta: {x: 175.7003, y: 55.5574}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5534412852682778287
 CanvasRenderer:
@@ -5282,3 +5288,213 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!1001 &2495980306006119692
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 9037135992368401232}
+    m_Modifications:
+    - target: {fileID: 4218159833380005404, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Name
+      value: ItemWidgetType1Game
+      objectReference: {fileID: 0}
+    - target: {fileID: 4218159833380005404, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Text
+      value: 1/2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Color.b
+      value: 0.9372549
+      objectReference: {fileID: 0}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Color.g
+      value: 0.98039216
+      objectReference: {fileID: 0}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Color.r
+      value: 0.96862745
+      objectReference: {fileID: 0}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_FontData.m_MinSize
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 30
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 72.3319
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 46.6854
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 259.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -1592.0764
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 30.3319
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 30.3319
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -23.3427
+      objectReference: {fileID: 0}
+    - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 42
+      objectReference: {fileID: 0}
+    - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 67.6526
+      objectReference: {fileID: 0}
+    - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 51.3319
+      objectReference: {fileID: 0}
+    - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -23.3427
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 3821607290282984346, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4820721191068096122}
+  m_SourcePrefab: {fileID: 100100000, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+--- !u!1 &1705337346385368726 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3821607290282984346, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+  m_PrefabInstance: {fileID: 2495980306006119692}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &4820721191068096122
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1705337346385368726}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.20392157, g: 0.3764706, b: 0.32941177, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &1741321682879132432 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4218159833380005404, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+  m_PrefabInstance: {fileID: 2495980306006119692}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &8626833803530248980 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+  m_PrefabInstance: {fileID: 2495980306006119692}
+  m_PrefabAsset: {fileID: 0}

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -3905,6 +3905,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 6694772361877173011}
     m_Modifications:
+    - target: {fileID: 1497465469377369551, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: imageH
+      value: 30.308811
+      objectReference: {fileID: 0}
     - target: {fileID: 4218159833380005404, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_Name
       value: ItemWidgetType1
@@ -4143,6 +4147,30 @@ PrefabInstance:
       propertyPath: imageH
       value: 80
       objectReference: {fileID: 0}
+    - target: {fileID: 1428057306796271496, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1428057306796271496, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1428057306796271496, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1428057306796271496, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 66
+      objectReference: {fileID: 0}
+    - target: {fileID: 1428057306796271496, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -52.5471
+      objectReference: {fileID: 0}
+    - target: {fileID: 2289986991244638643, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5

Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -118,6 +118,7 @@ namespace Fort23.Core
       DaoYouCounUpdate,
       UpdateZuiZhongEvent,
       CancelEvent,
+      RefreshULock
 
     }
 }

Assets/Scripts/Core/UI/UTool/UtilTools.cs

@@ -581,7 +581,7 @@ namespace Utility
             //     return str + "b";
             // }
 
-            if (number > 1000000)
+            if (number > 10000)
             {
                 float n = number / 10000f;
                 string str = "";
@@ -589,7 +589,7 @@ namespace Utility
                 return str + "万";
             }
 
-            if (number > 100000)
+            if (number > 1000)
             {
                 float n = number / 1000f;
                 string str = "";

Assets/Scripts/GameData/ExcelConfig/UnlockConfig.cs

@@ -35,7 +35,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///解锁方式 1=飞艇等级解锁 2=主线关卡ID解锁(MainStageNewConfig) 4=试炼之地关卡ID解锁 5=主线章节ID
+		///解锁方式 1=境界等级解锁  5=主线章节ID
 		/// </summary>
 #if !COMBAT_SERVER
 		public int ulockCondition;
@@ -45,7 +45,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///ulockCondition=1，代表飞艇等级 ulockCondition=2，MainStageNewConfig_ID（到达） ulockCondition=4，TowerLevelConfig_ID ulockCondition=5，ChapterConfig_ID
+		///ulockCondition=1，境界等级 
 		/// </summary>
 #if !COMBAT_SERVER
 		public int ulockValue;
@@ -54,16 +54,6 @@ namespace Excel2Json
 #endif
 		
 
-		/// <summary>
-		///功能参数 
-		/// </summary>
-#if !COMBAT_SERVER
-		public int functionValue;
-#else
-		public int functionValue{ set; get; }
-#endif
-		
-
 		/// <summary>
 		///未解锁前对应入口的展现形式 1、看不见 2、置灰
 		/// </summary>
@@ -74,26 +64,6 @@ namespace Excel2Json
 #endif
 		
 
-		/// <summary>
-		///新手引导ID
-		/// </summary>
-#if !COMBAT_SERVER
-		public int PlayerGuideID;
-#else
-		public int PlayerGuideID{ set; get; }
-#endif
-		
-
-		/// <summary>
-		///进入特定界面时再判断是否触发引导 -1=任何界面都触发
-		/// </summary>
-#if !COMBAT_SERVER
-		public int[] GuidebyUI;
-#else
-		public int[] GuidebyUI{ set; get; }
-#endif
-		
-
 		/// <summary>
 		///未解锁时点击的提示语言表ID {0}取ulockValue
 		/// </summary>

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

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

Assets/Scripts/GameLogic/UnLock.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: WXMdty6rWy2FRb5ei0EfURH6xHauEA9mDhBcSaTxTA2FdQOKejro/0jLNIKW
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameLogic/UnLock/ULockManager.cs

@@ -0,0 +1,138 @@
+using System;
+using Core.Language;
+using Excel2Json;
+using Fort23.Core;
+using Fort23.Mono;
+using Fort23.UTool;
+using UnityEngine;
+using Utility;
+
+public class ULockManager : Singleton<ULockManager>
+{
+    public UnlockConfig[] Configs;
+
+
+    public bool Nolock;
+
+    public ULockManager()
+    {
+        Configs = ConfigComponent.Instance.GetAll<UnlockConfig>();
+    }
+
+    /// <summary>
+    /// 获取解锁表
+    /// </summary>
+    /// <param name="unLockValue">解锁值(功能ID、表ID)</param>
+    /// <param name="isFunction">第一个参是否为功能ID</param>
+    /// <returns></returns>
+    public UnlockConfig GetULockConfig(int unLockValue, bool isFunction = true)
+    {
+        for (int i = 0; i < Configs.Length; i++)
+        {
+            if (isFunction)
+            {
+                if (Configs[i].ulockFunction == unLockValue)
+                {
+                    return Configs[i];
+                }
+            }
+            else
+            {
+                if (Configs[i].ID == unLockValue)
+                {
+                    return Configs[i];
+                }
+            }
+        }
+
+        if (isFunction)
+        {
+            LogTool.Error("功能 ulockFunction 值 配置错误，找不到这样一个功能，请请检查：" + unLockValue);
+        }
+        else
+        {
+            LogTool.Error("解锁ID配置错误，找不到这样一个功能，请请检查：" + unLockValue);
+        }
+
+        return new UnlockConfig();
+    }
+
+
+    /// <summary>
+    /// 刷新解锁状态, 影响解锁的值变化时调用（通关、飞艇升级等）
+    /// </summary>
+    public void RefreshULock()
+    {
+        EventManager.Instance.Dispatch(CustomEventType.RefreshULock, null);
+    }
+
+    /// <summary>
+    /// 解锁功能
+    /// </summary>
+    /// <param name="config">解锁表</param>
+    /// <returns>true表示解锁成功</returns>
+    public bool IsULock(UnlockConfig config)
+    {
+        if (Nolock)
+        {
+            return true;
+        }
+
+        switch (config.ulockCondition)
+        {
+            case 1:
+                return PlayerManager.Instance.myHero.powerUpConfig.ID >= config.ulockValue;
+        
+        }
+
+        return false;
+    }
+
+    public bool IsULock(int functionID)
+    {
+        if (Nolock)
+        {
+            return true;
+        }
+
+        // if (mGameRuntimeConfig.unLockAll)
+        // {
+        //     return true;
+        // }
+
+        if (functionID <= 0)
+        {
+            return true;
+        }
+
+        foreach (var config in Configs)
+        {
+            if (config.ulockFunction == functionID)
+            {
+                return IsULock(config);
+            }
+        }
+
+        return false;
+    }
+
+    public string ShowUnlockTips(int unlockConfigId)
+    {
+        UnlockConfig _config = ConfigComponent.Instance.Get<UnlockConfig>(unlockConfigId);
+        if (_config.ID == 0)
+            return "";
+        int unLockCondition = _config.ulockCondition;
+        int unLockValue = _config.ulockValue;
+        string tips = String.Empty;
+        switch (unLockCondition)
+        {
+            case 1: //玩家境界
+                // LevelBattleConfig levelBattleConfig = ConfigComponent.Instance.Get<LevelBattleConfig>(unLockValue);
+                // tips = LanguageManager.Instance.Text(_config.UnlockTipsID, levelBattleConfig.levelName);
+                break;
+
+        }
+        
+        return tips;
+    }
+}

Assets/Scripts/GameLogic/UnLock/ULockManager.cs.meta

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

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -42,7 +42,7 @@ public class DialogueManager : Singleton<DialogueManager>
         }
         else
         {
-            PlayDialogue(dialogueID);
+            PlayDialogue(dialogueID,true);
         }
 
         // EndDialogue1();
@@ -67,7 +67,7 @@ public class DialogueManager : Singleton<DialogueManager>
         }
     }
 
-    private async void PlayDialogue(int dialogueID)
+    private async void PlayDialogue(int dialogueID,bool isShowTips  = false)
     {
         currentDialogueID = dialogueID;
 
@@ -81,7 +81,8 @@ public class DialogueManager : Singleton<DialogueManager>
             var eventLinkDatas = CurrentEventList.eventLinks.FirstOrDefault(el => el.eventLinkId == dialogueID);
             if (eventLinkDatas != null && !EventSystemManager.Instance.CeekEventGroupComplete(eventLinkDatas.eventConditions))
             {
-                EventTipsPanel.OpenPanel(eventLinkDatas);
+                if(isShowTips)
+                    EventTipsPanel.OpenPanel(eventLinkDatas);
                 onCancel?.Invoke();
                 return;
             }

Assets/Scripts/GameUI/UI/AppBarPanel/TitlePanel.cs

@@ -8,6 +8,8 @@ namespace Fort23.Mono
     public partial class TitlePanel : UIPanel
     {
         List<EnergyWidget> widgets = new List<EnergyWidget>();
+        
+         List<int> moRen =new List<int>() { 1001, 1002 };
 
         private void Init()
         {
@@ -25,8 +27,9 @@ namespace Fort23.Mono
         {
         }
 
-        public async static CTask<TitlePanel> OpenPanel(List<int> items)
+        public async static CTask<TitlePanel> OpenPanel(List<int> items = null)
         {
+           
             TitlePanel appBarPanel = null;
             if (UIManager.Instance.GetComponent<TitlePanel>() == null)
             {
@@ -44,6 +47,11 @@ namespace Fort23.Mono
 
         public async CTask CustomInit(List<int> items)
         {
+            if (items == null)
+            {
+                items = moRen;
+            }
+            
             foreach (var energyWidget in widgets)
             {
                 UIManager.Instance.DormancyGComponent(energyWidget);

Assets/Scripts/GameUI/UI/DivineSence/BossInfoHeadWidget.cs

@@ -0,0 +1,30 @@
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "BossInfoHeadWidget"  )]
+	public partial class BossInfoHeadWidget : ItemWidgetBasic
+	{
+		public CombatHeroInfo _combatHero;
+		private void Init()
+		{
+
+		}
+		public override void AddEvent()
+		{
+
+		}
+		public override void DelEvent()
+		{
+
+		}
+		public override void AddButtonEvent()
+		{
+			base.AddButtonEvent();
+		}
+
+		public void CustomInit(CombatHeroInfo combatHeroInfo)
+		{
+			_combatHero = combatHeroInfo;
+		}
+
+	}
+}

Assets/Scripts/GameUI/UI/DivineSence/BossInfoHeadWidget.cs.meta

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

Assets/Scripts/GameUI/UI/DivineSence/BossInfoPanel.cs

@@ -18,9 +18,10 @@ namespace Fort23.Mono
 
         private LevelbattleConfig levelbattleConfig;
         private GroupConfig groupConfig;
-        private HeroModelConfig heroModelConfig;
-        private MonsterPowerUpConfig heroPowerUpConfig;
-        private CombatHeroInfo combatHeroInfo;
+        List<BossInfoHeadWidget> BossInfoHeadWidgets = new List<BossInfoHeadWidget>();
+        // private HeroModelConfig heroModelConfig;
+        // private MonsterPowerUpConfig heroPowerUpConfig;
+        // private CombatHeroInfo combatHeroInfo;
 
         private void Init()
         {
@@ -47,7 +48,7 @@ namespace Fort23.Mono
             Btn_Cancel.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
 
             Btn_Player.onClick.AddListener(() => { UpdateInfo(1); });
-            Btn_Boss.onClick.AddListener(() => { UpdateInfo(2); });
+            // Btn_Boss.onClick.AddListener(() => { UpdateInfo(2); });
         }
 
         private CTask<bool> result;
@@ -67,16 +68,37 @@ namespace Fort23.Mono
             this.result = result;
             levelbattleConfig = ConfigComponent.Instance.Get<LevelbattleConfig>(levebattleId);
             groupConfig = ConfigComponent.Instance.Get<GroupConfig>(levelbattleConfig.Group[0]);
-            heroModelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[0]);
-            heroPowerUpConfig = ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
-
-            combatHeroInfo = new CombatHeroInfo();
-            combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
+            foreach (var i in groupConfig.GroupMonster)
+            {
+                HeroModelConfig heroModelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(i);
+                MonsterPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
+                CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
+                combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
+
+                BossInfoHeadWidget bossInfoHeadWidget  = await UIManager.Instance.CreateGComponent<BossInfoHeadWidget>(null,BossInfoHeadRoot);
+                bossInfoHeadWidget.CustomInit(combatHeroInfo);
+                bossInfoHeadWidget.OnClick = OnClick;
+                BossInfoHeadWidgets.Add(bossInfoHeadWidget);
+            }
+            // heroModelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[0]);
+            // heroPowerUpConfig = ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
+            //
+            // CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
+            // combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
+            BossInfoHeadWidgets[0].OnPointerClick();
+            // UpdateInfo(2,BossInfoHeadWidgets[0]);
+        }
 
-            UpdateInfo(2);
+        private void OnClick(ItemWidgetBasic obj)
+        {
+            BossInfoHeadWidget bossInfoHeadWidget = obj as BossInfoHeadWidget;
+            UpdateInfo(2,bossInfoHeadWidget._combatHero);
+            Icon_Select.transform.SetParent(bossInfoHeadWidget.transform);
+            Icon_Select.transform.SetAsFirstSibling();
+            Icon_Select.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
         }
 
-        public async void UpdateInfo(int type)
+        public async void UpdateInfo(int type, CombatHeroInfo combatHeroInfo = null)
         {
             foreach (var gongFaWidgetType2 in gongFaWidgetType2s)
             {
@@ -135,15 +157,15 @@ namespace Fort23.Mono
             }
             else
             {
-                Icon_Select.transform.SetParent(Btn_Boss.transform);
-                Icon_Select.transform.SetAsFirstSibling();
-                Icon_Select.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
+                // Icon_Select.transform.SetParent(Btn_Boss.transform);
+                // Icon_Select.transform.SetAsFirstSibling();
+              
                 Text_Name.text = "名称：" + LanguageManager.Instance.Text(combatHeroInfo.modelConfig.name);
 
 
-                Text_Jingjie.text = "境界：" + LanguageManager.Instance.Text(heroPowerUpConfig.jingjie1) +
-                                    LanguageManager.Instance.Text(heroPowerUpConfig.jingjie2) +
-                                    LanguageManager.Instance.Text(heroPowerUpConfig.jingjie3);
+                Text_Jingjie.text = "境界：" + LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie1) +
+                                    LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie2) +
+                                    LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie3);
 
                 using (CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer())
                 {
@@ -155,7 +177,7 @@ namespace Fort23.Mono
                             bool isUlock = combatHeroInfo.level >= combatHeroInfo.modelConfig.fabaoActiveLv[i];
                             cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<GongFaWidgetType2>((faBaoWidget) =>
                             {
-                                faBaoWidget.CustomInit(new FaBaoInfo(combatHeroInfo.modelConfig.fa_bao_id[index], heroPowerUpConfig.FabaoLv, 1),isUlock);
+                                faBaoWidget.CustomInit(new FaBaoInfo(combatHeroInfo.modelConfig.fa_bao_id[index], combatHeroInfo.MonsterPowerUpConfig.FabaoLv, 1),isUlock);
                                 faBaoWidget.OnClick = FaBaoWidgetOnClick;
                                 gongFaWidgetType2s.Add(faBaoWidget);
                             }, FabaoRoot));
@@ -170,7 +192,7 @@ namespace Fort23.Mono
                             bool isUlock = combatHeroInfo.level >= combatHeroInfo.modelConfig.skillActiveLv[i];
                             cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<GongFaWidgetType2>((skillWidget) =>
                             {
-                                skillWidget.CustomInit(new SkillInfo(combatHeroInfo.modelConfig.skillID[index], heroPowerUpConfig.GongfaLv, heroPowerUpConfig.GongfaStar));
+                                skillWidget.CustomInit(new SkillInfo(combatHeroInfo.modelConfig.skillID[index], combatHeroInfo.MonsterPowerUpConfig.GongfaLv, combatHeroInfo.MonsterPowerUpConfig.GongfaStar));
                                 skillWidget.OnClick = FaBaoWidgetOnClick;
                                 gongFaWidgetType2s.Add(skillWidget);
                             }, GongfaRoot));
@@ -210,7 +232,15 @@ namespace Fort23.Mono
             }
 
             gongFaWidgetType2s.Clear();
+            
+            foreach (var bossInfoHeadWidget in BossInfoHeadWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(bossInfoHeadWidget);
+            }
+            BossInfoHeadWidgets.Clear();
 
+            Icon_Select.transform.SetParent(transform);
+            Icon_Select.transform.SetAsFirstSibling();
             result?.SetResult(isOk);
             base.Close();
         }
@@ -218,6 +248,7 @@ namespace Fort23.Mono
         public async static CTask<bool> OpenPanel(int levebattleId)
         {
             CTask<bool> result = CTask<bool>.Create();
+            
             BossInfoPanel bossInfoPanel = await UIManager.Instance.LoadAndOpenPanel<BossInfoPanel>(null, UILayer.Top, uiData: new object[] { levebattleId, result },isShowBG:true);
             // bossInfoPanel.CustomInit(levebattleId, result);
             return await result;

Assets/Scripts/GameUI/UI/DivineSence/BossInfoPanelData.cs

@@ -96,17 +96,6 @@ namespace Fort23.Mono
 	      return _Text_Linggen;
 	     }
 	   }
-	  private Button _Btn_Boss;
-	  public Button Btn_Boss
-	   {
-	   get{
-	      if (_Btn_Boss == null)
-	       {
-	         _Btn_Boss  = GetUIUnit<Button>("Btn_Boss"); 
-	       }
-	      return _Btn_Boss;
-	     }
-	   }
 	  private Button _Btn_Player;
 	  public Button Btn_Player
 	   {
@@ -162,6 +151,17 @@ namespace Fort23.Mono
 	      return _Icon_Select;
 	     }
 	   }
+	  private RectTransform _BossInfoHeadRoot;
+	  public RectTransform BossInfoHeadRoot
+	   {
+	   get{
+	      if (_BossInfoHeadRoot == null)
+	       {
+	         _BossInfoHeadRoot  = GetUIUnit<RectTransform>("BossInfoHeadRoot"); 
+	       }
+	      return _BossInfoHeadRoot;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/DivineSence/SkipToWidget.cs

@@ -29,7 +29,7 @@ namespace Fort23.Mono
 		public void CustonInit(int skiptoId)
 		{
 			SkiptoConfig = ConfigComponent.Instance.Get<SkiptoConfig>(skiptoId);
-			Text_Name.text = LanguageManager.Instance.Text(SkiptoConfig.SkipTxt1);
+			Text_Name.text = LanguageManager.Instance.Text(SkiptoConfig.SkipTxt);
 		}
 
 	}

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -27,8 +27,8 @@ namespace Fort23.Mono
 
         private void Init()
         {
-            IsShowAppBar = true;
-            isAddStack = false;
+            IsShowAppBar = false;
+            isAddStack = true;
         }
 
         protected override void AddEvent()
@@ -455,7 +455,7 @@ namespace Fort23.Mono
 
         public async static CTask<HeroBreakthroughPanel> OpenPanel()
         {
-            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isFocus: false, isShowBG: true);
+            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isShowBG: true);
             heroBreakthroughPanel.CustomInit();
             return heroBreakthroughPanel;
         }
@@ -464,7 +464,7 @@ namespace Fort23.Mono
         //渡劫预览
         public async static CTask<HeroBreakthroughPanel> OpenPanel1(HeroInfo heroInfo1)
         {
-            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isFocus: false, isShowBG: true);
+            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isShowBG: true);
             heroBreakthroughPanel.CustomInit(heroInfo1);
             return heroBreakthroughPanel;
         }

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -68,6 +68,10 @@ namespace Fort23.Mono
                 selectedFaBaoInfo = null;
                 CustomInit(selectIndex);
                 UpdateBjUI(false);
+                
+          
+                
+                SetSelectIcon(currentFaBaoWidget.SelectRoot);
             });
 
             Btn_UpGrade.onClick.AddListener(() =>
@@ -325,9 +329,13 @@ namespace Fort23.Mono
             BtnChangeRoot.SetActive(true);
             currentFaBaoInfo = PlayerManager.Instance.FaBaoControl.FightFaBao[selectIndex];
             selectedFaBaoInfo = currentFaBaoInfo;
-            UpdateCurrentFaBaoWidget();
+           
             UpdateUI(selectedFaBaoInfo);
             UpadaFabaoBag();
+            await UpdateCurrentFaBaoWidget();
+            
+            if(currentFaBaoWidget != null)
+                SetSelectIcon(currentFaBaoWidget.SelectRoot);
         }
 
         private async CTask UpdateCurrentFaBaoWidget()
@@ -357,16 +365,18 @@ namespace Fort23.Mono
 
                 if (faBaoInfo.FaBaoData.useIndex != -1)
                 {
-                    Btn_Change.transform.Gray(true);
+                    Btn_Change.gameObject.SetActive(false);
+                    // Btn_Change.transform.Gray(true);
                 }
                 else
                 {
-                    Btn_Change.transform.RecoverColor();
+                    Btn_Change.gameObject.SetActive(true);
+                    // Btn_Change.transform.RecoverColor();
                 }
 
 
                 Btn_PeiYang.gameObject.SetActive(true);
-                Btn_Change.gameObject.SetActive(true);
+                //Btn_Change.gameObject.SetActive(true);
                 await UpdateFaBaoUI(faBaoInfo);
             }
             else
@@ -459,7 +469,7 @@ namespace Fort23.Mono
             itemWidgetType1s.Clear();
             for (var i = 0; i < faBaoInfo.FabaoPowerupConfig.PowerupItemIDs.Length; i++)
             {
-                ItemWidgetType1 itemWidgetType1 = await UIManager.Instance.CreateGComponent<ItemWidgetType1>(null, ItemRoot);
+                ItemWidgetType1 itemWidgetType1 = await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Game,null, ItemRoot);
                 itemWidgetType1.CustomInit(faBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i], faBaoInfo.FabaoPowerupConfig.PowerupItemCosts[i]);
                 itemWidgetType1s.Add(itemWidgetType1);
             }
@@ -467,7 +477,7 @@ namespace Fort23.Mono
             //大突破需要消耗对应的法宝碎片
             if (faBaoInfo.FabaoPowerupConfig.PromotePieceNum != null && faBaoInfo.FabaoPowerupConfig.PromotePieceNum[0] != -1)
             {
-                ItemWidgetType1 itemWidgetType1 = await UIManager.Instance.CreateGComponent<ItemWidgetType1>(null, ItemRoot);
+                ItemWidgetType1 itemWidgetType1 = await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Game,null, ItemRoot);
                 itemWidgetType1.CustomInit(faBaoInfo.FabaoConfig.ItemID, faBaoInfo.FabaoPowerupConfig.PromotePieceNum[0]);
                 itemWidgetType1s.Add(itemWidgetType1);
             }

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanelData.cs

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

Assets/Scripts/GameUI/ULockWidget.cs

@@ -0,0 +1,158 @@
+using System;
+using Excel2Json;
+using Fort23.Core;
+using Fort23.Mono;
+using Fort23.UTool;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+public class ULockWidget : MonoBehaviour, IPointerClickHandler
+{
+    private int uLockId;
+
+    public int uLockFunction;
+
+
+    public Action ulockCallBack;
+
+    private UnlockConfig _config;
+    private bool _currULock;
+    private Button mUIButton;
+    private bool mIsUnlock;
+
+
+    private void Awake()
+    {
+        if (uLockFunction == 0)
+            return;
+        StartULock();
+        if (mUIButton == null) return;
+    }
+
+    public void SetuLockFunction(int id)
+    {
+        uLockFunction = id;
+        if (uLockFunction == 0)
+        {
+            mIsUnlock = true;
+            UnlockShow(mIsUnlock);
+            return;
+        }
+
+        StartULock();
+        if (mUIButton == null) return;
+    }
+
+
+    public void StartULock()
+    {
+        if (uLockId <= 0)
+        {
+            _config = ULockManager.Instance.GetULockConfig(uLockFunction);
+        }
+        else
+        {
+            _config = ULockManager.Instance.GetULockConfig(uLockId, false);
+        }
+
+        mUIButton = transform.GetComponentInChildren<Button>();
+
+        EventManager.Instance.RemoveEventListener(CustomEventType.RefreshULock, RefreshULock);
+        EventManager.Instance.AddEventListener(CustomEventType.RefreshULock, RefreshULock);
+        ULock();
+    }
+
+    public void UnlockCallBack()
+    {
+        ulockCallBack?.Invoke();
+    }
+
+    private void OnDestroy()
+    {
+        EventManager.Instance.RemoveEventListener(CustomEventType.RefreshULock, RefreshULock);
+        ulockCallBack = null;
+    }
+
+    private void RefreshULock(IEventData e)
+    {
+        ULock();
+    }
+
+
+    private void ULock()
+    {
+        if (_config.ID == 0)
+        {
+            mIsUnlock = true;
+            return;
+        }
+
+        mIsUnlock = ULockManager.Instance.IsULock(_config);
+        UnlockShow(mIsUnlock);
+    }
+
+
+    /// <summary>
+    /// 解锁的表现逻辑
+    /// </summary>
+    /// <param name="isUnlock">是否解锁</param>
+    private void UnlockShow(bool isUnlock)
+    {
+        mIsUnlock = isUnlock;
+        if (gameObject == null) return;
+        Text[] texts = gameObject.GetComponentsInChildren<Text>();
+
+        if (!isUnlock)
+        {
+            if (_config.lockType == 1)
+            {
+                gameObject.SetActive(false);
+            }
+            else if (_config.lockType == 2)
+            {
+                if (mUIButton != null)
+                {
+                    mUIButton.enabled = false;
+                }
+                else
+                {
+                    LogTool.Log("没有碰撞区域" + gameObject.name);
+                }
+
+                gameObject.transform.Gray(true);
+            }
+
+            _currULock = true;
+        }
+        else
+        {
+            if (_config.lockType == 1)
+            {
+                gameObject.SetActive(true);
+            }
+            else if (_config.lockType == 2)
+            {
+                if (mUIButton != null)
+                {
+                    mUIButton.enabled = true;
+                }
+
+                //TODO 恢复正常颜色
+                gameObject.transform.RecoverColor();
+            }
+
+            UnlockCallBack();
+            EventManager.Instance.RemoveEventListener(CustomEventType.RefreshULock, RefreshULock);
+        }
+    }
+
+    public void OnPointerClick(PointerEventData eventData)
+    {
+        LogTool.Log("点击~");
+        if (!mIsUnlock)
+        {
+            TipMessagePanel.OpenTipMessagePanel(ULockManager.Instance.ShowUnlockTips(_config.ID), Vector2.zero);
+        }
+    }
+}

Assets/Scripts/GameUI/ULockWidget.cs.meta

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

qodana.yaml

@@ -0,0 +1,29 @@
+#-------------------------------------------------------------------------------#
+#               Qodana analysis is configured by qodana.yaml file               #
+#             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
+#-------------------------------------------------------------------------------#
+version: "1.0"
+
+#Specify IDE code to run analysis without container (Applied in CI/CD pipeline)
+ide: QDNET
+
+#Specify inspection profile for code analysis
+profile:
+  name: qodana.starter
+
+#Enable inspections
+#include:
+#  - name: <SomeEnabledInspectionId>
+
+#Disable inspections
+#exclude:
+#  - name: <SomeDisabledInspectionId>
+#    paths:
+#      - <path/where/not/run/inspection>
+
+#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
+#bootstrap: sh ./prepare-qodana.sh
+
+#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
+#plugins:
+#  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)