1
This commit is contained in:
@@ -17,7 +17,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &6829091818195909040
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -121,7 +121,8 @@ MonoBehaviour:
|
||||
yzID:
|
||||
colliderList: []
|
||||
lockPoint: {fileID: 2241474319393315657}
|
||||
bingDongEffect: []
|
||||
bingDongEffect:
|
||||
- {fileID: 8432976849779275627}
|
||||
needLockEvent: 0
|
||||
createVideoClip: {fileID: 0}
|
||||
rotationPY: 60
|
||||
@@ -151,6 +152,156 @@ MonoBehaviour:
|
||||
v3: {x: 0, y: 0, z: 0}
|
||||
isLocalCoin: 0
|
||||
killerSitPos: -1
|
||||
--- !u!1 &8432976849779275627
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1078815191692259220}
|
||||
- component: {fileID: 4417982164893482866}
|
||||
m_Layer: 10
|
||||
m_Name: 4022 (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!4 &1078815191692259220
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8432976849779275627}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: -0.7071068}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6424649994567532690}
|
||||
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
|
||||
--- !u!137 &4417982164893482866
|
||||
SkinnedMeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8432976849779275627}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 44c6151fcaa72da4eab1e0d754efac21, type: 2}
|
||||
- {fileID: 2100000, guid: fbb307dc441f0bb4a812b34bf89889c6, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 0
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
serializedVersion: 2
|
||||
m_Quality: 0
|
||||
m_UpdateWhenOffscreen: 0
|
||||
m_SkinnedMotionVectors: 1
|
||||
m_Mesh: {fileID: 4300000, guid: 37f178806f121f94b9017d3edeebb792, type: 2}
|
||||
m_Bones:
|
||||
- {fileID: 2241474319393315657}
|
||||
- {fileID: 7159672387256688284}
|
||||
- {fileID: 895238981931077578}
|
||||
- {fileID: 8628662308298853933}
|
||||
- {fileID: 4854407239208553904}
|
||||
- {fileID: 6088542975721689950}
|
||||
- {fileID: 561711153387741589}
|
||||
- {fileID: 6073736394106483880}
|
||||
- {fileID: 669415848163593448}
|
||||
- {fileID: 1321054577834407571}
|
||||
- {fileID: 5616524963006926588}
|
||||
- {fileID: 1268951532512197000}
|
||||
- {fileID: 4757418368885686386}
|
||||
- {fileID: 1829696433180510524}
|
||||
- {fileID: 1065772988028510595}
|
||||
- {fileID: 8112892692154681551}
|
||||
- {fileID: 7086483120379192294}
|
||||
- {fileID: 2581467707347561644}
|
||||
- {fileID: 5054703612892214637}
|
||||
- {fileID: 5828259451202889719}
|
||||
- {fileID: 1634680009229623245}
|
||||
- {fileID: 7900993211201389521}
|
||||
- {fileID: 3234428941494891231}
|
||||
- {fileID: 8009748028426764526}
|
||||
- {fileID: 1498300234187653504}
|
||||
- {fileID: 6337430946825022853}
|
||||
- {fileID: 7390182761305640485}
|
||||
- {fileID: 6727541891110450426}
|
||||
- {fileID: 7596225534787259058}
|
||||
- {fileID: 9206537195439330164}
|
||||
- {fileID: 617925527288914515}
|
||||
- {fileID: 4549943527099698211}
|
||||
- {fileID: 5708435042684042011}
|
||||
- {fileID: 7021542355195509118}
|
||||
- {fileID: 1587505677842122961}
|
||||
- {fileID: 4650468819151625423}
|
||||
- {fileID: 714928960703610678}
|
||||
- {fileID: 6633341159357210799}
|
||||
- {fileID: 8766276351932509647}
|
||||
- {fileID: 5893678473514373597}
|
||||
- {fileID: 7298718280516913961}
|
||||
- {fileID: 1859333512562843087}
|
||||
- {fileID: 4826380689367912697}
|
||||
- {fileID: 2033438582626201390}
|
||||
- {fileID: 2528902225661484296}
|
||||
- {fileID: 7056261313723073353}
|
||||
- {fileID: 9044328500152824364}
|
||||
- {fileID: 7639433607758454716}
|
||||
- {fileID: 6150874412751665085}
|
||||
- {fileID: 2752004746179234878}
|
||||
- {fileID: 7267574542418664245}
|
||||
- {fileID: 3651239831174995841}
|
||||
- {fileID: 902743295807770206}
|
||||
- {fileID: 8765148640454318571}
|
||||
- {fileID: 6327411185415114832}
|
||||
- {fileID: 7227684096962073697}
|
||||
- {fileID: 2650444510149847696}
|
||||
- {fileID: 1548210537621367886}
|
||||
- {fileID: 7902509965953923296}
|
||||
- {fileID: 8297719359740921233}
|
||||
- {fileID: 6236062104951489242}
|
||||
- {fileID: 4210558299534594957}
|
||||
- {fileID: 5814907025644479147}
|
||||
- {fileID: 5545275894505122854}
|
||||
m_BlendShapeWeights: []
|
||||
m_RootBone: {fileID: 4854407239208553904}
|
||||
m_AABB:
|
||||
m_Center: {x: 1.3712993, y: -3.5106, z: -0.5969871}
|
||||
m_Extent: {x: 8.03437, y: 8.639906, z: 3.738863}
|
||||
m_DirtyAABB: 0
|
||||
--- !u!1001 &6761449844163995739
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -883,7 +1034,11 @@ PrefabInstance:
|
||||
m_RemovedComponents:
|
||||
- {fileID: -684069750954902368, guid: 164b4561f2395514098c98f5cb31a9a7, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 359601798638086345, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
insertIndex: 1
|
||||
addedObject: {fileID: 1078815191692259220}
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 1371714648199521916, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
@@ -1028,6 +1183,48 @@ CircleCollider2D:
|
||||
m_Offset: {x: 0.10069761, y: -0.23483162}
|
||||
serializedVersion: 2
|
||||
m_Radius: 1.0216199
|
||||
--- !u!4 &561711153387741589 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6493882379110631886, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &617925527288914515 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6144652830259038728, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &669415848163593448 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6097663775136883891, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &714928960703610678 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6070446394670536557, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &895238981931077578 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5889012672985720721, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &902743295807770206 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5859832865881007621, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1065772988028510595 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5989537011351325144, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1187999272466028255 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 5596252243994181252, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
@@ -1069,12 +1266,114 @@ CircleCollider2D:
|
||||
m_Offset: {x: 0.09972517, y: -0.15416075}
|
||||
serializedVersion: 2
|
||||
m_Radius: 1.3461838
|
||||
--- !u!4 &1268951532512197000 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5497002324286001619, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1321054577834407571 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5728625923020480200, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1498300234187653504 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5268779252641180123, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1548210537621367886 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5235759510025651221, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1587505677842122961 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5463581921876500618, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1634680009229623245 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5438925590265837462, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1829696433180510524 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4949770422796542311, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1859333512562843087 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4906904019668727188, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2033438582626201390 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4750531596338186101, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2241474319393315657 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4813837603928978194, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2528902225661484296 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 9136970092523599187, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2581467707347561644 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 9081027047997048055, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2650444510149847696 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8727197563555300043, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2752004746179234878 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8927378503627711589, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &3234428941494891231 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8158131306266909316, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &3651239831174995841 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8034053979844556762, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &4210558299534594957 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7474733724741336022, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &4549943527099698211 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7129720784181683320, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &4634016007934139999 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2133065539765974532, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
@@ -1116,6 +1415,18 @@ CircleCollider2D:
|
||||
m_Offset: {x: 0, y: 0}
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.5
|
||||
--- !u!4 &4650468819151625423 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2115766101380166804, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &4757418368885686386 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2292543332491618345, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &4785151558115333572 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2287049271739743647, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
@@ -1157,6 +1468,36 @@ CircleCollider2D:
|
||||
m_Offset: {x: 0.10069761, y: -0.23483162}
|
||||
serializedVersion: 2
|
||||
m_Radius: 1.0216199
|
||||
--- !u!4 &4826380689367912697 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2247227379365165218, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &4854407239208553904 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2200904955083073003, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &5054703612892214637 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2013272761535896886, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &5545275894505122854 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1234472026513622141, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &5616524963006926588 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1163223368001365671, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &5682471784799145511 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1371714648199521916, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
@@ -1208,6 +1549,78 @@ BoxCollider2D:
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 5.5302353, y: 2.4065356}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!4 &5708435042684042011 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1363765651768939328, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &5814907025644479147 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 965967070694312688, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &5828259451202889719 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 952333029173432236, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &5893678473514373597 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 873684683575212422, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6073736394106483880 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 693345286257892595, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6088542975721689950 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 696834583950572293, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6150874412751665085 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 615081647147704294, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6236062104951489242 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 819531705607744129, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6327411185415114832 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 727898952875358219, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6337430946825022853 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 731391910183257566, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6424649994567532690 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 359601798638086345, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6633341159357210799 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 133738465307461876, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6647705587894928147 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 113746460454464328, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
@@ -1249,6 +1662,12 @@ CircleCollider2D:
|
||||
m_Offset: {x: 0.1575917, y: -0.14439161}
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.75501406
|
||||
--- !u!4 &6727541891110450426 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 38414170167794849, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6942941975768149791 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4435823799271475012, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
@@ -1290,6 +1709,12 @@ CircleCollider2D:
|
||||
m_Offset: {x: 1.3896028, y: 0.17599179}
|
||||
serializedVersion: 2
|
||||
m_Radius: 2.320322
|
||||
--- !u!4 &7021542355195509118 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4369891717370499365, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &7053307581607970816 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4338971054284464219, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
@@ -1331,6 +1756,90 @@ CircleCollider2D:
|
||||
m_Offset: {x: 0.09006529, y: -0.33669606}
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.80138046
|
||||
--- !u!4 &7056261313723073353 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4339674023820028690, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7086483120379192294 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4579386856805960637, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7159672387256688284 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4506197588773992135, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7227684096962073697 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4150237116592946234, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7267574542418664245 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4111472299097109358, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7298718280516913961 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4080049418938590066, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7390182761305640485 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4276813114706847358, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7596225534787259058 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3800554505917752041, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7639433607758454716 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4022214381228816359, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7900993211201389521 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3490441141532060554, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7902509965953923296 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3494270212187427003, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8009748028426764526 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3674138688486418613, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8112892692154681551 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3261650821564981396, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8297719359740921233 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3382789377624026570, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &8303935386256961567 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 3380232942028036164, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
@@ -1413,3 +1922,33 @@ CircleCollider2D:
|
||||
m_Offset: {x: 0.10115133, y: -0.73803973}
|
||||
serializedVersion: 2
|
||||
m_Radius: 1.0911689
|
||||
--- !u!4 &8628662308298853933 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3056348104337352310, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8765148640454318571 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2626002038794023344, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8766276351932509647 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2629379984570697108, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9044328500152824364 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2330214875685395063, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9206537195439330164 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2454829043625163567, guid: 164b4561f2395514098c98f5cb31a9a7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6761449844163995739}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
@@ -2217,6 +2217,11 @@ PrefabInstance:
|
||||
propertyPath: m_Layer
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2674256517178600808, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2686226043775217977, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
|
||||
type: 3}
|
||||
propertyPath: m_Layer
|
||||
@@ -5097,6 +5102,11 @@ PrefabInstance:
|
||||
propertyPath: m_Layer
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5775210030477550351, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5781146825322796927, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
|
||||
type: 3}
|
||||
propertyPath: m_Layer
|
||||
@@ -5740,7 +5750,7 @@ PrefabInstance:
|
||||
- target: {fileID: 6697986194447116423, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6727806731254963401, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
|
||||
type: 3}
|
||||
@@ -7447,6 +7457,11 @@ PrefabInstance:
|
||||
propertyPath: m_Layer
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8497002445075296340, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8499361055972804529, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@@ -8221,6 +8236,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
subCamera: {fileID: 0}
|
||||
isFishCamera: 0
|
||||
--- !u!4 &1460210969051644729 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4432265720714709115, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
|
||||
@@ -8252,7 +8268,6 @@ MonoBehaviour:
|
||||
fishScore: 0
|
||||
bJbeishu: 0
|
||||
maxScore: 0
|
||||
startOffset: {x: 0, y: 0, z: -100}
|
||||
isSelf: 0
|
||||
isScoreEnd: 0
|
||||
useScorePanel: 1
|
||||
@@ -8355,6 +8370,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
subCamera: {fileID: 0}
|
||||
isFishCamera: 0
|
||||
--- !u!1 &7420106599670529210 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 5708496905382672376, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
|
||||
@@ -8374,6 +8390,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
subCamera: {fileID: 0}
|
||||
isFishCamera: 0
|
||||
--- !u!1001 &8906284674362371613
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -321,7 +321,7 @@ PrefabInstance:
|
||||
- target: {fileID: 1030775455358288214, guid: cf762c0a6428e1c42b456cb87803660f,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1033492699765897026, guid: cf762c0a6428e1c42b456cb87803660f,
|
||||
type: 3}
|
||||
@@ -718,6 +718,16 @@ PrefabInstance:
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3052892675599499800, guid: cf762c0a6428e1c42b456cb87803660f,
|
||||
type: 3}
|
||||
propertyPath: m_Camera
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3052892675599499800, guid: cf762c0a6428e1c42b456cb87803660f,
|
||||
type: 3}
|
||||
propertyPath: m_RenderMode
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3058207423941177080, guid: cf762c0a6428e1c42b456cb87803660f,
|
||||
type: 3}
|
||||
propertyPath: m_Layer
|
||||
@@ -1618,6 +1628,11 @@ PrefabInstance:
|
||||
propertyPath: m_CameraType
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6217352291952289784, guid: cf762c0a6428e1c42b456cb87803660f,
|
||||
type: 3}
|
||||
propertyPath: m_Cameras.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6218685022970385525, guid: cf762c0a6428e1c42b456cb87803660f,
|
||||
type: 3}
|
||||
propertyPath: m_Layer
|
||||
@@ -2994,7 +3009,8 @@ PrefabInstance:
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 3882252625413371882, guid: cf762c0a6428e1c42b456cb87803660f, type: 3}
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 8577029329742161438, guid: cf762c0a6428e1c42b456cb87803660f,
|
||||
@@ -6876,6 +6892,7 @@ MonoBehaviour:
|
||||
forwordXYZ:
|
||||
fishenum: 0
|
||||
moveTime: 0
|
||||
yzGroupTimeOffset: 0
|
||||
isyz: 0
|
||||
yzID:
|
||||
colliderList:
|
||||
|
||||
@@ -18,15 +18,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4705490297895623, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 7
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4705490297895623, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 7
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4705490297895623, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 7
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4705490297895623, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@@ -1696,6 +1696,7 @@ MonoBehaviour:
|
||||
forwordXYZ:
|
||||
fishenum: 0
|
||||
moveTime: 0
|
||||
yzGroupTimeOffset: 0
|
||||
isyz: 0
|
||||
yzID:
|
||||
colliderList: []
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using System.Collections;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
@@ -9,4 +9,7 @@ public class GameMainPanel_FLZY : GameMainPanel_FishBase
|
||||
base.OnShow(args);
|
||||
AudioManager.Instance.ChangeBG(62024);
|
||||
}
|
||||
|
||||
/// <summary>玩法 BGM(加载完成确认点会再置一次,防止被大厅面板 Hide 覆盖)</summary>
|
||||
protected override int GameBgmAudioId => 62024;
|
||||
}
|
||||
|
||||
@@ -1368,6 +1368,12 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
|
||||
GameManager.Instance.gameData.currRoomData.activeFishes = null;
|
||||
}
|
||||
|
||||
// ⭐ 最终确认玩法 BGM:进入房间时"选房/大厅面板 Hide→ChangeBG(69001) 大厅音乐"
|
||||
// 可能晚于面板 Awake/OnShow 执行,把玩法 BGM 覆盖成大厅音乐;
|
||||
// 加载完成这里最终置一次,保证游戏内播放的一定是玩法 BGM
|
||||
if (GameBgmAudioId > 0 && AudioManager.Instance != null)
|
||||
AudioManager.Instance.ChangeBG(GameBgmAudioId);
|
||||
|
||||
// ⭐ 90% 确认点:走到这里所有资源加载都已完成(上面全是 await 顺序执行)
|
||||
SetLoadProgress(0.9f);
|
||||
|
||||
@@ -1749,6 +1755,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
|
||||
JinDuTiao.SetProgress(_isChangeRoom ? p * 0.45f : p);
|
||||
}
|
||||
|
||||
/// <summary>玩法 BGM 编号(子类覆盖)。加载完成确认点会再置一次,
|
||||
/// 防止进入房间时"选房/大厅面板 Hide → ChangeBG(69001) 大厅音乐"晚于面板 OnShow 把玩法音乐覆盖掉</summary>
|
||||
protected virtual int GameBgmAudioId => 0;
|
||||
|
||||
/// <summary>加载段进度写入:切换房间时映射到合并进度条后半段(55~100%),平时直接写面板进度条</summary>
|
||||
private void SetLoadProgress(float p)
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using DG.Tweening;
|
||||
using DG.Tweening;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
@@ -13,6 +13,9 @@ public class GameMainPanel_HHWK : GameMainPanel_FishBase
|
||||
AudioManager.Instance.ChangeBG(61004);
|
||||
}
|
||||
|
||||
/// <summary>玩法 BGM(加载完成确认点会再置一次,防止被大厅面板 Hide 覆盖)</summary>
|
||||
protected override int GameBgmAudioId => 61004;
|
||||
|
||||
public override void OnDestroy()
|
||||
{
|
||||
base.OnDestroy();
|
||||
|
||||
@@ -219,6 +219,9 @@ public class GameMainPanel_XJMH : GameMainPanel_FishBase
|
||||
AudioManager.Instance.ChangeBG(61109);
|
||||
}
|
||||
|
||||
/// <summary>玩法 BGM(加载完成确认点会再置一次,防止被大厅面板 Hide 覆盖)</summary>
|
||||
protected override int GameBgmAudioId => 61109;
|
||||
|
||||
// ==================== 切换面板:初始化 / 显示 / 隐藏 ====================
|
||||
|
||||
/// <summary>初始化切换面板:绑定按钮点击、抓原版滑动节点、默认隐藏</summary>
|
||||
|
||||
@@ -2860,7 +2860,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "1200000000<sprite name=\"\u91D1\u5E01\">\n1200000000<sprite name=\"\u94BB\u77F3\">"
|
||||
m_text:
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
|
||||
m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
|
||||
@@ -6791,7 +6791,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: New Text
|
||||
m_text:
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
|
||||
m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
|
||||
@@ -8181,8 +8181,8 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: d8ed9f5bcb119164bba6f337459455cf, type: 3}
|
||||
m_Type: 0
|
||||
m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
|
||||
@@ -1825,7 +1825,7 @@ RectTransform:
|
||||
- {fileID: 869124775395989096}
|
||||
- {fileID: 1022521778877026968}
|
||||
- {fileID: 3519741173535166989}
|
||||
m_Father: {fileID: 6421461513398668010}
|
||||
m_Father: {fileID: 4709961208683905114}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
@@ -4407,7 +4407,7 @@ RectTransform:
|
||||
- {fileID: 4480698485449847675}
|
||||
- {fileID: 663181913870858093}
|
||||
- {fileID: 7577770918653805942}
|
||||
m_Father: {fileID: 6421461513398668010}
|
||||
m_Father: {fileID: 4709961208683905114}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
@@ -7071,6 +7071,85 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &3735347477827138974
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4709961208683905114}
|
||||
- component: {fileID: 5394481391490393534}
|
||||
- component: {fileID: 2877294000540408977}
|
||||
m_Layer: 0
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4709961208683905114
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3735347477827138974}
|
||||
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: 1898386671018826277}
|
||||
- {fileID: 2142002906238051227}
|
||||
- {fileID: 8721221603741383260}
|
||||
- {fileID: 2212693716560400110}
|
||||
m_Father: {fileID: 6421461513398668010}
|
||||
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 &5394481391490393534
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3735347477827138974}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &2877294000540408977
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3735347477827138974}
|
||||
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: 0, g: 0, b: 0, a: 0.31764707}
|
||||
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 &3765814122780406631
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -10531,7 +10610,7 @@ RectTransform:
|
||||
- {fileID: 8671673001795996502}
|
||||
- {fileID: 3925705241384746349}
|
||||
- {fileID: 1750378417408692474}
|
||||
m_Father: {fileID: 6421461513398668010}
|
||||
m_Father: {fileID: 4709961208683905114}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
@@ -12590,6 +12669,8 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 6421461513398668010}
|
||||
- component: {fileID: 6418072855338436596}
|
||||
- component: {fileID: 2282623571559992154}
|
||||
- component: {fileID: 8642091272790412636}
|
||||
m_Layer: 0
|
||||
m_Name: UserInfo
|
||||
m_TagString: Untagged
|
||||
@@ -12609,10 +12690,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1898386671018826277}
|
||||
- {fileID: 2142002906238051227}
|
||||
- {fileID: 8721221603741383260}
|
||||
- {fileID: 2212693716560400110}
|
||||
- {fileID: 4709961208683905114}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
@@ -12674,6 +12752,44 @@ MonoBehaviour:
|
||||
parent_AvatarList: {fileID: 2321029881299356511}
|
||||
parent_AvatarKList: {fileID: 1565989030040883447}
|
||||
prefab_AvatarItem: {fileID: 4003580760331289794}
|
||||
--- !u!222 &2282623571559992154
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6342049672119569556}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &8642091272790412636
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6342049672119569556}
|
||||
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.21960784}
|
||||
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 &6364279370851380438
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -15609,7 +15725,7 @@ RectTransform:
|
||||
- {fileID: 9214379475018401134}
|
||||
- {fileID: 8067795970374156762}
|
||||
- {fileID: 7095339108781604811}
|
||||
m_Father: {fileID: 6421461513398668010}
|
||||
m_Father: {fileID: 4709961208683905114}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
||||
@@ -13148,7 +13148,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: 123456789
|
||||
m_text:
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 7cb7af7685a457443a295fdaa17beeea, type: 2}
|
||||
m_sharedMaterial: {fileID: 2100000, guid: a407b419f8c2f204ca3540b6dc7b51bd, type: 2}
|
||||
@@ -28405,7 +28405,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -0.00012207031, y: 0.000091552734}
|
||||
m_SizeDelta: {x: 0, y: 57.52}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &1388862572319082958
|
||||
MonoBehaviour:
|
||||
@@ -28449,8 +28449,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "\u4EB2\u7231\u7684\u73A9\u5BB6\uFF0C\u8FD9\u91CC\u5723\u6D1B\u7684\u6492\u5927\u5927\u5927\u82CF\u6253\uFF0C\u53D1\u53D1\u53D1
|
||||
\u53D1\u751F\u53D1\u5927\u82CF\u6253\u3002"
|
||||
m_text:
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
|
||||
m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
|
||||
|
||||
Reference in New Issue
Block a user