This commit is contained in:
lq 2024-12-11 15:53:49 +08:00
parent e0ef89a8cf
commit 5f5bc751f3
13 changed files with 3797 additions and 83 deletions

View File

@ -432,7 +432,7 @@ RectTransform:
- {fileID: 2368487730193097937}
- {fileID: 2368487730510273619}
m_Father: {fileID: 2368487730057768969}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -468,6 +468,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7697798338937740108}
- {fileID: 2368487730631202383}
- {fileID: 2368487730040724335}
m_Father: {fileID: 0}
@ -866,13 +867,89 @@ RectTransform:
- {fileID: 2368487729981570270}
- {fileID: 2368487729488031803}
m_Father: {fileID: 2368487730057768969}
m_RootOrder: 0
m_RootOrder: 1
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: 119.558655}
m_SizeDelta: {x: 1920, y: 687.5455}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &9086276164615348635
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7697798338937740108}
- component: {fileID: 4744705606949050053}
- component: {fileID: 2344303043716919252}
m_Layer: 5
m_Name: Mask
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7697798338937740108
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9086276164615348635}
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: 2368487730057768969}
m_RootOrder: 0
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: 1920, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4744705606949050053
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9086276164615348635}
m_CullTransparentMesh: 1
--- !u!114 &2344303043716919252
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9086276164615348635}
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: 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: 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!1001 &522893711962272754
PrefabInstance:
m_ObjectHideFlags: 0
@ -902,7 +979,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3}
propertyPath: m_AnchorMin.x
@ -910,11 +987,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: 354
objectReference: {fileID: 0}
- target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3}
propertyPath: m_SizeDelta.y
@ -950,11 +1027,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 177
objectReference: {fileID: 0}
- target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -32.2326
objectReference: {fileID: 0}
- target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ba933e54a4c5cfa408443ed45c497e0a
guid: a77afb782af693e48ab245ceb3096ff4
folderAsset: yes
DefaultImporter:
externalObjects: {}

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: 8a7a0b7ab21d34f418036ae048036190
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -100,11 +100,15 @@ public class TaskPanel : Base
}
}
public async Task DestroyTaskAsync()
{
DeleteAllChildObjects();
await Task.Delay(10);
}
public void DeleteAllChildObjects()
{
// 遍历所有子物体并删除

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -122,6 +122,11 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &6351547 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2368487730057768968, guid: f7325740e682bf04a909abba74479379, type: 3}
m_PrefabInstance: {fileID: 88234507}
m_PrefabAsset: {fileID: 0}
--- !u!1 &19367787
GameObject:
m_ObjectHideFlags: 0
@ -750,7 +755,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994198998571858, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 110
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994198998571858, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -774,7 +779,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994199002865535, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 110
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994199002865535, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -798,7 +803,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994199012160355, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 110
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994199012160355, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -822,7 +827,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994199015510579, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 110
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994199015510579, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -846,7 +851,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994199351914701, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 126
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994199351914701, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -870,7 +875,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994199364566401, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 126
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994199364566401, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -894,7 +899,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994199367752913, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 126
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994199367752913, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -918,7 +923,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994199381439712, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 126
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994199381439712, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -942,7 +947,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994199579568693, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 110
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994199579568693, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -966,7 +971,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994199605647877, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 126
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994199605647877, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -990,7 +995,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994199822841271, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 110
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994199822841271, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1014,7 +1019,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994199865689479, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 126
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994199865689479, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1038,7 +1043,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994200088200840, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 126
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994200088200840, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1062,7 +1067,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994200119438923, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 126
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994200119438923, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1086,7 +1091,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994200202021572, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 110
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994200202021572, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1110,7 +1115,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994200215251258, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 110
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994200215251258, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1134,7 +1139,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994200216218262, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 110
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994200216218262, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1158,7 +1163,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994200223690320, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 110
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994200223690320, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1182,7 +1187,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994200265872643, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 110
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994200265872643, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1206,7 +1211,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994200321997717, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 110
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994200321997717, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1230,7 +1235,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994200407654905, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 110
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994200407654905, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1254,7 +1259,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994200439351610, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 110
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994200439351610, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1278,7 +1283,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994200473900071, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 126
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994200473900071, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1302,7 +1307,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994200514263729, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 126
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994200514263729, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1326,7 +1331,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994200564549256, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 126
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994200564549256, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1350,7 +1355,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994200571807012, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 126
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994200571807012, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1374,7 +1379,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994200572723682, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 126
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994200572723682, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1398,7 +1403,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994200584889718, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 126
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994200584889718, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1422,7 +1427,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994200859684096, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 126
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994200859684096, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1446,7 +1451,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 731994201009488562, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 110
value: 0
objectReference: {fileID: 0}
- target: {fileID: 731994201009488562, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
@ -1458,143 +1463,143 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1402445394997355119, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 382
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445395074489332, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445395074489332, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445395074489332, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 517.0341
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445395074489332, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
value: 888.3673
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445395074489332, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.y
value: -258.51706
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445395159360376, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 382
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445395180919523, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445395180919523, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445395180919523, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 517.0341
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445395180919523, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
value: 1599.0612
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445395180919523, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.y
value: -258.51706
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445396082773764, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445396082773764, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445396082773764, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 517.0341
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445396082773764, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
value: 1243.7142
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445396082773764, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.y
value: -258.51706
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445396136588959, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 382
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445396604014141, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445396604014141, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445396604014141, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 517.0341
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445396604014141, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
value: 533.0204
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445396604014141, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.y
value: -258.51706
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1402445396689156006, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 382
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2368487729707515507, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2368487729707515507, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2368487729707515507, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 517.0341
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2368487729707515507, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
value: 177.67346
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2368487729707515507, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.y
value: -258.51706
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2368487729759097803, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2368487729759097803, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2368487729759097803, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.x
value: 354
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2368487729759097803, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.x
value: 177
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2368487729759097803, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_AnchoredPosition.y
value: -32.2326
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2368487729838770152, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 382
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2368487730057768968, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_Name
@ -1602,7 +1607,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2368487730057768968, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2368487730057768969, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_Pivot.x
@ -1690,7 +1695,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2368487730601593689, guid: f7325740e682bf04a909abba74479379, type: 3}
propertyPath: m_SizeDelta.y
value: 64.4652
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f7325740e682bf04a909abba74479379, type: 3}
@ -20283,6 +20288,7 @@ MonoBehaviour:
NPCJosnFile: {fileID: 4900000, guid: 41009f009f0718647a782c7e1aec97dd, type: 3}
LanguageJsonFile: {fileID: 4900000, guid: 62a41129c4663ee41a06274114d28feb, type: 3}
SelectJsonFile: {fileID: 4900000, guid: 3efd15f4195557144a45659d2baa1ba3, type: 3}
TaskJsonFile: {fileID: 4900000, guid: 4dec25769ed4ed3469693b1c881248af, type: 3}
--- !u!1001 &1542437476
PrefabInstance:
m_ObjectHideFlags: 0
@ -20580,13 +20586,17 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1039624185}
m_Modifications:
- target: {fileID: 2613237551265623801, guid: 452c94fdff2ec8b4b8e900c3582bd8d9, type: 3}
propertyPath: m_Name
value: connectbtn
objectReference: {fileID: 0}
- target: {fileID: 2613237551969927833, guid: 452c94fdff2ec8b4b8e900c3582bd8d9, type: 3}
propertyPath: m_Name
value: FreePanel01
objectReference: {fileID: 0}
- target: {fileID: 2613237551969927833, guid: 452c94fdff2ec8b4b8e900c3582bd8d9, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2613237551969927838, guid: 452c94fdff2ec8b4b8e900c3582bd8d9, type: 3}
propertyPath: m_Pivot.x
@ -20686,7 +20696,7 @@ PrefabInstance:
objectReference: {fileID: 1526740604}
- target: {fileID: 5723411038301894439, guid: 452c94fdff2ec8b4b8e900c3582bd8d9, type: 3}
propertyPath: m_SizeDelta.y
value: 0
value: -259.1844
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 2613237552794096493, guid: 452c94fdff2ec8b4b8e900c3582bd8d9, type: 3}
@ -20713,7 +20723,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cbbd01de5b390ce43acc02c7496a905f, type: 3}
m_Name:
m_EditorClassIdentifier:
FreePanel02: {fileID: 6351547}
timerText: {fileID: 510191599}
connectBtn: {fileID: 1943285844}
--- !u!1 &1584174923 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2613237552794096495, guid: 452c94fdff2ec8b4b8e900c3582bd8d9, type: 3}
@ -22654,8 +22666,12 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1734941486877014248, guid: ca0e087ad731f8e4c87e761b0baa2d2c, type: 3}
propertyPath: m_SizeDelta.y
value: 116
value: 122
objectReference: {fileID: 0}
- target: {fileID: 1734941486877014249, guid: ca0e087ad731f8e4c87e761b0baa2d2c, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 8a7a0b7ab21d34f418036ae048036190, type: 3}
- target: {fileID: 1734941488510288321, guid: ca0e087ad731f8e4c87e761b0baa2d2c, type: 3}
propertyPath: m_AnchorMax.y
value: 1
@ -22678,7 +22694,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1734941488510288321, guid: ca0e087ad731f8e4c87e761b0baa2d2c, type: 3}
propertyPath: m_AnchoredPosition.y
value: -58
value: -61
objectReference: {fileID: 0}
- target: {fileID: 2165836829436838819, guid: ca0e087ad731f8e4c87e761b0baa2d2c, type: 3}
propertyPath: m_Pivot.x
@ -23740,6 +23756,17 @@ Transform:
m_CorrespondingSourceObject: {fileID: 431404, guid: 406416920addf5d408961e0385a837f5, type: 3}
m_PrefabInstance: {fileID: 1912789160}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1943285844 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2613237551265623805, guid: 452c94fdff2ec8b4b8e900c3582bd8d9, type: 3}
m_PrefabInstance: {fileID: 1584174919}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1948499801
PrefabInstance:
m_ObjectHideFlags: 0

