diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022_Timeline Variant.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022_Timeline Variant.prefab index 9a7fa7f50..1a82fc9be 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022_Timeline Variant.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022_Timeline Variant.prefab @@ -5732,6 +5732,11 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 6697986194447116423, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6727806731254963401, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a, type: 3} propertyPath: m_Layer diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/JBP/176.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/JBP/176.prefab index 0f14c70bf..3360148e7 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/JBP/176.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/JBP/176.prefab @@ -2183,6 +2183,8 @@ MonoBehaviour: needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 0 + useRouteFlipX: 0 baseMmove: 0 isRotate: 0 isNot1: 0 diff --git a/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/27.prefab b/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/27.prefab index cf2cc7b3a..3b7c6ec71 100644 --- a/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/27.prefab +++ b/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/27.prefab @@ -334,7 +334,7 @@ MonoBehaviour: isRotate: 1 isNot1: 0 ischild0: 1 - depthOffset: 0 + depthOffset: 350 is2DFish: 0 sortOrder2D: 0 keepAliveTime: 1 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2008 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2008 Variant.prefab index 7644641ad..2ea96a0be 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2008 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2008 Variant.prefab @@ -584,16 +584,20 @@ MonoBehaviour: m_EditorClassIdentifier: beilv: 0 guid: + lastMoveLineId: monsterData: die_Score: 0 isDie: 0 fishTypeConfig: fishNumber: fishName: + fishBrief: fishType: 0 fishScore: 0 killWeight: 0 pathList: + fishImage: + fishMultipleDesc: moveLine: bezierCurveData: name: @@ -602,6 +606,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13013 @@ -619,9 +625,17 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 5122533014505160175} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRouteFlipX: 1 + baseMmove: 0 isRotate: 1 isNot1: 0 ischild0: 1 depthOffset: 810 + is2DFish: 0 + sortOrder2D: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2009 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2009 Variant.prefab index 6c05751a7..7eff14e65 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2009 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2009 Variant.prefab @@ -623,16 +623,20 @@ MonoBehaviour: m_EditorClassIdentifier: beilv: 0 guid: + lastMoveLineId: monsterData: die_Score: 0 isDie: 0 fishTypeConfig: fishNumber: fishName: + fishBrief: fishType: 0 fishScore: 0 killWeight: 0 pathList: + fishImage: + fishMultipleDesc: moveLine: bezierCurveData: name: @@ -641,6 +645,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13014 @@ -658,12 +664,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 5601320423330744558} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRouteFlipX: 1 + baseMmove: 0 isRotate: 1 isNot1: 0 ischild0: 1 depthOffset: 820 + is2DFish: 0 + sortOrder2D: 0 --- !u!4 &7456109067163209629 stripped Transform: m_CorrespondingSourceObject: {fileID: 4642988549198181, guid: 773962850d4405447bb584bc3734b93b, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2011 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2011 Variant.prefab index 3239fafaf..c6da44a6a 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2011 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2011 Variant.prefab @@ -663,6 +663,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13016 @@ -680,11 +682,17 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 2550720441526352770} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRouteFlipX: 1 baseMmove: 0 isRotate: 1 isNot1: 0 ischild0: 1 depthOffset: 840 + is2DFish: 0 + sortOrder2D: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2012 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2012 Variant.prefab index 1eccb62f2..09f4bb6b2 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2012 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2012 Variant.prefab @@ -692,6 +692,7 @@ MonoBehaviour: createVideoClip: {fileID: 0} rotationPY: 80 useMirrorCompensate: 1 + useRouteFlipX: 1 baseMmove: 0 isRotate: 1 isNot1: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab index 4570716d3..6e4c08ae2 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab @@ -341,16 +341,20 @@ MonoBehaviour: m_EditorClassIdentifier: beilv: 0 guid: + lastMoveLineId: monsterData: die_Score: 0 isDie: 0 fishTypeConfig: fishNumber: fishName: + fishBrief: fishType: 0 fishScore: 0 killWeight: 0 pathList: + fishImage: + fishMultipleDesc: moveLine: bezierCurveData: name: @@ -359,6 +363,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13018 @@ -376,12 +382,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 6536531906417029953} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRouteFlipX: 1 + baseMmove: 0 isRotate: 1 isNot1: 0 ischild0: 1 depthOffset: 860 + is2DFish: 0 + sortOrder2D: 0 --- !u!1001 &6537198470344860617 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2014 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2014 Variant.prefab index 7b7d3ddba..446613079 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2014 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2014 Variant.prefab @@ -373,16 +373,20 @@ MonoBehaviour: m_EditorClassIdentifier: beilv: 0 guid: + lastMoveLineId: monsterData: die_Score: 0 isDie: 0 fishTypeConfig: fishNumber: fishName: + fishBrief: fishType: 0 fishScore: 0 killWeight: 0 pathList: + fishImage: + fishMultipleDesc: moveLine: bezierCurveData: name: @@ -391,6 +395,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13024 @@ -408,12 +414,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 6976749960772518159} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRouteFlipX: 1 + baseMmove: 0 isRotate: 1 isNot1: 0 ischild0: 1 depthOffset: 870 + is2DFish: 0 + sortOrder2D: 0 --- !u!1001 &6972630653134549612 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_3002 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_3002 Variant.prefab index 8b515ab08..4d9ee7159 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_3002 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_3002 Variant.prefab @@ -877,6 +877,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13020 @@ -894,12 +896,17 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 8092196371060847562} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRouteFlipX: 1 baseMmove: 0 isRotate: 1 isNot1: 0 ischild0: 1 depthOffset: 890 + is2DFish: 0 + sortOrder2D: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab index 2cf8cf18f..24522b2e3 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab @@ -158,16 +158,20 @@ MonoBehaviour: m_EditorClassIdentifier: beilv: 0 guid: + lastMoveLineId: monsterData: die_Score: 0 isDie: 0 fishTypeConfig: fishNumber: fishName: + fishBrief: fishType: 0 fishScore: 0 killWeight: 0 pathList: + fishImage: + fishMultipleDesc: moveLine: bezierCurveData: name: @@ -176,6 +180,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13001 @@ -193,12 +199,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 1497276017444126853} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} rotationPY: -90 + useMirrorCompensate: 1 + useRouteFlipX: 1 + baseMmove: 0 isRotate: 1 isNot1: 1 ischild0: 1 depthOffset: 1000 + is2DFish: 0 + sortOrder2D: 0 --- !u!4 &3932267669272526887 stripped Transform: m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: 1461200f483c12642a09ef755696d8c4, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1018 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1018 Variant.prefab index 6e3a812ec..4a5368c12 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1018 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1018 Variant.prefab @@ -158,16 +158,30 @@ MonoBehaviour: m_EditorClassIdentifier: beilv: 0 guid: + lastMoveLineId: monsterData: die_Score: 0 isDie: 0 fishTypeConfig: fishNumber: fishName: + fishBrief: fishType: 0 fishScore: 0 killWeight: 0 pathList: + fishImage: + fishMultipleDesc: + moveLine: + bezierCurveData: + name: + start: {x: 0, y: 0} + controlPoints: [] + end: {x: 0, y: 0} + moveTime: 0 + moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13002 @@ -185,12 +199,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 6613943160179652640} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} rotationPY: -90 + useMirrorCompensate: 1 + useRouteFlipX: 1 + baseMmove: 0 isRotate: 1 isNot1: 1 ischild0: 1 depthOffset: 1000 + is2DFish: 0 + sortOrder2D: 0 --- !u!4 &4798522997234469819 stripped Transform: m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: 6f9ba87c0c298204597a3786e912d4f3, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1019 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1019 Variant.prefab index 70e1202c8..5544dd6f2 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1019 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1019 Variant.prefab @@ -164,16 +164,30 @@ MonoBehaviour: m_EditorClassIdentifier: beilv: 0 guid: + lastMoveLineId: monsterData: die_Score: 0 isDie: 0 fishTypeConfig: fishNumber: fishName: + fishBrief: fishType: 0 fishScore: 0 killWeight: 0 pathList: + fishImage: + fishMultipleDesc: + moveLine: + bezierCurveData: + name: + start: {x: 0, y: 0} + controlPoints: [] + end: {x: 0, y: 0} + moveTime: 0 + moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13003 @@ -191,12 +205,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 843371976736088860} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} rotationPY: -90 + useMirrorCompensate: 1 + useRouteFlipX: 1 + baseMmove: 0 isRotate: 1 isNot1: 1 ischild0: 1 depthOffset: 1000 + is2DFish: 0 + sortOrder2D: 0 --- !u!1001 &6761791426332002869 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1020 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1020 Variant.prefab index fee335eb6..46ff0bfe5 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1020 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1020 Variant.prefab @@ -318,16 +318,30 @@ MonoBehaviour: m_EditorClassIdentifier: beilv: 0 guid: + lastMoveLineId: monsterData: die_Score: 0 isDie: 0 fishTypeConfig: fishNumber: fishName: + fishBrief: fishType: 0 fishScore: 0 killWeight: 0 pathList: + fishImage: + fishMultipleDesc: + moveLine: + bezierCurveData: + name: + start: {x: 0, y: 0} + controlPoints: [] + end: {x: 0, y: 0} + moveTime: 0 + moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13004 @@ -345,12 +359,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 65027620505796751} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} rotationPY: -90 + useMirrorCompensate: 1 + useRouteFlipX: 1 + baseMmove: 0 isRotate: 1 isNot1: 1 ischild0: 1 depthOffset: 1000 + is2DFish: 0 + sortOrder2D: 0 --- !u!4 &7024093533638435985 stripped Transform: m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: d0d8725bed789824bb1b0462fde12f45, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab index 0664fb64b..ce198df3e 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab @@ -158,16 +158,30 @@ MonoBehaviour: m_EditorClassIdentifier: beilv: 0 guid: + lastMoveLineId: monsterData: die_Score: 0 isDie: 0 fishTypeConfig: fishNumber: fishName: + fishBrief: fishType: 0 fishScore: 0 killWeight: 0 pathList: + fishImage: + fishMultipleDesc: + moveLine: + bezierCurveData: + name: + start: {x: 0, y: 0} + controlPoints: [] + end: {x: 0, y: 0} + moveTime: 0 + moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13005 @@ -185,12 +199,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 1621051044293585920} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} rotationPY: -90 + useMirrorCompensate: 1 + useRouteFlipX: 1 + baseMmove: 0 isRotate: 1 isNot1: 1 ischild0: 1 depthOffset: 1000 + is2DFish: 0 + sortOrder2D: 0 --- !u!4 &4331926983231046282 stripped Transform: m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: 51618a9fa649dc84bbbb0f2b2ae34548, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab index 2952dd02a..c1fb92d11 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab @@ -53,7 +53,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1709254077376921, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1709254077376921, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} propertyPath: m_TagString @@ -164,16 +164,30 @@ MonoBehaviour: m_EditorClassIdentifier: beilv: 0 guid: + lastMoveLineId: monsterData: die_Score: 0 isDie: 0 fishTypeConfig: fishNumber: fishName: + fishBrief: fishType: 0 fishScore: 0 killWeight: 0 pathList: + fishImage: + fishMultipleDesc: + moveLine: + bezierCurveData: + name: + start: {x: 0, y: 0} + controlPoints: [] + end: {x: 0, y: 0} + moveTime: 0 + moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13006 @@ -191,12 +205,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 4063311169368434864} - bingDongEffect: {fileID: 0} - rotationPY: -90 + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} + rotationPY: 90 + useMirrorCompensate: 1 + useRouteFlipX: 1 + baseMmove: 0 isRotate: 1 isNot1: 1 ischild0: 1 depthOffset: 1000 + is2DFish: 0 + sortOrder2D: 0 --- !u!1001 &5582305301452974272 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1023 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1023 Variant.prefab index 7cf238fa0..7c58cf2be 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1023 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1023 Variant.prefab @@ -324,16 +324,30 @@ MonoBehaviour: m_EditorClassIdentifier: beilv: 0 guid: + lastMoveLineId: monsterData: die_Score: 0 isDie: 0 fishTypeConfig: fishNumber: fishName: + fishBrief: fishType: 0 fishScore: 0 killWeight: 0 pathList: + fishImage: + fishMultipleDesc: + moveLine: + bezierCurveData: + name: + start: {x: 0, y: 0} + controlPoints: [] + end: {x: 0, y: 0} + moveTime: 0 + moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13007 @@ -351,9 +365,17 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 4698499819094165687} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} rotationPY: -90 + useMirrorCompensate: 1 + useRouteFlipX: 1 + baseMmove: 0 isRotate: 1 isNot1: 1 ischild0: 1 depthOffset: 1000 + is2DFish: 0 + sortOrder2D: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab index 12e8d6861..8e203cafb 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab @@ -158,16 +158,20 @@ MonoBehaviour: m_EditorClassIdentifier: beilv: 0 guid: + lastMoveLineId: monsterData: die_Score: 0 isDie: 0 fishTypeConfig: fishNumber: fishName: + fishBrief: fishType: 0 fishScore: 0 killWeight: 0 pathList: + fishImage: + fishMultipleDesc: moveLine: bezierCurveData: name: @@ -176,6 +180,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13008 @@ -193,12 +199,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 4929093940051466871} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} rotationPY: -90 + useMirrorCompensate: 1 + useRouteFlipX: 1 + baseMmove: 0 isRotate: 1 isNot1: 1 ischild0: 1 depthOffset: 1000 + is2DFish: 0 + sortOrder2D: 0 --- !u!4 &7201521853190922041 stripped Transform: m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: 8aca3c1d421ff8e4c87619bd4511a615, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1025 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1025 Variant.prefab index edac65e2a..922bb3687 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1025 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1025 Variant.prefab @@ -164,16 +164,20 @@ MonoBehaviour: m_EditorClassIdentifier: beilv: 0 guid: + lastMoveLineId: monsterData: die_Score: 0 isDie: 0 fishTypeConfig: fishNumber: fishName: + fishBrief: fishType: 0 fishScore: 0 killWeight: 0 pathList: + fishImage: + fishMultipleDesc: moveLine: bezierCurveData: name: @@ -182,6 +186,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13009 @@ -199,12 +205,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 1513225839292478598} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} rotationPY: -90 + useMirrorCompensate: 1 + useRouteFlipX: 1 + baseMmove: 0 isRotate: 1 isNot1: 1 ischild0: 1 depthOffset: 1000 + is2DFish: 0 + sortOrder2D: 0 --- !u!1001 &6202979445234625319 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab index fe56c2f88..1ee69dc99 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab @@ -236,16 +236,20 @@ MonoBehaviour: m_EditorClassIdentifier: beilv: 0 guid: + lastMoveLineId: monsterData: die_Score: 0 isDie: 0 fishTypeConfig: fishNumber: fishName: + fishBrief: fishType: 0 fishScore: 0 killWeight: 0 pathList: + fishImage: + fishMultipleDesc: moveLine: bezierCurveData: name: @@ -254,6 +258,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13010 @@ -271,12 +277,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 8119681082241791630} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} rotationPY: 30 + useMirrorCompensate: 1 + useRouteFlipX: 1 + baseMmove: 0 isRotate: 1 isNot1: 0 ischild0: 1 depthOffset: 1000 + is2DFish: 0 + sortOrder2D: 0 --- !u!1001 &2585595305865003636 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1027 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1027 Variant.prefab index 7994f8885..c90111d5f 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1027 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1027 Variant.prefab @@ -158,16 +158,20 @@ MonoBehaviour: m_EditorClassIdentifier: beilv: 0 guid: + lastMoveLineId: monsterData: die_Score: 0 isDie: 0 fishTypeConfig: fishNumber: fishName: + fishBrief: fishType: 0 fishScore: 0 killWeight: 0 pathList: + fishImage: + fishMultipleDesc: moveLine: bezierCurveData: name: @@ -176,6 +180,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13011 @@ -193,12 +199,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 8770686222094608858} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} rotationPY: -90 + useMirrorCompensate: 1 + useRouteFlipX: 1 + baseMmove: 0 isRotate: 1 isNot1: 1 ischild0: 1 depthOffset: 1000 + is2DFish: 0 + sortOrder2D: 0 --- !u!4 &3527731164989796449 stripped Transform: m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: 10dcab870ce73d24abf17f9ea84712ad, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1028 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1028 Variant.prefab index 4b9b9985c..d7ad70953 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1028 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1028 Variant.prefab @@ -158,16 +158,20 @@ MonoBehaviour: m_EditorClassIdentifier: beilv: 0 guid: + lastMoveLineId: monsterData: die_Score: 0 isDie: 0 fishTypeConfig: fishNumber: fishName: + fishBrief: fishType: 0 fishScore: 0 killWeight: 0 pathList: + fishImage: + fishMultipleDesc: moveLine: bezierCurveData: name: @@ -176,6 +180,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13012 @@ -193,12 +199,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 6143660667663271190} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} rotationPY: -90 + useMirrorCompensate: 1 + useRouteFlipX: 1 + baseMmove: 0 isRotate: 1 isNot1: 1 ischild0: 1 depthOffset: 1000 + is2DFish: 0 + sortOrder2D: 0 --- !u!4 &3079608771229918319 stripped Transform: m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: d441aa2f2c0f8524e9a494199140b726, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab index 2dfbf2e82..7710e87a2 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab @@ -319,6 +319,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 0 @@ -336,14 +338,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 8487291494278195416} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRouteFlipX: 1 baseMmove: 0 isRotate: 1 isNot1: 0 ischild0: 1 depthOffset: 830 + is2DFish: 0 + sortOrder2D: 0 --- !u!4 &4073602345332461237 stripped Transform: m_CorrespondingSourceObject: {fileID: 4472185465350827, guid: c61d7b09b58215148aaffc1b82f11bf4, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_3001 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_3001 Variant.prefab index b9070ac62..6d43d5fe0 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_3001 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_3001 Variant.prefab @@ -453,16 +453,20 @@ MonoBehaviour: m_EditorClassIdentifier: beilv: 0 guid: + lastMoveLineId: monsterData: die_Score: 0 isDie: 0 fishTypeConfig: fishNumber: fishName: + fishBrief: fishType: 0 fishScore: 0 killWeight: 0 pathList: + fishImage: + fishMultipleDesc: moveLine: bezierCurveData: name: @@ -471,6 +475,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13019 @@ -488,12 +494,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 1329100429413357316} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRouteFlipX: 1 + baseMmove: 0 isRotate: 1 isNot1: 0 ischild0: 1 depthOffset: 880 + is2DFish: 0 + sortOrder2D: 0 --- !u!1001 &8244822918661465325 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_3003 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_3003 Variant.prefab index 796238bcb..7ac776777 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_3003 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_3003 Variant.prefab @@ -701,6 +701,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13021 @@ -718,15 +720,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 7099483109033587896} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRouteFlipX: 1 baseMmove: 0 isRotate: 1 isNot1: 0 ischild0: 1 depthOffset: 900 + is2DFish: 0 + sortOrder2D: 0 --- !u!4 &7952344689971121780 stripped Transform: m_CorrespondingSourceObject: {fileID: 4918264173551851, guid: a87bdbcfa12d35644b5c34825a6e6591, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_3004 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_3004 Variant.prefab index 36300b3bd..b6b8a8a5e 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_3004 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_3004 Variant.prefab @@ -1052,6 +1052,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13022 @@ -1069,15 +1071,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 7626289246856194830} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRouteFlipX: 1 baseMmove: 0 isRotate: 1 isNot1: 0 ischild0: 1 depthOffset: 910 + is2DFish: 0 + sortOrder2D: 0 --- !u!4 &8103313998890164229 stripped Transform: m_CorrespondingSourceObject: {fileID: 4900271049623953, guid: e4de03f3bbdf4d643b88a0ed7bd4df63, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_3005 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_3005 Variant.prefab index 36ee7d75b..16f30f2b2 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_3005 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_3005 Variant.prefab @@ -433,6 +433,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 13023 @@ -450,15 +452,20 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 6415108411962225159} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 30 + useMirrorCompensate: 1 + useRouteFlipX: 1 baseMmove: 0 isRotate: 1 isNot1: 0 ischild0: 1 depthOffset: 920 + is2DFish: 0 + sortOrder2D: 0 --- !u!4 &3085370228904392803 stripped Transform: m_CorrespondingSourceObject: {fileID: 4967328832014496, guid: dfd6e1dcb49f5c9459f3a2abeb4c6135, diff --git a/Assets/MyGame/aa/Game/HHWK/MonsterTSY/SDY/GameObject.prefab b/Assets/MyGame/aa/Game/HHWK/MonsterTSY/SDY/GameObject.prefab index 896ba65e0..e33cba87d 100644 --- a/Assets/MyGame/aa/Game/HHWK/MonsterTSY/SDY/GameObject.prefab +++ b/Assets/MyGame/aa/Game/HHWK/MonsterTSY/SDY/GameObject.prefab @@ -92,7 +92,7 @@ MonoBehaviour: minBJCount: 10 maxBJCount: 15 laserPrefab: {fileID: 0} - laserLengthCorrect: 1 + laserLengthCorrect: 20 lightningMaterial: {fileID: 2100000, guid: a023113e8eb8bf245b8ba10c3e9788d1, type: 2} lightningColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} lightningWidth: 0.08 diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/XingJiXunHangEvent.cs b/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/XingJiXunHangEvent.cs index cc3f41e2f..cbef940be 100644 --- a/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/XingJiXunHangEvent.cs +++ b/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/XingJiXunHangEvent.cs @@ -1395,6 +1395,11 @@ public class XingJiXunHangEvent : BJRedPacketEvent /// /// 播放满屏暴击文字（IronFist/GammaStorm 用）。 /// 自己看 TextCrit_Self，他人看 TextCrit_Other。 + /// + /// ⭐ 文字内容：预制体里写死的是占位 '123'，必须由代码写入「爆奖小鱼死亡累加的面板分」 + /// （，与奖励框上滚动的分同一个值，封顶 maxScore）。 + /// ⭐ 层级：克隆体根上挂着嵌套 Canvas，美术里是无效层ID + order 5， + /// 会被 FullScreen 框（Default, order 12）压在下面 → 这里显式改成 Default + 更高 order。 /// private void PlayTextCrit() { @@ -1405,20 +1410,59 @@ public class XingJiXunHangEvent : BJRedPacketEvent return; } + GameObject critObj; if (isSelf) { // ⭐ 满屏暴击文字是 UI → 放 UI 中心，加入统一销毁列表 - SpawnUiEffect(critPrefab); + critObj = SpawnUiEffect(critPrefab); Debug.Log("[XingJiXunHang] 播放满屏暴击（自己，UI中心）"); } else { Vector3 critPos = GetSeatPosition() + Vector3.up * 2f; - var critObj = SpawnWorldEffect(critPrefab, critPos); + critObj = SpawnWorldEffect(critPrefab, critPos); if (critObj != null) critObj.transform.localScale = Vector3.one * 0.6f; Debug.Log($"[XingJiXunHang] 播放满屏暴击（他人） pos={critPos}"); } + + if (critObj == null) + { + Debug.LogWarning("[XingJiXunHang] 暴击文字生成失败，跳过分数写入"); + return; + } + + // ⭐ 写入分数：爆奖过程中小鱼死亡累加的面板分（_bossPanelScore） + // 该 TMP 的 spriteAsset 已配好「数字→图片」映射，直接赋数字即可 + var critTmp = critObj.GetComponentInChildren(true); + if (critTmp != null) + { + critTmp.text = _bossPanelScore.ToString(); + Debug.Log($"[XingJiXunHang] 暴击文字分数 = {_bossPanelScore}（上限{maxScore}）"); + if (_bossPanelScore <= 0) + Debug.LogWarning("[XingJiXunHang] 暴击文字分数为 0：本次没有小鱼死亡累加（面板分仍为 0）"); + } + else + { + Debug.LogWarning($"[XingJiXunHang] 暴击文字 {critObj.name} 上没找到 TMP，分数未写入"); + } + + // ⭐ 修层级：嵌套 Canvas → Default(0) + 高于 FullScreen(order 12)， + // 否则暴击文字会被全屏特效框挡住（美术里的 -559336389 在本项目 TagManager 里不存在） + var critCanvas = critObj.GetComponent(); + if (critCanvas == null) + critCanvas = critObj.GetComponentInChildren(true); + if (critCanvas != null) + { + critCanvas.overrideSorting = true; + critCanvas.sortingLayerID = 0; // Default（本项目只有 Default 一个排序层） + critCanvas.sortingOrder = 15; // 高于 FullScreen 的 12 + Debug.Log($"[XingJiXunHang] 暴击文字 Canvas 层级修正: Default / order={critCanvas.sortingOrder}"); + } + else + { + Debug.LogWarning($"[XingJiXunHang] 暴击文字 {critObj.name} 上没找到 Canvas，层级未修正"); + } } // ==================== 伽马风暴暴击框 ==================== diff --git a/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab b/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab index 057b26341..c1146b45f 100644 --- a/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab +++ b/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab @@ -1,5 +1,126 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &146279964181415709 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7610320278346483686} + - component: {fileID: 7995503855618223113} + - component: {fileID: 698821228844889235} + - component: {fileID: 4690681785649858997} + m_Layer: 0 + m_Name: "\u53D6\u6D88" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7610320278346483686 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146279964181415709} + 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: 2863894760804413439} + m_Father: {fileID: 8943349817982294555} + 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: -134} + m_SizeDelta: {x: 214, y: 76} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7995503855618223113 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146279964181415709} + m_CullTransparentMesh: 1 +--- !u!114 &698821228844889235 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146279964181415709} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: 16da846f90f3a7e4d9328e5c37f56662, type: 3} + 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 +--- !u!114 &4690681785649858997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146279964181415709} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 698821228844889235} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &226342615428984370 GameObject: m_ObjectHideFlags: 0 @@ -372,6 +493,157 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1042183821058463455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6568779182836207958} + - component: {fileID: 1335276876104337439} + - component: {fileID: 1739738869493849467} + m_Layer: 0 + m_Name: AutoTuiChu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6568779182836207958 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1042183821058463455} + 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: 2370587856912769402} + m_Father: {fileID: 8080891624328096898} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1335276876104337439 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1042183821058463455} + m_CullTransparentMesh: 1 +--- !u!114 &1739738869493849467 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1042183821058463455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.72156864} + 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 +--- !u!1 &1866808158085478893 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2220791419968509007} + - component: {fileID: 7143973670828032172} + - component: {fileID: 1586198952313992744} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_003 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2220791419968509007 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1866808158085478893} + 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: 8943349817982294555} + 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.5000458, y: 180} + m_SizeDelta: {x: 688, y: 64} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7143973670828032172 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1866808158085478893} + m_CullTransparentMesh: 1 +--- !u!114 &1586198952313992744 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1866808158085478893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: 7e601aa695a70b04286a190d42a2f977, type: 3} + 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 --- !u!1 &1998658042457417478 GameObject: m_ObjectHideFlags: 0 @@ -477,6 +749,88 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &2074961365295895660 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8943349817982294555} + - component: {fileID: 5448225625076804924} + - component: {fileID: 1954670810983891074} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_008 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8943349817982294555 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2074961365295895660} + 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: 2220791419968509007} + - {fileID: 6576399731635427584} + - {fileID: 1469249353319193489} + - {fileID: 6879397810085165902} + - {fileID: 3618157982456098559} + - {fileID: 7923238414783646036} + - {fileID: 7610320278346483686} + m_Father: {fileID: 2370587856912769402} + 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.000034332275, y: 0} + m_SizeDelta: {x: 707, y: 436} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5448225625076804924 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2074961365295895660} + m_CullTransparentMesh: 1 +--- !u!114 &1954670810983891074 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2074961365295895660} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: bacc3cfa078ee8642a1510a5273ec1dd, type: 3} + 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 --- !u!1 &2188744404197941840 GameObject: m_ObjectHideFlags: 0 @@ -628,6 +982,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2388973605809241699 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6879397810085165902} + - component: {fileID: 699058676069187930} + - component: {fileID: 1954404910516767567} + m_Layer: 0 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6879397810085165902 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2388973605809241699} + 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: 8943349817982294555} + 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: -47.407837} + m_SizeDelta: {x: 607.0317, y: 84.811} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &699058676069187930 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2388973605809241699} + m_CullTransparentMesh: 1 +--- !u!114 &1954404910516767567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2388973605809241699} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uFF084\u79D2\u540E\u81EA\u52A8\u5173\u95ED\uFF09" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4284255225 + m_fontColor: {r: 0.97647065, g: 0.54509807, b: 0.36078432, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30.3 + m_fontSizeBase: 30.3 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2397240757406755661 GameObject: m_ObjectHideFlags: 0 @@ -1402,6 +1891,426 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4370261944620323073 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1469249353319193489} + - component: {fileID: 1290312646861823777} + - component: {fileID: 2241025559671534654} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1469249353319193489 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4370261944620323073} + 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: 8943349817982294555} + 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.000061035, y: 55} + m_SizeDelta: {x: 607.0317, y: 132.0024} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1290312646861823777 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4370261944620323073} + m_CullTransparentMesh: 1 +--- !u!114 &2241025559671534654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4370261944620323073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u7531\u4E8E\u60A8\u957F\u65F6\u95F4\u672A\u53D1\u5C04\u5B50\u5F39\uFF01\u8BF7\u91CD\u65B0\u8FDB\u5165\u623F\u95F4\u3002" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 39.7 + m_fontSizeBase: 39.7 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4591060735373684615 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7923238414783646036} + - component: {fileID: 7286542906771985945} + - component: {fileID: 3786789222787382608} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7923238414783646036 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4591060735373684615} + 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: 8943349817982294555} + 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: -303.99994, y: -124.5} + m_SizeDelta: {x: 131, y: 207} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7286542906771985945 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4591060735373684615} + m_CullTransparentMesh: 1 +--- !u!114 &3786789222787382608 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4591060735373684615} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: 993c055ed2062b44f989b314873ef95a, type: 3} + 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 +--- !u!1 &5174844030117704396 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6576399731635427584} + - component: {fileID: 3702455275403114182} + - component: {fileID: 2636308053676348222} + m_Layer: 0 + m_Name: BY_beibao8(5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6576399731635427584 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5174844030117704396} + 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: 8943349817982294555} + 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: -271.5, y: 187.5} + m_SizeDelta: {x: 168, y: 103} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3702455275403114182 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5174844030117704396} + m_CullTransparentMesh: 1 +--- !u!114 &2636308053676348222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5174844030117704396} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: eb0febea1946c18488181e102d3b34a5, type: 3} + 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 +--- !u!1 &5228984926687447611 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2863894760804413439} + - component: {fileID: 4879923100596547690} + - component: {fileID: 3270370649873089539} + m_Layer: 0 + m_Name: "\u786E\u8BA4" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2863894760804413439 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5228984926687447611} + 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: 7610320278346483686} + 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: 2.500019, y: 0.49996948} + m_SizeDelta: {x: 75, y: 37} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4879923100596547690 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5228984926687447611} + m_CullTransparentMesh: 1 +--- !u!114 &3270370649873089539 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5228984926687447611} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u786E\u8BA4" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4284883250 + m_fontColor: {r: 0.19607845, g: 0.12941177, b: 0.40000004, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 48.7 + m_fontSizeBase: 48.7 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &5414632272848475671 GameObject: m_ObjectHideFlags: 0 @@ -1598,6 +2507,81 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &5843372822524318731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3618157982456098559} + - component: {fileID: 781002890561141536} + - component: {fileID: 3817214592353850820} + m_Layer: 0 + m_Name: "\u63D0\u793A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3618157982456098559 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5843372822524318731} + 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: 8943349817982294555} + 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: -178.99998, y: 171.99994} + m_SizeDelta: {x: 65, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &781002890561141536 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5843372822524318731} + m_CullTransparentMesh: 1 +--- !u!114 &3817214592353850820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5843372822524318731} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: 8df00905cfe2fdf46ac3cc533936bbec, type: 3} + 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 --- !u!1 &5860049383923451584 GameObject: m_ObjectHideFlags: 0 @@ -1644,9 +2628,11 @@ RectTransform: - {fileID: 879279455075345705} - {fileID: 6423145012526947125} - {fileID: 6612338428389666415} + - {fileID: 8118424830884324839} - {fileID: 5427923924039758468} - {fileID: 6537984618613265461} - {fileID: 9222032528863197982} + - {fileID: 6568779182836207958} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1673,6 +2659,8 @@ MonoBehaviour: tmp_DJS: {fileID: 1760768290810762287} btn_QueRen: {fileID: 8480788286452652466} btn_QuXiao: {fileID: 4864175864556557908} + idleWarnSeconds: 10 + idleExitCountdownSeconds: 60 sceneName: FLZY gameType: 1 propConfigData: {fileID: 11400000, guid: 2d8fe2d5eb5e28e4daa6dda98ef29515, type: 2} @@ -1735,15 +2723,18 @@ MonoBehaviour: toggle_Lock: {fileID: 7956581350814959936} toggle_Three: {fileID: 911966240696267575} toggle_Shuang: {fileID: 5096120575039611240} + currShuangTime: 0 toggle_BaoZou: {fileID: 6731404785578067400} tmp_BaoZouCount: {fileID: 8854401047233665172} img_BaoZou: {fileID: 5398658157976045972} + frenzyDuration: 15 currFrenzyTime: 0 toggle_BingFeng: {fileID: 3213021335351199576} tmp_BingFengCount: {fileID: 6558852404690691716} img_BingFeng: {fileID: 1284969899439567079} bingFengEffect: {fileID: 1709254077376921, guid: a2a34db230a06c64c8d7cfad89a22d10, type: 3} + bingFengDuration: 15 currBingFengTime: 0 btn_GuaGuaKa: {fileID: 5539631721029705987} tmp_GGKCount: {fileID: 7353841231670185141} @@ -1757,6 +2748,9 @@ MonoBehaviour: botRotateSpeed: 80 bullet_Test: {fileID: 0} bulletParent: {fileID: 911064000014996888} + autoExitGamePanel: {fileID: 1042183821058463455} + tmp_ExitDaoJiShi: {fileID: 1954404910516767567} + btn_CloseAutoExitGamePanel: {fileID: 4690681785649858997} turretLongPressThreshold: 0.5 boardCast_Boss: {fileID: 0} createVideoPlayer: {fileID: 3675753497965075354} @@ -2410,6 +3404,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7359038749631093391 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8118424830884324839} + - component: {fileID: 3938089167764774786} + - component: {fileID: 1253514800502002631} + m_Layer: 5 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8118424830884324839 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7359038749631093391} + 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: 8080891624328096898} + 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: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3938089167764774786 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7359038749631093391} + m_CullTransparentMesh: 1 +--- !u!114 &1253514800502002631 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7359038749631093391} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u7531\u4E8E\u60A8\u8D85\u8FC710\u79D2\u6CA1\u6709\u64CD\u4F5C \u964D\u572860\u79D2\u540E\u81EA\u52A8\u9000\u51FA" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7511940929592353008 GameObject: m_ObjectHideFlags: 0 @@ -2815,6 +3944,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7704727320105775903 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2370587856912769402} + - component: {fileID: 2253279806648149239} + - component: {fileID: 2777869882206446698} + m_Layer: 0 + m_Name: "\u63D0\u793A (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2370587856912769402 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7704727320105775903} + 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: 8943349817982294555} + m_Father: {fileID: 6568779182836207958} + 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: 707, y: 436} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2253279806648149239 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7704727320105775903} + m_CullTransparentMesh: 1 +--- !u!114 &2777869882206446698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7704727320105775903} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + 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: 21300000, guid: bacc3cfa078ee8642a1510a5273ec1dd, type: 3} + 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 --- !u!1 &7728144604636124842 GameObject: m_ObjectHideFlags: 0 @@ -2827,7 +4032,7 @@ GameObject: - component: {fileID: 7621125490824864661} - component: {fileID: 4898381958880738074} m_Layer: 0 - m_Name: "\u63D0\u793A" + m_Name: TuiChuTiShi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3971,7 +5176,7 @@ PrefabInstance: - target: {fileID: 3429558903206714841, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} @@ -3981,7 +5186,7 @@ PrefabInstance: - target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5494969937974881520, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} @@ -4768,6 +5973,46 @@ PrefabInstance: propertyPath: m_Name value: Skill objectReference: {fileID: 0} + - target: {fileID: 3174822985052505674, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3174822985052505674, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3174822985052505674, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3174822985052505674, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4372439851895781642, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4372439851895781642, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4372439851895781642, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4372439851895781642, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6054686172250928835, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, type: 3} propertyPath: m_Pivot.x @@ -4868,6 +6113,46 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7250113574424037779, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7250113574424037779, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7250113574424037779, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7250113574424037779, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7942853405418363685, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7942853405418363685, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7942853405418363685, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7942853405418363685, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -5768,6 +7053,16 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 397833008454374056, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 397833008454374056, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 450003735944806845, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_SortingLayer diff --git a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs index a233ed022..9527961d7 100644 --- a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs +++ b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs @@ -118,6 +118,18 @@ public class GameMainPanel_FishBase : GameMainPanel_Base /// 是否正在退出倒计时（期间屏蔽帧同步和爆奖特效） private bool _isLeavingCountdown = false; private Coroutine _leaveCountdownCoroutine; + + [Header("无操作自动退出")] + [Tooltip("无操作总时长（秒），走完自动退出回大厅（<=0 关闭该功能）")] + public float idleExitTotalSeconds = 70f; + [Tooltip("最后多少秒才显示倒计时面板（autoExitGamePanel）并逐秒倒数，之前全程无提示")] + public float idleExitPanelShowSeconds = 10f; + /// 无操作计时是否生效（资源加载完成后才开始计时，OnHide/离房时失效） + private bool _idleExitArmed = false; + /// 最近一次玩家操作的时间（Time.realtimeSinceStartup，含切后台时间） + private float _lastOperationTime = 0f; + /// 警告文本当前显示的剩余秒数（-1=未显示；避免每帧刷新 TMP 文本） + private int _idleWarnShownSeconds = -1; [Header("游戏场景")] public string sceneName; public GameTypeEnum gameType; @@ -181,6 +193,8 @@ public class GameMainPanel_FishBase : GameMainPanel_Base public Toggle toggle_Lock; public Toggle toggle_Three; public Toggle toggle_Shuang; + + // ⭐ 双倍开火：toggle_Shuang 开启后计时 shuangDuration 秒自动关闭(DaoJiShi 驱动)， // child0 的 Image(Filled 360°) 做环形倒计时显示（GetShuangFillImage 懒获取） float shuangDuration = 15f; @@ -189,14 +203,15 @@ public class GameMainPanel_FishBase : GameMainPanel_Base public Toggle toggle_BaoZou; public TextMeshProUGUI tmp_BaoZouCount; public Image img_BaoZou; - float frenzyDuration = 5f; // 疯狂状态持续时间 + [Header("狂暴/冰封持续时间(秒,可在面板手动设置)")] + public float frenzyDuration = 15f; // 疯狂状态持续时间 public float currFrenzyTime = 0f; public Toggle toggle_BingFeng; public TextMeshProUGUI tmp_BingFengCount; public Image img_BingFeng; public GameObject bingFengEffect; // 冰封特效预制体（首次Instantiate，之后激活/隐藏） private GameObject _bingFengInstance; // 克隆出来的实例 - float bingFengDuration = 15f; // 冰封状态持续时间(服务端 FishFrozen 延长 15 秒,客户端写死 15s 倒计时) + public float bingFengDuration = 15f; // 冰封状态持续时间(服务端 FishFrozen 延长 15 秒,可在面板调整) public float currBingFengTime = 0f; private Dictionary _frozenAnimSpeeds = new Dictionary(); @@ -243,7 +258,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base public GameObject bulletParent; float changeTurretTime = 0f; bool isChangingTurret = false; - + [Header("超时自动退出倒计时")] + public GameObject autoExitGamePanel; //倒计时面板 + public TextMeshProUGUI tmp_ExitDaoJiShi; //里面显示的是这个 n秒后自动关闭 + public Button btn_CloseAutoExitGamePanel; //退出游戏按钮 // XJMH 长按炮台扇形切换 [Header("XJMH 炮台长按切换")] [Tooltip("长按炮台触发扇形切换的阈值(秒)")] @@ -279,6 +297,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base protected override void OnShow(object args = null) { base.OnShow(args); + // ⭐ 无操作自动退出：加载期间不计时，LoadResources 完成后重新开始计；确保倒计时面板初始隐藏 + _idleExitArmed = false; + HideIdleExitWarning(); LoadResources(); RefreshGGKCount(); //UIManager.Instance.ShowBoard("太好看了"); @@ -352,7 +373,11 @@ public class GameMainPanel_FishBase : GameMainPanel_Base currSitData.lockFX.transform.GetChild(0).gameObject.SetActive(false); currSitData.lockFX.transform.GetChild(1).gameObject.SetActive(true); if (mySitAnim != null && currSitData.turretParent != null) + { mySitAnim.transform.position = currSitData.turretParent.position; + // ⭐ 进入游戏圆圈：6 秒后自动消失（点击屏幕立即消失的逻辑在 HandleInput） + StartCoroutine(HideMySitAnimAfter(6f)); + } } else { @@ -478,6 +503,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base UnhookOpenPTLongPress(); UnhookAutoAttackOff(); + // ⭐ 无操作自动退出：面板隐藏即停止计时 + _idleExitArmed = false; + HideIdleExitWarning(); + UnLoadResources(); // 场景可能未加载或已卸载，做保护避免重复卸载报错 var scene = SceneManager.GetSceneByName(sceneName); @@ -604,6 +633,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base if (btn_ChangeRoom != null) btn_ChangeRoom.onClick.AddListener(StartChangeRoom); + // ⭐ 无操作自动退出：关闭倒计时面板并重新计时（未拖引用时为null，做保护） + if (btn_CloseAutoExitGamePanel != null) + btn_CloseAutoExitGamePanel.onClick.AddListener(OnCloseAutoExitPanel); + // ⭐ 左侧道具按钮：开启/关闭 obj_PropPanel（一级列表由 PropConfigData 配置构建， // 点击一级道具在 tmp_PropTwoPanel 展开二级子道具） if (btn_Prop != null) @@ -726,6 +759,124 @@ public class GameMainPanel_FishBase : GameMainPanel_Base if (btn_QueRen != null) btn_QueRen.interactable = true; } + #region 无操作自动退出（60秒静默 → 最后10秒倒计时面板 → 70秒自动回大厅） + + /// + /// ⭐ 每帧记录玩家操作（触摸/鼠标/键盘，含 UI 点击），超时自动走离房流程回大厅。 + /// 机器人/其他玩家的同步数据不算操作；退出确认面板开着时超时同样生效。 + /// 只在资源加载完成后计时（加载慢不会被踢）；离房流程进行中不重复触发。 + /// 流程：前 idleExitTotalSeconds - idleExitPanelShowSeconds（默认60秒）全程无提示 + /// → 最后 idleExitPanelShowSeconds（默认10秒）才弹出倒计时面板（autoExitGamePanel） + /// 逐秒倒数 → 走满 idleExitTotalSeconds（默认70秒）自动退出回大厅； + /// 期间任意操作或点 btn_CloseAutoExitGamePanel → 关闭面板并重新计时。 + /// + private void UpdateIdleAutoExit() + { + if (idleExitTotalSeconds <= 0f || idleExitPanelShowSeconds <= 0f) + { + HideIdleExitWarning(); + return; + } + + // 任何触摸/鼠标/键盘输入（含点在 UI 上）都算一次操作 + if (IsAnyOperationThisFrame()) + { + _lastOperationTime = Time.realtimeSinceStartup; + // 有操作 → 立即隐藏倒计时面板 + HideIdleExitWarning(); + } + + // 计时未生效（加载中/已隐藏）或已在离房流程中 → 跳过 + if (!_idleExitArmed || _leaveRoomResponseTcs != null) return; + + float idleElapsed = Time.realtimeSinceStartup - _lastOperationTime; + // 面板弹出时刻：总时长 - 面板显示时长（70 - 10 = 60 秒） + float panelShowAt = idleExitTotalSeconds - idleExitPanelShowSeconds; + + if (idleElapsed >= idleExitTotalSeconds) + { + HideIdleExitWarning(); + Debug.Log($"[IdleExit] 连续 {idleExitTotalSeconds} 秒无操作，自动退出游戏回大厅"); + // 退出确认面板还开着 → 先关掉，再走离房流程 + if (_isLeavingCountdown) CancelLeaveCountdown(); + RequestLeaveRoom(); + return; + } + + // 只有最后 idleExitPanelShowSeconds 秒才显示面板；之前保持隐藏 + if (idleElapsed >= panelShowAt) + ShowIdleExitWarning(Mathf.CeilToInt(idleExitTotalSeconds - idleElapsed)); + else + HideIdleExitWarning(); + } + + /// 显示/刷新无操作退出倒计时面板（仅在剩余秒数变化时刷新文本，避免每帧 GC） + private void ShowIdleExitWarning(int remainingSeconds) + { + // 弹出倒计时面板（未拖面板引用时退化为只显示文本） + if (autoExitGamePanel != null) + { + if (!autoExitGamePanel.activeSelf) + autoExitGamePanel.SetActive(true); + } + else if (tmp_ExitDaoJiShi != null && !tmp_ExitDaoJiShi.gameObject.activeSelf) + { + tmp_ExitDaoJiShi.gameObject.SetActive(true); + } + + if (tmp_ExitDaoJiShi != null && _idleWarnShownSeconds != remainingSeconds) + { + _idleWarnShownSeconds = remainingSeconds; + tmp_ExitDaoJiShi.text = + $"（{remainingSeconds}秒后自动退出）"; + } + } + + /// 隐藏无操作退出倒计时面板（有操作/关闭按钮/开始离房/面板隐藏时调用） + private void HideIdleExitWarning() + { + if (autoExitGamePanel != null) + { + if (autoExitGamePanel.activeSelf) + { + autoExitGamePanel.SetActive(false); + _idleWarnShownSeconds = -1; + } + return; + } + if (tmp_ExitDaoJiShi != null && tmp_ExitDaoJiShi.gameObject.activeSelf) + { + tmp_ExitDaoJiShi.gameObject.SetActive(false); + _idleWarnShownSeconds = -1; + } + } + + /// btn_CloseAutoExitGamePanel：关闭倒计时面板并从头重新计时 + private void OnCloseAutoExitPanel() + { + HideIdleExitWarning(); + _lastOperationTime = Time.realtimeSinceStartup; + } + + /// 本帧是否有玩家输入：触摸/鼠标按下、按住、松开 或 任意按键 + private bool IsAnyOperationThisFrame() + { + var input = GetInput(); + if (input.isPressed || input.wasPressedThisFrame || input.wasReleasedThisFrame) + return true; + var keyboard = Keyboard.current; + return keyboard != null && keyboard.anyKey.isPressed; + } + + /// 开始无操作计时（LoadResources 完成后调用，计时从当前时刻重新起算） + private void ArmIdleAutoExit() + { + _lastOperationTime = Time.realtimeSinceStartup; + _idleExitArmed = true; + } + + #endregion + public virtual void OnDestroy() { EventCenter.Instance.RemoveEventListener(ConstEventString.SyncGameData_Rotate, SyncGameData_Rotate); @@ -873,8 +1024,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base protected virtual void Update() { - - + UpdateIdleAutoExit(); HandleAutoRotate(); HandleInput(); @@ -991,6 +1141,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base ClearChangeRoomBar(); else if (JinDuTiao != null) JinDuTiao.Hide(); + + // ⭐ 无操作自动退出：加载完成，从现在开始计无操作时间 + ArmIdleAutoExit(); } public async void UnLoadResources() @@ -2074,6 +2227,14 @@ public class GameMainPanel_FishBase : GameMainPanel_Base } + /// 进入游戏圆圈 mySitAnim：延时自动消失（6 秒没点屏幕也消失；点击屏幕立即消失在 HandleInput） + private IEnumerator HideMySitAnimAfter(float delay) + { + yield return new WaitForSeconds(delay); + if (mySitAnim != null && mySitAnim.gameObject.activeSelf) + mySitAnim.gameObject.SetActive(false); + } + private void HandleInput() { // ⭐ 退出倒计时期间屏蔽本地玩家手动输入(旋转/开火/锁定),其他玩家和机器人不受影响 @@ -3123,7 +3284,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base MonsterContral m = kv.Value; if (m == null || !m.gameObject.activeInHierarchy) continue; if (selected.Contains(m.guid)) continue; // 跳过已选中的 - // ⭐ 路径进度过滤:刚出生(< 0.2)或即将离场(> 0.8)的鱼不作为目标 + // ⭐ 路径进度过滤:刚出生(< 0.1)或即将离场(> 0.9)的鱼不作为目标 if (!IsFishPathLockable(m)) continue; // ⭐ 可锁定过滤:出场效果期间/needLockEvent 鱼未就绪 → 跳过换下一条 if (!IsMonsterLockable(m)) continue; @@ -3444,20 +3605,23 @@ public class GameMainPanel_FishBase : GameMainPanel_Base // ⭐ 用世界坐标(Z=0平面),和 bot AI 一致,否则距离计算会异常(出现 3.4E+38 之类) Vector3 origin = currSitData.turretWorldPos; - // ⭐ 规则:特殊Boss / Boss鱼 / 特殊鱼 为高价值组(按优先级 + 距离最近), - // 黄金鱼 / 普通鱼 为普通组(随机选一只) - // 高价值组有目标时只从高价值组选;高价值组无目标时从普通组随机 + // ⭐ 规则:严格按优先级分层,高价值到低价值: + // 特殊Boss(5) > Boss鱼(4) > 特殊鱼(3) > 黄金鱼(2) > 普通鱼(1) + // - 特殊Boss/Boss鱼/特殊鱼:同层取距离最近 + // - 黄金鱼/普通鱼:各自独立分层,同层随机选一只 + // 高层有目标时绝不选低层 MonsterContral best = null; int bestPri = -1; float bestSqr = float.MaxValue; - var normalList = new List(); + var goldList = new List(); // 黄金鱼(2) 单独一层 + var smallList = new List(); // 普通鱼(1) 单独一层 foreach (var kv in CreateFishManager.Instance.fishDatas_hashCodekey) { MonsterContral m = kv.Value; if (m == null || !m.gameObject.activeInHierarchy) continue; - // ⭐ 路径进度过滤:刚出生(< 0.2)或即将离场(> 0.8)的鱼不作为自动锁定目标 + // ⭐ 路径进度过滤:刚出生(< 0.1)或即将离场(> 0.9)的鱼不作为自动锁定目标 if (!IsFishPathLockable(m)) continue; // ⭐ 可锁定过滤:出场效果期间/needLockEvent 鱼未就绪 → 跳过换下一条 if (!IsMonsterLockable(m)) continue; @@ -3475,19 +3639,27 @@ public class GameMainPanel_FishBase : GameMainPanel_Base best = m; } } - // 普通组:黄金鱼(2) / 普通鱼(1) → 先收集,后面随机 + // ⭐ 黄金鱼(2) / 普通鱼(1) 分开收集,不再混在一个列表里 + else if (pri == 2) + { + goldList.Add(m); + } else { - normalList.Add(m); + smallList.Add(m); } } - // 高价值组有目标 → 直接返回最高价值(同价值最近)的目标 + // ① 特殊Boss/Boss鱼/特殊鱼 有目标 → 返回最高价值(同价值最近)的目标 if (best != null) return best; - // 高价值组无目标 → 从普通组随机选一只 - if (normalList.Count > 0) - return normalList[Random.Range(0, normalList.Count)]; + // ② 没有特殊鱼及以上 → 黄金鱼层随机选一只 + if (goldList.Count > 0) + return goldList[Random.Range(0, goldList.Count)]; + + // ③ 没有黄金鱼 → 普通鱼层随机选一只 + if (smallList.Count > 0) + return smallList[Random.Range(0, smallList.Count)]; return null; } @@ -4489,7 +4661,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base { var m = kv.Value; if (m == null || !m.gameObject.activeInHierarchy) continue; - // ⭐ 路径进度过滤:刚出生(< 0.2)或即将离场(> 0.8)的 Boss 不作为目标 + // ⭐ 路径进度过滤:刚出生(< 0.1)或即将离场(> 0.9)的 Boss 不作为目标 if (!IsFishPathLockable(m)) continue; int ft = (int)m.fishenum; @@ -4820,7 +4992,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base { var m = kv.Value; if (m == null || !m.gameObject.activeInHierarchy) continue; - // ⭐ 路径进度过滤:刚出生(< 0.2)或即将离场(> 0.8)的鱼不作为目标 + // ⭐ 路径进度过滤:刚出生(< 0.1)或即将离场(> 0.9)的鱼不作为目标 if (!IsFishPathLockable(m)) continue; Vector3 fishPos = m.transform.position; @@ -4867,7 +5039,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base var m = kv.Value; if (m == null || !m.gameObject.activeInHierarchy) continue; if (m == exclude) continue; - // ⭐ 路径进度过滤:刚出生(< 0.2)或即将离场(> 0.8)的鱼不作为目标 + // ⭐ 路径进度过滤:刚出生(< 0.1)或即将离场(> 0.9)的鱼不作为目标 if (!IsFishPathLockable(m)) continue; Vector3 fishPos = m.transform.position; diff --git a/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab b/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab index e3ba41eb7..05fbf9ea8 100644 --- a/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab +++ b/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab @@ -76,6 +76,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &557707758170540509 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7405094240148012805} + - component: {fileID: 3207662650366328451} + - component: {fileID: 5022420471239057259} + m_Layer: 0 + m_Name: "\u63D0\u793A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7405094240148012805 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557707758170540509} + 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: 4967882872327676752} + 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: -178.99998, y: 171.99994} + m_SizeDelta: {x: 65, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3207662650366328451 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557707758170540509} + m_CullTransparentMesh: 1 +--- !u!114 &5022420471239057259 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557707758170540509} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: 8df00905cfe2fdf46ac3cc533936bbec, type: 3} + 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 --- !u!1 &600757746282625018 GameObject: m_ObjectHideFlags: 0 @@ -533,6 +608,127 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1203619245308080616 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2094696586655345085} + - component: {fileID: 4016756294274425791} + - component: {fileID: 8526209335260150785} + - component: {fileID: 3468531351064770563} + m_Layer: 0 + m_Name: "\u53D6\u6D88" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2094696586655345085 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203619245308080616} + 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: 6478156939641042742} + m_Father: {fileID: 4967882872327676752} + 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: -134} + m_SizeDelta: {x: 214, y: 76} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4016756294274425791 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203619245308080616} + m_CullTransparentMesh: 1 +--- !u!114 &8526209335260150785 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203619245308080616} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: 16da846f90f3a7e4d9328e5c37f56662, type: 3} + 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 +--- !u!114 &3468531351064770563 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203619245308080616} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8526209335260150785} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1634490822219264209 GameObject: m_ObjectHideFlags: 0 @@ -1096,6 +1292,292 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2420418085295945968 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6226373828477319146} + - component: {fileID: 344636758361842783} + - component: {fileID: 6087144988344962527} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_003 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6226373828477319146 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2420418085295945968} + 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: 4967882872327676752} + 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.5000458, y: 180} + m_SizeDelta: {x: 688, y: 64} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &344636758361842783 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2420418085295945968} + m_CullTransparentMesh: 1 +--- !u!114 &6087144988344962527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2420418085295945968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: 7e601aa695a70b04286a190d42a2f977, type: 3} + 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 +--- !u!1 &2546307390136412034 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1753522228421229426} + - component: {fileID: 856717276286740827} + - component: {fileID: 7527789993882219659} + m_Layer: 0 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1753522228421229426 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2546307390136412034} + 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: 4967882872327676752} + 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: -47.407837} + m_SizeDelta: {x: 607.0317, y: 84.811} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &856717276286740827 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2546307390136412034} + m_CullTransparentMesh: 1 +--- !u!114 &7527789993882219659 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2546307390136412034} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uFF084\u79D2\u540E\u81EA\u52A8\u5173\u95ED\uFF09" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4284255225 + m_fontColor: {r: 0.97647065, g: 0.54509807, b: 0.36078432, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30.3 + m_fontSizeBase: 30.3 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2567296540307040998 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8871514346598287948} + - component: {fileID: 2716964545647335057} + - component: {fileID: 7363636239524283653} + m_Layer: 0 + m_Name: "\u63D0\u793A (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8871514346598287948 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2567296540307040998} + 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: 4967882872327676752} + m_Father: {fileID: 6466278348767920492} + 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: 707, y: 436} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2716964545647335057 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2567296540307040998} + m_CullTransparentMesh: 1 +--- !u!114 &7363636239524283653 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2567296540307040998} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + 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: 21300000, guid: bacc3cfa078ee8642a1510a5273ec1dd, type: 3} + 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 --- !u!1 &2831381340655937899 GameObject: m_ObjectHideFlags: 0 @@ -1443,6 +1925,216 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3728544573091833548 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8282269236883647956} + - component: {fileID: 1655766362930683305} + - component: {fileID: 8340593441337284837} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8282269236883647956 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3728544573091833548} + 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: 4967882872327676752} + 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.000061035, y: 55} + m_SizeDelta: {x: 607.0317, y: 132.0024} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1655766362930683305 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3728544573091833548} + m_CullTransparentMesh: 1 +--- !u!114 &8340593441337284837 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3728544573091833548} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u7531\u4E8E\u60A8\u957F\u65F6\u95F4\u672A\u53D1\u5C04\u5B50\u5F39\uFF01\u8BF7\u91CD\u65B0\u8FDB\u5165\u623F\u95F4\u3002" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 39.7 + m_fontSizeBase: 39.7 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3975496836595648079 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1355647395913916137} + - component: {fileID: 3101065168424309255} + - component: {fileID: 4528181900384994007} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1355647395913916137 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3975496836595648079} + 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: 4967882872327676752} + 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: -303.99994, y: -124.5} + m_SizeDelta: {x: 131, y: 207} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3101065168424309255 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3975496836595648079} + m_CullTransparentMesh: 1 +--- !u!114 &4528181900384994007 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3975496836595648079} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: 993c055ed2062b44f989b314873ef95a, type: 3} + 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 --- !u!1 &3989837064582730067 GameObject: m_ObjectHideFlags: 0 @@ -1708,6 +2400,164 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &4815605504907535940 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6466278348767920492} + - component: {fileID: 2023251485851026049} + - component: {fileID: 487087723267263969} + m_Layer: 0 + m_Name: AutoTuiChu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6466278348767920492 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4815605504907535940} + 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: 8871514346598287948} + m_Father: {fileID: 8080891624328096898} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2023251485851026049 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4815605504907535940} + m_CullTransparentMesh: 1 +--- !u!114 &487087723267263969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4815605504907535940} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.72156864} + 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 +--- !u!1 &5294824273557438079 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4967882872327676752} + - component: {fileID: 6685087407426767922} + - component: {fileID: 4259030655232435648} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_008 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4967882872327676752 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5294824273557438079} + 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: 6226373828477319146} + - {fileID: 2666160847908232544} + - {fileID: 8282269236883647956} + - {fileID: 1753522228421229426} + - {fileID: 7405094240148012805} + - {fileID: 1355647395913916137} + - {fileID: 2094696586655345085} + m_Father: {fileID: 8871514346598287948} + 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.000034332275, y: 0} + m_SizeDelta: {x: 707, y: 436} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6685087407426767922 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5294824273557438079} + m_CullTransparentMesh: 1 +--- !u!114 &4259030655232435648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5294824273557438079} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: bacc3cfa078ee8642a1510a5273ec1dd, type: 3} + 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 --- !u!1 &5345918819539197142 GameObject: m_ObjectHideFlags: 0 @@ -1866,6 +2716,7 @@ RectTransform: - {fileID: 2888235655233953630} - {fileID: 3399093824537690253} - {fileID: 7076955972068514177} + - {fileID: 6466278348767920492} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1892,6 +2743,8 @@ MonoBehaviour: tmp_DJS: {fileID: 8753480491712159227} btn_QueRen: {fileID: 1900621352576879385} btn_QuXiao: {fileID: 6766429847420034338} + idleExitTotalSeconds: 70 + idleExitPanelShowSeconds: 10 sceneName: HHWK gameType: 5 propConfigData: {fileID: 11400000, guid: 2d8fe2d5eb5e28e4daa6dda98ef29515, type: 2} @@ -1931,15 +2784,18 @@ MonoBehaviour: toggle_Lock: {fileID: 6681897813473983596} toggle_Three: {fileID: 4500888554953033243} toggle_Shuang: {fileID: 8388135261867480132} + currShuangTime: 0 toggle_BaoZou: {fileID: 8051146137760919780} tmp_BaoZouCount: {fileID: 5201812512495119800} img_BaoZou: {fileID: 8663316823840455864} + frenzyDuration: 15 currFrenzyTime: 0 toggle_BingFeng: {fileID: 2181813545356604020} tmp_BingFengCount: {fileID: 7625741778218357672} img_BingFeng: {fileID: 2523294992834463179} bingFengEffect: {fileID: 1709254077376921, guid: a2a34db230a06c64c8d7cfad89a22d10, type: 3} + bingFengDuration: 15 currBingFengTime: 0 btn_GuaGuaKa: {fileID: 7026078867861418950} tmp_GGKCount: {fileID: 6115815308517390745} @@ -1953,6 +2809,9 @@ MonoBehaviour: botRotateSpeed: 80 bullet_Test: {fileID: 0} bulletParent: {fileID: 731679104123858516} + autoExitGamePanel: {fileID: 4815605504907535940} + tmp_ExitDaoJiShi: {fileID: 7527789993882219659} + btn_CloseAutoExitGamePanel: {fileID: 3468531351064770563} turretLongPressThreshold: 0.5 boardCast_Boss: {fileID: 0} createVideoPlayer: {fileID: 0} @@ -2563,6 +3422,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7006526072526372851 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2666160847908232544} + - component: {fileID: 5607276286275841980} + - component: {fileID: 4975881392942108895} + m_Layer: 0 + m_Name: BY_beibao8(5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2666160847908232544 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7006526072526372851} + 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: 4967882872327676752} + 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: -271.5, y: 187.5} + m_SizeDelta: {x: 168, y: 103} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5607276286275841980 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7006526072526372851} + m_CullTransparentMesh: 1 +--- !u!114 &4975881392942108895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7006526072526372851} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: eb0febea1946c18488181e102d3b34a5, type: 3} + 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 --- !u!1 &7076922363728874144 GameObject: m_ObjectHideFlags: 0 @@ -2998,6 +3932,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8018884205645072814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6478156939641042742} + - component: {fileID: 6560997578110079039} + - component: {fileID: 9096988643904804495} + m_Layer: 0 + m_Name: "\u786E\u8BA4" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6478156939641042742 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8018884205645072814} + 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: 2094696586655345085} + 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: 2.500019, y: 0.49996948} + m_SizeDelta: {x: 75, y: 37} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6560997578110079039 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8018884205645072814} + m_CullTransparentMesh: 1 +--- !u!114 &9096988643904804495 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8018884205645072814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u786E\u8BA4" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4284883250 + m_fontColor: {r: 0.19607845, g: 0.12941177, b: 0.40000004, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 48.7 + m_fontSizeBase: 48.7 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8537551611419609241 GameObject: m_ObjectHideFlags: 0 @@ -4068,6 +5137,16 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 397833008454374056, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 397833008454374056, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 450003735944806845, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_SortingLayer diff --git a/Assets/MyGame/aa/UI/Game/Skill.prefab b/Assets/MyGame/aa/UI/Game/Skill.prefab index 3f1261ea5..e0bbca980 100644 --- a/Assets/MyGame/aa/UI/Game/Skill.prefab +++ b/Assets/MyGame/aa/UI/Game/Skill.prefab @@ -103,8 +103,8 @@ RectTransform: m_GameObject: {fileID: 236891699104540088} 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: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 7835773788371249517} - {fileID: 3278342634232470330} @@ -485,8 +485,8 @@ RectTransform: m_GameObject: {fileID: 633761538334472770} 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: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 2642676799649327388} - {fileID: 5142449319288461331} @@ -1465,8 +1465,8 @@ RectTransform: m_GameObject: {fileID: 2630252367303179408} 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: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 5338333950028160419} m_Father: {fileID: 992911195842070766} @@ -2761,7 +2761,7 @@ RectTransform: 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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -8.9} m_SizeDelta: {x: 371.3, y: 90.2755} m_Pivot: {x: 0.5, y: 0} --- !u!114 &7282809205694097740 @@ -2781,8 +2781,8 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 0 + m_ChildAlignment: 4 + m_Spacing: -16.22 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -2950,8 +2950,8 @@ RectTransform: m_GameObject: {fileID: 6013575717776043754} 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: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 3477348704099036915} - {fileID: 2154829562891718650} @@ -3349,8 +3349,8 @@ RectTransform: m_GameObject: {fileID: 7078537490689401426} 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: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 7704570457894514173} - {fileID: 823219710641931391} @@ -3753,8 +3753,8 @@ RectTransform: m_GameObject: {fileID: 7273522503763847789} 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: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 8819816701581450929} - {fileID: 3177524625614227146} diff --git a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab index 0c7bd19c2..f0f83c83a 100644 --- a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab +++ b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab @@ -364,6 +364,127 @@ MonoBehaviour: idleIndex: 0 obj_Add: {fileID: 7218901645302023225} obj_Down: {fileID: 6542138374165343523} +--- !u!1 &253341679092850940 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1676588986809868683} + - component: {fileID: 5936518474254412841} + - component: {fileID: 6344643312611278793} + - component: {fileID: 9144227543862403665} + m_Layer: 0 + m_Name: "\u53D6\u6D88" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1676588986809868683 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 253341679092850940} + 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: 816102527934487485} + m_Father: {fileID: 458656989465223667} + 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: -134} + m_SizeDelta: {x: 214, y: 76} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5936518474254412841 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 253341679092850940} + m_CullTransparentMesh: 1 +--- !u!114 &6344643312611278793 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 253341679092850940} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: 16da846f90f3a7e4d9328e5c37f56662, type: 3} + 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 +--- !u!114 &9144227543862403665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 253341679092850940} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6344643312611278793} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &448370382151683116 GameObject: m_ObjectHideFlags: 0 @@ -1668,6 +1789,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1190524210947571689 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9100698337642894672} + - component: {fileID: 1960008014292831007} + - component: {fileID: 1721366382183307747} + m_Layer: 0 + m_Name: "\u63D0\u793A (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9100698337642894672 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1190524210947571689} + 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: 458656989465223667} + m_Father: {fileID: 3443552812057459693} + 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: 707, y: 436} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1960008014292831007 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1190524210947571689} + m_CullTransparentMesh: 1 +--- !u!114 &1721366382183307747 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1190524210947571689} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + 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: 21300000, guid: bacc3cfa078ee8642a1510a5273ec1dd, type: 3} + 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 --- !u!1 &1218591831949832611 GameObject: m_ObjectHideFlags: 0 @@ -2268,6 +2465,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1907572483240845575 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6899434837766835099} + - component: {fileID: 8277485328775456521} + - component: {fileID: 5552367992733262764} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6899434837766835099 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1907572483240845575} + 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: 458656989465223667} + 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: -303.99994, y: -124.5} + m_SizeDelta: {x: 131, y: 207} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8277485328775456521 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1907572483240845575} + m_CullTransparentMesh: 1 +--- !u!114 &5552367992733262764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1907572483240845575} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: 993c055ed2062b44f989b314873ef95a, type: 3} + 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 --- !u!1 &1951994036281408629 GameObject: m_ObjectHideFlags: 0 @@ -3076,6 +3348,82 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &2557684592993026943 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3443552812057459693} + - component: {fileID: 8725685298037536234} + - component: {fileID: 2549566470395908768} + m_Layer: 0 + m_Name: AutoTuiChu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3443552812057459693 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2557684592993026943} + 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: 9100698337642894672} + m_Father: {fileID: 245637205031072731} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8725685298037536234 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2557684592993026943} + m_CullTransparentMesh: 1 +--- !u!114 &2549566470395908768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2557684592993026943} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.72156864} + 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 --- !u!1 &2585300302372891818 GameObject: m_ObjectHideFlags: 0 @@ -3846,6 +4194,7 @@ RectTransform: - {fileID: 1078076760308578925} - {fileID: 6681409744861298073} - {fileID: 6572098329424512867} + - {fileID: 3443552812057459693} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -3872,6 +4221,8 @@ MonoBehaviour: tmp_DJS: {fileID: 7541570264601691626} btn_QueRen: {fileID: 4624491302151963912} btn_QuXiao: {fileID: 2238313060525282867} + idleExitTotalSeconds: 70 + idleExitPanelShowSeconds: 10 sceneName: XJMH gameType: 4 propConfigData: {fileID: 11400000, guid: 2d8fe2d5eb5e28e4daa6dda98ef29515, type: 2} @@ -3915,12 +4266,14 @@ MonoBehaviour: toggle_BaoZou: {fileID: 7018376083791635923} tmp_BaoZouCount: {fileID: 7639431059393200537} img_BaoZou: {fileID: 704441504674685449} + frenzyDuration: 15 currFrenzyTime: 0 toggle_BingFeng: {fileID: 3519450453960747646} tmp_BingFengCount: {fileID: 7507250607910367431} img_BingFeng: {fileID: 7981991708595902724} bingFengEffect: {fileID: 1709254077376921, guid: a2a34db230a06c64c8d7cfad89a22d10, type: 3} + bingFengDuration: 15 currBingFengTime: 0 btn_GuaGuaKa: {fileID: 3327628770265938795} tmp_GGKCount: {fileID: 342470023856953053} @@ -3933,6 +4286,9 @@ MonoBehaviour: bullet_Test: {fileID: 1166920474713197, guid: 279ce3d544e4bc34097fc18fccb2ceac, type: 3} bulletParent: {fileID: 5156217227802463099} + autoExitGamePanel: {fileID: 2557684592993026943} + tmp_ExitDaoJiShi: {fileID: 7981116555568725849} + btn_CloseAutoExitGamePanel: {fileID: 9144227543862403665} turretLongPressThreshold: 0.5 boardCast_Boss: {fileID: 2654078965480511721, guid: 55e47b0ac9a12a547924880716dd3535, type: 3} @@ -4788,6 +5144,141 @@ MonoBehaviour: idleIndex: 0 obj_Add: {fileID: 2666824335004537571} obj_Down: {fileID: 1792796439090489014} +--- !u!1 &3711488664002568915 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3149192281025368562} + - component: {fileID: 8830988920382327194} + - component: {fileID: 7250786979672375799} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3149192281025368562 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3711488664002568915} + 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: 458656989465223667} + 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.000061035, y: 55} + m_SizeDelta: {x: 607.0317, y: 132.0024} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8830988920382327194 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3711488664002568915} + m_CullTransparentMesh: 1 +--- !u!114 &7250786979672375799 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3711488664002568915} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u7531\u4E8E\u60A8\u957F\u65F6\u95F4\u672A\u53D1\u5C04\u5B50\u5F39\uFF01\u8BF7\u91CD\u65B0\u8FDB\u5165\u623F\u95F4\u3002" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 39.7 + m_fontSizeBase: 39.7 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3712232115700564997 GameObject: m_ObjectHideFlags: 0 @@ -6087,6 +6578,88 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4296533200493736310 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 458656989465223667} + - component: {fileID: 3106209056349208313} + - component: {fileID: 336508216156152239} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_008 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &458656989465223667 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4296533200493736310} + 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: 1372171302148998352} + - {fileID: 7567305899010831858} + - {fileID: 3149192281025368562} + - {fileID: 9042984053432495540} + - {fileID: 2426760923651159592} + - {fileID: 6899434837766835099} + - {fileID: 1676588986809868683} + m_Father: {fileID: 9100698337642894672} + 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.000034332275, y: 0} + m_SizeDelta: {x: 707, y: 436} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3106209056349208313 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4296533200493736310} + m_CullTransparentMesh: 1 +--- !u!114 &336508216156152239 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4296533200493736310} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: bacc3cfa078ee8642a1510a5273ec1dd, type: 3} + 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 --- !u!1 &4311354340067889378 GameObject: m_ObjectHideFlags: 0 @@ -12196,6 +12769,141 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7832858786451235781 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9042984053432495540} + - component: {fileID: 5017383307385071602} + - component: {fileID: 7981116555568725849} + m_Layer: 0 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9042984053432495540 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7832858786451235781} + 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: 458656989465223667} + 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: -47.407837} + m_SizeDelta: {x: 607.0317, y: 84.811} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5017383307385071602 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7832858786451235781} + m_CullTransparentMesh: 1 +--- !u!114 &7981116555568725849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7832858786451235781} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uFF084\u79D2\u540E\u81EA\u52A8\u5173\u95ED\uFF09" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4284255225 + m_fontColor: {r: 0.97647065, g: 0.54509807, b: 0.36078432, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30.3 + m_fontSizeBase: 30.3 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7965752655696510792 GameObject: m_ObjectHideFlags: 0 @@ -13022,6 +13730,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8674191814135469373 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7567305899010831858} + - component: {fileID: 5658240453143901158} + - component: {fileID: 7919974763041403647} + m_Layer: 0 + m_Name: BY_beibao8(5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7567305899010831858 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8674191814135469373} + 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: 458656989465223667} + 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: -271.5, y: 187.5} + m_SizeDelta: {x: 168, y: 103} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5658240453143901158 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8674191814135469373} + m_CullTransparentMesh: 1 +--- !u!114 &7919974763041403647 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8674191814135469373} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: eb0febea1946c18488181e102d3b34a5, type: 3} + 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 --- !u!1 &8749652989991025509 GameObject: m_ObjectHideFlags: 0 @@ -13263,6 +14046,81 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &8816789644360083769 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2426760923651159592} + - component: {fileID: 9205623998314576288} + - component: {fileID: 1011326355881829353} + m_Layer: 0 + m_Name: "\u63D0\u793A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2426760923651159592 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8816789644360083769} + 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: 458656989465223667} + 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: -178.99998, y: 171.99994} + m_SizeDelta: {x: 65, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9205623998314576288 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8816789644360083769} + m_CullTransparentMesh: 1 +--- !u!114 &1011326355881829353 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8816789644360083769} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: 8df00905cfe2fdf46ac3cc533936bbec, type: 3} + 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 --- !u!1 &8828026033782523779 GameObject: m_ObjectHideFlags: 0 @@ -13520,6 +14378,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8964430864891627731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 816102527934487485} + - component: {fileID: 7057797479475984084} + - component: {fileID: 8940911494190320430} + m_Layer: 0 + m_Name: "\u786E\u8BA4" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &816102527934487485 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8964430864891627731} + 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: 1676588986809868683} + 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: 2.500019, y: 0.49996948} + m_SizeDelta: {x: 75, y: 37} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7057797479475984084 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8964430864891627731} + m_CullTransparentMesh: 1 +--- !u!114 &8940911494190320430 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8964430864891627731} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u786E\u8BA4" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4284883250 + m_fontColor: {r: 0.19607845, g: 0.12941177, b: 0.40000004, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 48.7 + m_fontSizeBase: 48.7 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &9050960686155367309 GameObject: m_ObjectHideFlags: 0 @@ -13670,6 +14663,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &9174464579807898504 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1372171302148998352} + - component: {fileID: 1538111323886769937} + - component: {fileID: 5295229205367146003} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_003 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1372171302148998352 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9174464579807898504} + 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: 458656989465223667} + 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.5000458, y: 180} + m_SizeDelta: {x: 688, y: 64} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1538111323886769937 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9174464579807898504} + m_CullTransparentMesh: 1 +--- !u!114 &5295229205367146003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9174464579807898504} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: 7e601aa695a70b04286a190d42a2f977, type: 3} + 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 --- !u!1001 &407003521196400366 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/UI/Game/右上.prefab b/Assets/MyGame/aa/UI/Game/右上.prefab index 189e7aa18..1631b90f6 100644 --- a/Assets/MyGame/aa/UI/Game/右上.prefab +++ b/Assets/MyGame/aa/UI/Game/右上.prefab @@ -318,6 +318,16 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 3397302884702173062, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3397302884702173062, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3494573310348252002, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_SortingLayer @@ -496,7 +506,7 @@ PrefabInstance: - target: {fileID: 4843941669050715073, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_AnchoredPosition.y - value: 128 + value: 147.6 objectReference: {fileID: 0} - target: {fileID: 4874233463245360906, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} @@ -798,6 +808,16 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 7782089659438206966, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7782089659438206966, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7782089659438206966, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_LocalScale.y @@ -806,7 +826,7 @@ PrefabInstance: - target: {fileID: 7782089659438206966, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_AnchoredPosition.y - value: -73.5 + value: -8.5 objectReference: {fileID: 0} - target: {fileID: 7782089659438206966, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} diff --git a/Assets/MyGame/aa/UI/Game/右下.prefab b/Assets/MyGame/aa/UI/Game/右下.prefab index 5d5c60e1a..726457e7b 100644 --- a/Assets/MyGame/aa/UI/Game/右下.prefab +++ b/Assets/MyGame/aa/UI/Game/右下.prefab @@ -48,6 +48,16 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 397833008454374056, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 397833008454374056, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} - target: {fileID: 450003735944806845, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_SortingLayer diff --git a/Assets/MyGame/aa/UI/Game/左上.prefab b/Assets/MyGame/aa/UI/Game/左上.prefab index 3016cf6e6..09f2bbef4 100644 --- a/Assets/MyGame/aa/UI/Game/左上.prefab +++ b/Assets/MyGame/aa/UI/Game/左上.prefab @@ -53,6 +53,16 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 397833008454374056, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 397833008454374056, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} - target: {fileID: 450003735944806845, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_SortingLayer @@ -83,6 +93,11 @@ PrefabInstance: propertyPath: m_LocalScale.y value: -1 objectReference: {fileID: 0} + - target: {fileID: 973905160343307270, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.8000093 + objectReference: {fileID: 0} - target: {fileID: 1138529054820578357, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_SortingLayer @@ -448,6 +463,16 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 4710570228793354968, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4710570228793354968, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4710570228793354968, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_LocalScale.x @@ -466,12 +491,12 @@ PrefabInstance: - target: {fileID: 4710570228793354968, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_AnchoredPosition.x - value: 44.4 + value: 34.7 objectReference: {fileID: 0} - target: {fileID: 4710570228793354968, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_AnchoredPosition.y - value: -73.1 + value: -9.3 objectReference: {fileID: 0} - target: {fileID: 4710570228793354968, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} @@ -831,7 +856,7 @@ PrefabInstance: - target: {fileID: 7609364501153394415, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_AnchoredPosition.y - value: 126.7 + value: 152.1 objectReference: {fileID: 0} - target: {fileID: 7702690943730251830, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} @@ -858,6 +883,11 @@ PrefabInstance: propertyPath: m_LocalScale.y value: -1.25 objectReference: {fileID: 0} + - target: {fileID: 7835193491978159751, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.8 + objectReference: {fileID: 0} - target: {fileID: 8015305268238102307, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_SortingLayer diff --git a/Assets/MyGame/aa/UI/Game/左下.prefab b/Assets/MyGame/aa/UI/Game/左下.prefab index 89660ad05..7c877f90b 100644 --- a/Assets/MyGame/aa/UI/Game/左下.prefab +++ b/Assets/MyGame/aa/UI/Game/左下.prefab @@ -32,9 +32,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 7609364501153394415} 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: -123.49982, y: -39.500076} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 60.500183, y: 27.499924} m_SizeDelta: {x: 103, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &939075357221539841 @@ -185,7 +185,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 131.37505, y: -3.3250427} + m_AnchoredPosition: {x: 131.37505, y: -4.424999} m_SizeDelta: {x: 60, y: 12} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2701583448577859658 @@ -540,9 +540,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 7609364501153394415} 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: -124.99997, y: -42.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 59.00003, y: 24.5} m_SizeDelta: {x: 64, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7068578546255737722 @@ -1182,9 +1182,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 7609364501153394415} 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: -123.49982, y: -38.500076} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 60.500183, y: 28.499924} m_SizeDelta: {x: 103, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5518507213745826613 @@ -1424,9 +1424,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 7609364501153394415} 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: -131.49997, y: -42.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 52.50003, y: 24.5} m_SizeDelta: {x: 51, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1086207817666691744 @@ -1501,7 +1501,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: 44.770996, y: -28.020882} + m_AnchoredPosition: {x: 44.770996, y: -24.3} m_SizeDelta: {x: -161.23, y: -90.8334} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7940740183345757366 @@ -1618,7 +1618,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2094753452532434597 RectTransform: m_ObjectHideFlags: 0 @@ -1633,9 +1633,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 7609364501153394415} 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.49997, y: -38.500076} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 57.50003, y: 28.499924} m_SizeDelta: {x: 97, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3478998171396289274 @@ -2328,9 +2328,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 7609364501153394415} 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: -131.49997, y: -42.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 52.50003, y: 24.5} m_SizeDelta: {x: 51, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1439673781816471195 @@ -2813,9 +2813,9 @@ RectTransform: - {fileID: 2501852592714539457} m_Father: {fileID: 7609364501153394415} 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: 34.5, y: 77.49994} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 34.5, y: 10.499939} m_SizeDelta: {x: 279, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7598986287992324467 @@ -2888,9 +2888,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 7609364501153394415} 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: -130.99982, y: -42.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 53.000183, y: 24.5} m_SizeDelta: {x: 52, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4430190150721293563 @@ -3154,9 +3154,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 7609364501153394415} 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: -123.00012, y: -39.000076} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 60.999878, y: 27.999924} m_SizeDelta: {x: 104, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6359790639086632546 @@ -3229,9 +3229,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 7609364501153394415} 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: -131.49997, y: -42.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 52.50003, y: 24.5} m_SizeDelta: {x: 51, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7553169601699106405 @@ -3304,9 +3304,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 7609364501153394415} 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: -131.49997, y: -42.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 52.50003, y: 24.5} m_SizeDelta: {x: 49, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3062482307563368506 @@ -3381,7 +3381,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 216.8, y: -2.7000427} + m_AnchoredPosition: {x: 216.8, y: -2.3} m_SizeDelta: {x: 87, y: 13} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2271467992873135901 @@ -3440,13 +3440,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -3514,9 +3514,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 7609364501153394415} 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: -123.49982, y: -38.500076} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 60.500183, y: 28.499924} m_SizeDelta: {x: 103, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6995607045978658789 @@ -3755,9 +3755,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 7609364501153394415} 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: -131.49997, y: -42.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 52.50003, y: 24.5} m_SizeDelta: {x: 51, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1724657610333687412 @@ -3986,9 +3986,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 7609364501153394415} 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: -131.49997, y: -42.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 52.50003, y: 24.5} m_SizeDelta: {x: 51, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &256452233577848298 @@ -4270,9 +4270,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 7609364501153394415} 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: -131.49997, y: -42.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 52.50003, y: 24.5} m_SizeDelta: {x: 51, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &694978334991620813 @@ -4345,9 +4345,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 7609364501153394415} 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: -131.49997, y: -42.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 52.50003, y: 24.5} m_SizeDelta: {x: 51, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1825487224143377863 @@ -4495,9 +4495,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 7609364501153394415} 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: -130.99982, y: -42.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 53.000183, y: 24.5} m_SizeDelta: {x: 52, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3597029131539317174 @@ -4858,7 +4858,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -245.7, y: 30.7} + m_AnchoredPosition: {x: -245.7, y: 26.3} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8591802468268028330 @@ -5055,14 +5055,14 @@ RectTransform: m_GameObject: {fileID: 7712621374721581439} 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_LocalScale: {x: 0.7967, y: 0.7967, z: 0.7967} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7609364501153394415} 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: -130.99982, y: 15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 53.000183, y: 69.6} m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6645034468252132292 @@ -5330,7 +5330,7 @@ RectTransform: m_GameObject: {fileID: 7917363225261056705} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_LocalScale: {x: 0.7, y: 0.72928804, z: 0.72928804} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4710570228793354968} @@ -5359,8 +5359,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: -214.40002, y: -136} - m_SizeDelta: {x: 368, y: 134} + m_AnchoredPosition: {x: -214.40002, y: -151.766} + m_SizeDelta: {x: 368, y: 113.2365} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8378108290391890554 CanvasRenderer: @@ -5811,14 +5811,14 @@ RectTransform: m_GameObject: {fileID: 8715748350172511410} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 4710570228793354968} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 67.5, y: -1.9819} + m_AnchoredPosition: {x: 69.9, y: -2.3000078} m_SizeDelta: {x: 38, y: 13.149} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4580168597633069950 @@ -5877,8 +5877,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 16.25 - m_fontSizeBase: 16.25 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18