Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
# Conflicts: # xiaofang/Assets/Script/UI/TemplateInfo.cs
This commit is contained in:
huyulong
commit
480d7d6338
@ -432,7 +432,7 @@ RectTransform:
|
||||
- {fileID: 2368487730193097937}
|
||||
- {fileID: 2368487730510273619}
|
||||
m_Father: {fileID: 2368487730057768969}
|
||||
m_RootOrder: 2
|
||||
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}
|
||||
@ -468,7 +468,6 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7697798338937740108}
|
||||
- {fileID: 2368487730631202383}
|
||||
- {fileID: 2368487730040724335}
|
||||
m_Father: {fileID: 0}
|
||||
@ -867,89 +866,13 @@ RectTransform:
|
||||
- {fileID: 2368487729981570270}
|
||||
- {fileID: 2368487729488031803}
|
||||
m_Father: {fileID: 2368487730057768969}
|
||||
m_RootOrder: 1
|
||||
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: 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
|
||||
@ -979,7 +902,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -987,11 +910,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 354
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
@ -1027,11 +950,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 177
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -32.2326
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
|
||||
254
xiaofang/Assets/Prefabs/itemPrefabs/templateItem.prefab
Normal file
254
xiaofang/Assets/Prefabs/itemPrefabs/templateItem.prefab
Normal file
@ -0,0 +1,254 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &1706551731320121365
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1706551731320121366}
|
||||
- component: {fileID: 1706551731320121368}
|
||||
- component: {fileID: 1706551731320121367}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1706551731320121366
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1706551731320121365}
|
||||
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: 1706551731940790776}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 1.1260986, y: 0.18600464}
|
||||
m_SizeDelta: {x: 50.3051, y: 16.89}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1706551731320121368
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1706551731320121365}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1706551731320121367
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1706551731320121365}
|
||||
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: d2f86d28676ed3045a754ca39457cfe5, 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 &1706551731936480262
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1706551731936480263}
|
||||
- component: {fileID: 1706551731936480265}
|
||||
- component: {fileID: 1706551731936480264}
|
||||
m_Layer: 5
|
||||
m_Name: Text (Legacy)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1706551731936480263
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1706551731936480262}
|
||||
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: 1706551731940790776}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -139.71454, y: 0}
|
||||
m_SizeDelta: {x: -369.4734, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1706551731936480265
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1706551731936480262}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1706551731936480264
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1706551731936480262}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 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_FontData:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6A21\u677F\u540D\u79F01"
|
||||
--- !u!1 &1706551731940790775
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1706551731940790776}
|
||||
- component: {fileID: 1706551731940790778}
|
||||
- component: {fileID: 1706551731940790779}
|
||||
m_Layer: 5
|
||||
m_Name: templateItem
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1706551731940790776
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1706551731940790775}
|
||||
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: 1706551731320121366}
|
||||
- {fileID: 1706551731936480263}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1706551731940790778
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1706551731940790775}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1706551731940790779
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1706551731940790775}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, 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: 0}
|
||||
toggleTransition: 1
|
||||
graphic: {fileID: 1706551731320121367}
|
||||
m_Group: {fileID: 0}
|
||||
onValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_IsOn: 1
|
||||
@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4dec25769ed4ed3469693b1c881248af
|
||||
TextScriptImporter:
|
||||
guid: d2c6d14a4fa49a34396f74a423c22742
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 9.2 KiB |
@ -1,123 +0,0 @@
|
||||
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:
|
||||
@ -100,15 +100,11 @@ 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
@ -2211,7 +2211,7 @@ MonoBehaviour:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 618256458}
|
||||
m_Enabled: 0
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 05b11d619e5d88a439384d80484d6952, type: 3}
|
||||
m_Name:
|
||||
@ -2249,6 +2249,7 @@ MonoBehaviour:
|
||||
scene:
|
||||
dutyId: 0
|
||||
peopleList: []
|
||||
userInfo: {fileID: 1201261371}
|
||||
managerPanel1: {fileID: 617308873}
|
||||
jsonReader1: {fileID: 1417128757}
|
||||
selectScenePanel: {fileID: 7468736064579811982}
|
||||
@ -6840,6 +6841,50 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1194981511}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1201261370
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1201261372}
|
||||
- component: {fileID: 1201261371}
|
||||
m_Layer: 0
|
||||
m_Name: UserInfo
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1201261371
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1201261370}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4571963e0ee11474b9f600297378bc02, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!4 &1201261372
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1201261370}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 123.62924, y: 398.93616, z: -7.945088}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1234276884
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -559,6 +559,26 @@ PrefabInstance:
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 331050545}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5298631526888954802, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5298631526888954802, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5298631526888954802, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5298631526888954802, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5475342654612131044, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
@ -683,6 +703,22 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7468736065685524838, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
|
||||
@ -122,11 +122,6 @@ 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
|
||||
@ -755,7 +750,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994198998571858, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994198998571858, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -779,7 +774,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199002865535, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199002865535, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -803,7 +798,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199012160355, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199012160355, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -827,7 +822,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199015510579, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199015510579, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -851,7 +846,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199351914701, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199351914701, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -875,7 +870,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199364566401, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199364566401, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -899,7 +894,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199367752913, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199367752913, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -923,7 +918,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199381439712, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199381439712, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -947,7 +942,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199579568693, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199579568693, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -971,7 +966,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199605647877, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199605647877, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -995,7 +990,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199822841271, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199822841271, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1019,7 +1014,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199865689479, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199865689479, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1043,7 +1038,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200088200840, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200088200840, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1067,7 +1062,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200119438923, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200119438923, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1091,7 +1086,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200202021572, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200202021572, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1115,7 +1110,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200215251258, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200215251258, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1139,7 +1134,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200216218262, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200216218262, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1163,7 +1158,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200223690320, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200223690320, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1187,7 +1182,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200265872643, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200265872643, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1211,7 +1206,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200321997717, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200321997717, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1235,7 +1230,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200407654905, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200407654905, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1259,7 +1254,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200439351610, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200439351610, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1283,7 +1278,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200473900071, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200473900071, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1307,7 +1302,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200514263729, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200514263729, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1331,7 +1326,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200564549256, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200564549256, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1355,7 +1350,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200571807012, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200571807012, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1379,7 +1374,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200572723682, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200572723682, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1403,7 +1398,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200584889718, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200584889718, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1427,7 +1422,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200859684096, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200859684096, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1451,7 +1446,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994201009488562, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994201009488562, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1463,143 +1458,143 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445394997355119, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 382
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395074489332, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395074489332, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395074489332, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 517.0341
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395074489332, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 888.3673
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395074489332, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -258.51706
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395159360376, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 382
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395180919523, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395180919523, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395180919523, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 517.0341
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395180919523, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 1599.0612
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395180919523, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -258.51706
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396082773764, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396082773764, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396082773764, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 517.0341
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396082773764, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 1243.7142
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396082773764, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -258.51706
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396136588959, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 382
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396604014141, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396604014141, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396604014141, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 517.0341
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396604014141, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 533.0204
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396604014141, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -258.51706
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396689156006, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 382
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729707515507, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729707515507, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729707515507, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 517.0341
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729707515507, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 177.67346
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729707515507, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -258.51706
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729759097803, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729759097803, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729759097803, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 354
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729759097803, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 177
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729759097803, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -32.2326
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729838770152, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 382
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487730057768968, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_Name
|
||||
@ -1607,7 +1602,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487730057768968, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487730057768969, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
@ -1695,7 +1690,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487730601593689, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 64.4652
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
@ -20288,7 +20283,6 @@ 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
|
||||
@ -20586,17 +20580,13 @@ 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: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2613237551969927838, guid: 452c94fdff2ec8b4b8e900c3582bd8d9, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
@ -20696,7 +20686,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 1526740604}
|
||||
- target: {fileID: 5723411038301894439, guid: 452c94fdff2ec8b4b8e900c3582bd8d9, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: -259.1844
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 2613237552794096493, guid: 452c94fdff2ec8b4b8e900c3582bd8d9, type: 3}
|
||||
@ -20723,9 +20713,7 @@ 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}
|
||||
@ -22666,12 +22654,8 @@ PrefabInstance:
|
||||
m_Modifications:
|
||||
- target: {fileID: 1734941486877014248, guid: ca0e087ad731f8e4c87e761b0baa2d2c, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 122
|
||||
value: 116
|
||||
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
|
||||
@ -22694,7 +22678,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1734941488510288321, guid: ca0e087ad731f8e4c87e761b0baa2d2c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -61
|
||||
value: -58
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2165836829436838819, guid: ca0e087ad731f8e4c87e761b0baa2d2c, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
@ -23756,17 +23740,6 @@ 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
|
||||
|
||||
@ -823,6 +823,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
token:
|
||||
Global: {fileID: 0}
|
||||
clientId: e5cd7e4891bf95d1d19206ce24a7b32e
|
||||
--- !u!114 &252707975
|
||||
MonoBehaviour:
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -8,10 +8,10 @@ using UnityEngine;
|
||||
//获取房间玩家列表
|
||||
public class getPlayerList : MonoBehaviour
|
||||
{
|
||||
private void Start()
|
||||
{
|
||||
GetPlayerList();
|
||||
}
|
||||
//private void Start()
|
||||
//{
|
||||
// GetPlayerList();
|
||||
//}
|
||||
// 创建请求头，使用最新的 token
|
||||
public Dictionary<string, string> CreateHeaders()
|
||||
{
|
||||
@ -38,6 +38,7 @@ public class getPlayerList : MonoBehaviour
|
||||
//=====================================================================================================================
|
||||
public class PlayerListResponse : Response
|
||||
{
|
||||
|
||||
public List<PlayerListData> data { get; set; }
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5edd4bab5fe7f674ab71959094cb4c72
|
||||
guid: 4571963e0ee11474b9f600297378bc02
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
using Newtonsoft.Json;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using Unity.VisualScripting.Antlr3.Runtime;
|
||||
using UnityEditor.PackageManager;
|
||||
using UnityEngine;
|
||||
@ -11,28 +12,21 @@ public class getTemplateList : MonoBehaviour
|
||||
// 创建请求头，使用最新的 token
|
||||
public Dictionary<string, string> CreateHeaders()
|
||||
{
|
||||
|
||||
|
||||
if (string.IsNullOrEmpty(MyGlobal.global.loginResponse.data.access_token))
|
||||
{
|
||||
Debug.LogWarning("尝试创建请求头时，token 未设置。");
|
||||
return new Dictionary<string, string>();
|
||||
}
|
||||
|
||||
return new Dictionary<string, string>
|
||||
{
|
||||
{ "Authorization","Bearer "+MyGlobal.global.loginResponse.data.access_token },
|
||||
{ "Authorization","Bearer "+GlobalData.ServerData.data.access_token },
|
||||
{"clientId", "e5cd7e4891bf95d1d19206ce24a7b32e" }
|
||||
};
|
||||
}
|
||||
//获取模板列表
|
||||
public async void TemplaRst()
|
||||
public async Task<TemplateListData> TemplaRst()
|
||||
{
|
||||
string response = await web.SendRequest(web.URL + "/game/gameTemplate/list", "GET", "", CreateHeaders());
|
||||
Debug.Log("获取模板列表" + response);
|
||||
//解析服务器返回的数据
|
||||
TemplateListData templateListData = JsonConvert.DeserializeObject<TemplateListData>(response);
|
||||
Debug.Log("================" + templateListData.msg);
|
||||
return templateListData;
|
||||
}
|
||||
}
|
||||
//=======================================================================================================
|
||||
|
||||
@ -17,7 +17,6 @@ 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>();
|
||||
@ -26,8 +25,7 @@ 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>();
|
||||
public Dictionary<string, Select> SelectDictionary = new Dictionary<string, Select>();
|
||||
public Dictionary<string, Task_> TaskDictionary = new Dictionary<string, Task_>();
|
||||
private Dictionary<string, Select> SelectDictionary = new Dictionary<string, Select>();
|
||||
|
||||
void Awake()
|
||||
{
|
||||
@ -41,7 +39,6 @@ public class JSONReader : MonoBehaviour
|
||||
NPCDictionary = NPCParseJSON(incidentSiteJosnFile.text);
|
||||
LanguageDictionary = LanguageParseJSON(LanguageJsonFile.text);
|
||||
SelectDictionary = SelectJSON(SelectJsonFile.text);
|
||||
TaskDictionary = TaskJSON(TaskJsonFile.text);
|
||||
|
||||
|
||||
GetLanguageByID(20008);
|
||||
@ -173,21 +170,6 @@ 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)
|
||||
@ -469,30 +451,4 @@ public class Select
|
||||
public string Seq;
|
||||
|
||||
// 其他字段可根据需要添加
|
||||
}
|
||||
|
||||
|
||||
[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;
|
||||
}
|
||||
@ -80,10 +80,13 @@ public class Panel : MonoBehaviour
|
||||
private GameObject selectedScene = null;//当前选中场景
|
||||
public SelectedInfo selectedInfo;
|
||||
public Dictionary<string, List<SelectedInfo>> sceneDataDictionary = new Dictionary<string, List<SelectedInfo>>();//不同的场景存取不同的人员数据
|
||||
public List<PlayerListData> userInfoList = new List<PlayerListData>();
|
||||
public getPlayerList userInfo;
|
||||
public ManagerPanel managerPanel1;
|
||||
public JSONReader jsonReader1;
|
||||
public SelectScenePanel selectScenePanel;
|
||||
public DatePanel datePanel;
|
||||
|
||||
private bool isPersonSelected = false; // 标志是否选择了人员
|
||||
private bool isDutySelected = false; // 标志是否选择了职责
|
||||
private bool isSceneSelected = false; // 标志是否选择了场景
|
||||
@ -92,33 +95,33 @@ public class Panel : MonoBehaviour
|
||||
void Start()
|
||||
{
|
||||
selectedInfo = new SelectedInfo();
|
||||
DynamicLoadingPeople();
|
||||
DynamicLoadingScene();
|
||||
InstantiateToggle();
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
GetData();
|
||||
SetText();
|
||||
PanelToggelSet();
|
||||
//SetInputFile();
|
||||
}
|
||||
{
|
||||
GetData();
|
||||
SetText();
|
||||
PanelToggelSet();
|
||||
//SetInputFile();
|
||||
}
|
||||
//==================================================================动态加载=======================================================
|
||||
//动态加载人员
|
||||
public void DynamicLoadingPeople()
|
||||
public async void DynamicLoadingPeople()
|
||||
{
|
||||
PlayerListResponse playerListResponse=await userInfo.GetPlayerList();
|
||||
foreach(PlayerListData player in playerListResponse.data)
|
||||
{
|
||||
for (int i = 0; i < 20; i++)
|
||||
{
|
||||
GameObject item = GameObject.Instantiate<GameObject>(peoplePrefab, peopleCountent);
|
||||
PeopleItem peopleItem = item.GetComponent<PeopleItem>();
|
||||
Button peoplebutton = item.transform.Find("TextBtn").GetComponent<Button>();
|
||||
peoplebutton.onClick.AddListener(() => OnPeopleItemClicked(item, Color.yellow, selectedPerson));
|
||||
peopleList.Add(item);// 将每个实例化的角色添加到列表中
|
||||
|
||||
}
|
||||
Debug.Log("Player Name: " + player.UserName);
|
||||
GameObject item = GameObject.Instantiate<GameObject>(peoplePrefab, peopleCountent);
|
||||
PeopleItem peopleItem = item.GetComponent<PeopleItem>();
|
||||
peopleItem.nameText.text = player.NickName;
|
||||
Button peoplebutton = item.transform.Find("TextBtn").GetComponent<Button>();
|
||||
peoplebutton.onClick.AddListener(() => OnPeopleItemClicked(item, Color.yellow, selectedPerson));
|
||||
peopleList.Add(item);// 将每个实例化的角色添加到列表中
|
||||
}
|
||||
}
|
||||
|
||||
//动态加载职责
|
||||
public void DynamicLoadingDuty(int id)
|
||||
@ -322,6 +325,9 @@ public class Panel : MonoBehaviour
|
||||
//处理点击确认按钮
|
||||
public void ClickSureBtn()
|
||||
{
|
||||
Debug.LogError(">>>>>>>>>>>>>"+ isPersonSelected);
|
||||
Debug.LogError(">>>>>>>>>>>>>"+ isDutySelected);
|
||||
Debug.LogError(">>>>>>>>>>>>>"+ isSceneSelected);
|
||||
// 只有在选择了人员、职责和场景的情况下，才会执行后续操作
|
||||
if (isPersonSelected && isDutySelected && isSceneSelected)
|
||||
{
|
||||
@ -423,7 +429,7 @@ public class Panel : MonoBehaviour
|
||||
if (buttonText != null && buttonText.tag == Tags.people) // 获取标签为人员的信息
|
||||
{
|
||||
name = buttonText.text;
|
||||
Debug.Log(name);
|
||||
Debug.LogError(name);
|
||||
selectedInfo.name = name;
|
||||
isPersonSelected = true; // 选择了人员
|
||||
}
|
||||
@ -472,8 +478,6 @@ public class Panel : MonoBehaviour
|
||||
panelToggle[1].gameObject.transform.GetComponent<Image>().sprite = toggleImage[1];
|
||||
panelToggle[2].interactable = selectScenePanel.isSure; // 启用第三个Toggle
|
||||
panelToggle[2].gameObject.transform.GetComponent<Image>().sprite = toggleImage[1];
|
||||
panelToggle[3].interactable = selectScenePanel.isSure; // 启用第二个Toggle
|
||||
panelToggle[4].interactable = selectScenePanel.isSure; // 启用第三个Toggle
|
||||
}
|
||||
}
|
||||
//设置最初的时候Toggle的状态
|
||||
|
||||
@ -92,6 +92,10 @@ public class EvacuationPanel : MonoBehaviour
|
||||
nPC.roleId = roleid;
|
||||
createTemplateInfo.Instance.auth_CreateTemplate.npcList = new List<NpcList>();
|
||||
createTemplateInfo.Instance.auth_CreateTemplate.npcList.Add(nPC);
|
||||
panel.panelToggle[3].interactable = true; // 启用第二个Toggle
|
||||
panel.panelToggle[3].gameObject.transform.GetComponent<Image>().sprite = panel.toggleImage[1];
|
||||
panel.panelToggle[4].interactable = true; // 启用第三个Toggle
|
||||
panel.panelToggle[4].gameObject.transform.GetComponent<Image>().sprite = panel.toggleImage[1];
|
||||
}
|
||||
|
||||
public void SetNpcType()
|
||||
|
||||
@ -257,6 +257,10 @@ public class SelectScenePanel : MonoBehaviour
|
||||
//点击继续按钮后更换场景图片及名称
|
||||
public void InstantiateEventPrefab(int id)
|
||||
{
|
||||
if(isSure)
|
||||
{
|
||||
return;
|
||||
}
|
||||
// 清空事件列表
|
||||
incidentInfos.Clear();
|
||||
foreach (Transform child in incidentList)
|
||||
@ -265,7 +269,7 @@ public class SelectScenePanel : MonoBehaviour
|
||||
}
|
||||
|
||||
// 更新场景名称
|
||||
text20008.text = sceneName;
|
||||
text20008.text = schoolName;
|
||||
|
||||
// 通过 id 获取对应的 sceneData
|
||||
if (jsonReader.sceneDictionary.TryGetValue(id, out var sceneData))
|
||||
@ -282,8 +286,6 @@ public class SelectScenePanel : MonoBehaviour
|
||||
// 根据 incidentId 获取对应的事件数据
|
||||
EventData eventData = jsonReader.GetEvenById(incidentId);
|
||||
string[] incidentIds2 = eventData.DisasterLocation.Split('|');
|
||||
|
||||
// 动态加载 slot
|
||||
GameObject slot = GameObject.Instantiate<GameObject>(eventPrefab, eventList);
|
||||
EventInfo item = slot.GetComponent<EventInfo>();
|
||||
item.eventId = eventData.ID;
|
||||
@ -346,7 +348,6 @@ public class SelectScenePanel : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//事件及难度选择
|
||||
public void SelectEvent()
|
||||
{
|
||||
@ -364,10 +365,15 @@ public class SelectScenePanel : MonoBehaviour
|
||||
//随机事件
|
||||
public void OnRandomEventClick()
|
||||
{
|
||||
// 随机选择一个事件
|
||||
if (eventInfoList.Count > 1)
|
||||
if(isSure)
|
||||
{
|
||||
int randomIndex = Random.Range(0, eventInfoList.Count);
|
||||
return;
|
||||
}
|
||||
// 随机选择一个事件
|
||||
if (incidentInfos.Count > 1)
|
||||
{
|
||||
randomEventBtn.gameObject.SetActive(true);
|
||||
int randomIndex = Random.Range(0, incidentInfos.Count);
|
||||
// 取消所有Toggle的选中状态
|
||||
foreach (Toggle toggle in eventToggleList)
|
||||
{
|
||||
@ -382,9 +388,9 @@ public class SelectScenePanel : MonoBehaviour
|
||||
if (eventToggleList[randomIndex] != null && eventToggleList[randomIndex].GetComponent<IncidentInfo>().isOpen != false)
|
||||
{
|
||||
eventToggleList[randomIndex].isOn = true;
|
||||
this.eventName = eventInfoList[randomIndex].eventName.text; // 设置随机选择的事件名称
|
||||
this.eventId = eventInfoList[randomIndex].eventId; // 更新事件 ID
|
||||
Debug.Log("已选择随机事件: " + this.eventName);
|
||||
this.idcidentName = incidentInfos[randomIndex].incidentText.text; // 设置随机选择的事件名称
|
||||
this.difficultyId = incidentInfos[randomIndex].incidentID; // 更新事件 ID
|
||||
Debug.Log("已选择随机事件: " + this.idcidentName);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -417,8 +423,6 @@ public class SelectScenePanel : MonoBehaviour
|
||||
//继续按钮，点击后上传数据
|
||||
public void OnClickContinueBtn()
|
||||
{
|
||||
//SelectSchoolBtn();
|
||||
//SelectSceneBtn();
|
||||
InstantiateEventPrefab(this.scnenId);
|
||||
SetFirstChoise(evnetsceneList);
|
||||
if (continueBtn.interactable)
|
||||
@ -442,6 +446,8 @@ public class SelectScenePanel : MonoBehaviour
|
||||
this.gameObject.SetActive(false);
|
||||
panel.gameObject.SetActive(true);
|
||||
DisableUIInteraction();
|
||||
panel.DynamicLoadingPeople();
|
||||
panel.DynamicLoadingScene();
|
||||
panel.DynamicLoadingDuty(this.difficultyId);
|
||||
isSure = true;
|
||||
}
|
||||
@ -449,19 +455,19 @@ public class SelectScenePanel : MonoBehaviour
|
||||
//关闭按钮
|
||||
public void OnClickCloseBtn()
|
||||
{
|
||||
// 清空事件列表
|
||||
eventInfoList.Clear();
|
||||
if(!isSure)
|
||||
{// 清空事件列表
|
||||
eventInfoList.Clear();
|
||||
|
||||
// 销毁所有已实例化的事件预制体
|
||||
foreach (Transform child in eventList)
|
||||
{
|
||||
Destroy(child.gameObject);
|
||||
}
|
||||
|
||||
// 如果需要，也可以清空其他相关信息
|
||||
evnetsceneList.Clear();
|
||||
eventId = -1;
|
||||
eventName = string.Empty;
|
||||
// 销毁所有已实例化的事件预制体
|
||||
foreach (Transform child in eventList)
|
||||
{
|
||||
Destroy(child.gameObject);
|
||||
}
|
||||
evnetsceneList.Clear();
|
||||
eventId = -1;
|
||||
eventName = string.Empty;
|
||||
}
|
||||
if (schoolChoiceLable.gameObject.active == false)
|
||||
{
|
||||
sceneLable.gameObject.SetActive(true);
|
||||
@ -471,7 +477,15 @@ public class SelectScenePanel : MonoBehaviour
|
||||
}
|
||||
else
|
||||
{
|
||||
transform.gameObject.SetActive(false);
|
||||
if(isSure)
|
||||
{
|
||||
transform.gameObject.SetActive(false);
|
||||
panel.gameObject.SetActive(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
transform.gameObject.SetActive(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -668,4 +682,11 @@ public class SelectScenePanel : MonoBehaviour
|
||||
// 禁用提交按钮
|
||||
submitBtn.interactable = false;
|
||||
}
|
||||
|
||||
//界面设置
|
||||
public void SetPanel()
|
||||
{
|
||||
gameObject.SetActive(true);
|
||||
panel.gameObject.SetActive(false);
|
||||
}
|
||||
}
|
||||
25
xiaofang/Assets/Script/UI/TemplateInfo.cs
Normal file
25
xiaofang/Assets/Script/UI/TemplateInfo.cs
Normal file
@ -0,0 +1,25 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class TemplateInfo : MonoBehaviour
|
||||
{
|
||||
<<<<<<< HEAD:xiaofang/Assets/Script/hylScripts/Free01/NetPings.cs
|
||||
|
||||
|
||||
=======
|
||||
public Text templateText;
|
||||
>>>>>>> e0ef89a8cfb64341378541f16f1e9f5cffbc01eb:xiaofang/Assets/Script/UI/TemplateInfo.cs
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 40cf9f97df4c8544eae694bc0e75a15f
|
||||
guid: 22bb659b3517bd741b7e18ebe3db1e8c
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
@ -1,4 +1,3 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEditor.Build.Reporting;
|
||||
@ -7,31 +6,23 @@ 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);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
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()
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
@ -9,7 +9,9 @@ public class LoadScene : MonoBehaviour
|
||||
{
|
||||
public Button nextBtn;
|
||||
public Button yesBtn;
|
||||
|
||||
public GameObject templatePrefab;
|
||||
public Transform temlateContent;
|
||||
public getTemplateList getTemplaste;
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
@ -17,21 +19,19 @@ public class LoadScene : MonoBehaviour
|
||||
yesBtn.onClick.AddListener(OnClickYesBtn);
|
||||
}
|
||||
|
||||
private void OnClickYesBtn()
|
||||
private async void OnClickYesBtn()
|
||||
{
|
||||
//这里写应用场景的代码逻辑
|
||||
|
||||
|
||||
TemplateListData templateListData = await getTemplaste.TemplaRst();
|
||||
foreach (var info in templateListData.data)
|
||||
{
|
||||
Debug.Log("+++++++++++>>>>>>>>>>>>>>>>"+info);
|
||||
GameObject template=GameObject.Instantiate(templatePrefab, temlateContent);
|
||||
TemplateInfo templateInfo = template.GetComponent<TemplateInfo>();
|
||||
}
|
||||
}
|
||||
|
||||
public void OnClickNextBtn()
|
||||
{
|
||||
SceneManager.LoadScene("Schedule_a_walkthrough");
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
|
||||
SceneManager.LoadScene(2);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user