View File

@ -1,5 +1,9 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 4571963e0ee11474b9f600297378bc02
=======
guid: 5edd4bab5fe7f674ab71959094cb4c72
>>>>>>> e50511e1d7b4442a67ac3ba4a155fc9e0cf36046
MonoImporter:
externalObjects: {}
serializedVersion: 2

View File

@ -17,6 +17,7 @@ public class JSONReader : MonoBehaviour
public TextAsset NPCJosnFile;
public TextAsset LanguageJsonFile;
public TextAsset SelectJsonFile;
public TextAsset TaskJsonFile;
public Dictionary<int, NPCData> npcDictionary = new Dictionary<int, NPCData>();
public Dictionary<int, LocationData> locationDictionary = new Dictionary<int, LocationData>();
public Dictionary<int, EventData> eventDictionary = new Dictionary<int, EventData>();
@ -25,7 +26,8 @@ public class JSONReader : MonoBehaviour
public Dictionary<int, IncidentSite> incidentSiteDictionary = new Dictionary<int, IncidentSite>();
public Dictionary<int, NPC> NPCDictionary = new Dictionary<int, NPC>();
public Dictionary<int, Language> LanguageDictionary = new Dictionary<int, Language>();
private Dictionary<string, Select> SelectDictionary = new Dictionary<string, Select>();
public Dictionary<string, Select> SelectDictionary = new Dictionary<string, Select>();
public Dictionary<string, Task_> TaskDictionary = new Dictionary<string, Task_>();
void Awake()
{
@ -39,6 +41,7 @@ public class JSONReader : MonoBehaviour
NPCDictionary = NPCParseJSON(incidentSiteJosnFile.text);
LanguageDictionary = LanguageParseJSON(LanguageJsonFile.text);
SelectDictionary = SelectJSON(SelectJsonFile.text);
TaskDictionary = TaskJSON(TaskJsonFile.text);
GetLanguageByID(20008);
@ -170,6 +173,21 @@ public class JSONReader : MonoBehaviour
return locationDictionary;
}
// ½âÎö JSON ×Ö·û´®Îª Task Êý¾Ý
public Dictionary<string, Task_> TaskJSON(string json)
{
NPCData[] npcArray = JsonHelper.FromJson<NPCData>(json);
Dictionary<string, Task_> taskDictionary = new Dictionary<string, Task_>();
foreach (var npc in npcArray)
{
npcDictionary[npc.ID] = npc;
}
return taskDictionary;
}
//将所有的数据都拿出来方便调用
// 根据给定的ID获取对应的NPC数据并返回字典中所有数据
public void GetNpcDataByID(int id)
@ -452,3 +470,29 @@ public class Select
// 其他字段可根据需要添加
}
[System.Serializable]
public class Task_
{
public string ID;
public string Note;
public string Name;
public string Type;
public string PlayScript;
public string Trigger;
public string TriggerLogic;
public string OverseeCond;
public string TimeLimit;
public string Role;
public string Selects;
public string TargetType;
public string Targets1;
public string Targets2;
public string Targets2Logic;
public string ExtraValue;
public string Sort;
public string IsShow;
public string Exclusive;
public string Reward;
}

View File

@ -1,3 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEditor.Build.Reporting;
@ -6,22 +7,30 @@ using UnityEngine.UI;
public class FreePanel01 : MonoBehaviour
{
public GameObject FreePanel02;
//这里是计时器相关变量
public Text timerText;
private float timeElapsed; // 游戏运行时间
private bool isRunning = true; //是否在计时
public Button connectBtn;
// Start is called before the first frame update
void Start()
{
timeElapsed = 0f;
connectBtn.onClick.AddListener(OnClickConnectBtn);
}
public void OnClickConnectBtn()
{
FreePanel02.gameObject.SetActive(true);
}

View File

@ -0,0 +1,18 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class NetPings : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

View File

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