代码自动缩放
This commit is contained in:
parent
5ad8f095b2
commit
8bf4f11b91
|
@ -13,6 +13,17 @@ PluginImporter:
|
||||||
isExplicitlyReferenced: 0
|
isExplicitlyReferenced: 0
|
||||||
validateReferences: 1
|
validateReferences: 1
|
||||||
platformData:
|
platformData:
|
||||||
|
- first:
|
||||||
|
: Any
|
||||||
|
second:
|
||||||
|
enabled: 0
|
||||||
|
settings:
|
||||||
|
Exclude Editor: 1
|
||||||
|
Exclude Linux64: 1
|
||||||
|
Exclude OSXUniversal: 1
|
||||||
|
Exclude WebGL: 1
|
||||||
|
Exclude Win: 1
|
||||||
|
Exclude Win64: 1
|
||||||
- first:
|
- first:
|
||||||
Any:
|
Any:
|
||||||
second:
|
second:
|
||||||
|
@ -23,7 +34,33 @@ PluginImporter:
|
||||||
second:
|
second:
|
||||||
enabled: 0
|
enabled: 0
|
||||||
settings:
|
settings:
|
||||||
|
CPU: AnyCPU
|
||||||
DefaultValueInitialized: true
|
DefaultValueInitialized: true
|
||||||
|
OS: AnyOS
|
||||||
|
- first:
|
||||||
|
Standalone: Linux64
|
||||||
|
second:
|
||||||
|
enabled: 0
|
||||||
|
settings:
|
||||||
|
CPU: AnyCPU
|
||||||
|
- first:
|
||||||
|
Standalone: OSXUniversal
|
||||||
|
second:
|
||||||
|
enabled: 0
|
||||||
|
settings:
|
||||||
|
CPU: None
|
||||||
|
- first:
|
||||||
|
Standalone: Win
|
||||||
|
second:
|
||||||
|
enabled: 0
|
||||||
|
settings:
|
||||||
|
CPU: x86
|
||||||
|
- first:
|
||||||
|
Standalone: Win64
|
||||||
|
second:
|
||||||
|
enabled: 0
|
||||||
|
settings:
|
||||||
|
CPU: x86_64
|
||||||
- first:
|
- first:
|
||||||
Windows Store Apps: WindowsStoreApps
|
Windows Store Apps: WindowsStoreApps
|
||||||
second:
|
second:
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f2f45a901a877f34d8af1dc431be9abf
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 778587e0d32548844ba4b2b8d6aae431
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1d41f4959e2e98647938b30050873ab7
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 4b90f445dcdc3d8438d24cc7e5c3b9f7
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 523f8a50e06bb3b49ae4b47f7881a5ef
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -448,7 +448,7 @@ MonoBehaviour:
|
||||||
m_FallbackScreenDPI: 96
|
m_FallbackScreenDPI: 96
|
||||||
m_DefaultSpriteDPI: 96
|
m_DefaultSpriteDPI: 96
|
||||||
m_DynamicPixelsPerUnit: 1
|
m_DynamicPixelsPerUnit: 1
|
||||||
m_PresetInfoIsWorld: 1
|
m_PresetInfoIsWorld: 0
|
||||||
--- !u!114 &7384968061971090425
|
--- !u!114 &7384968061971090425
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -466,6 +466,141 @@ MonoBehaviour:
|
||||||
m_BlockingMask:
|
m_BlockingMask:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Bits: 4294967295
|
m_Bits: 4294967295
|
||||||
|
--- !u!1 &2218721163162596692
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6441496273096120829}
|
||||||
|
- component: {fileID: 1638143673985635688}
|
||||||
|
- component: {fileID: 9059472919631291044}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Text (TMP) (1)
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &6441496273096120829
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2218721163162596692}
|
||||||
|
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: 6020242228637615638}
|
||||||
|
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: -11.1, y: 13.1}
|
||||||
|
m_SizeDelta: {x: 43.58, y: 30}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &1638143673985635688
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2218721163162596692}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &9059472919631291044
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2218721163162596692}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_text: "\u544A\u8B66"
|
||||||
|
m_isRightToLeft: 0
|
||||||
|
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||||
|
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||||
|
m_fontSharedMaterials: []
|
||||||
|
m_fontMaterial: {fileID: 0}
|
||||||
|
m_fontMaterials: []
|
||||||
|
m_fontColor32:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4278200575
|
||||||
|
m_fontColor: {r: 1, g: 0.15857027, b: 0, a: 1}
|
||||||
|
m_enableVertexGradient: 0
|
||||||
|
m_colorMode: 3
|
||||||
|
m_fontColorGradient:
|
||||||
|
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_fontColorGradientPreset: {fileID: 0}
|
||||||
|
m_spriteAsset: {fileID: 0}
|
||||||
|
m_tintAllSprites: 0
|
||||||
|
m_StyleSheet: {fileID: 0}
|
||||||
|
m_TextStyleHashCode: -1183493901
|
||||||
|
m_overrideHtmlColors: 0
|
||||||
|
m_faceColor:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4294967295
|
||||||
|
m_fontSize: 17.5
|
||||||
|
m_fontSizeBase: 17.5
|
||||||
|
m_fontWeight: 400
|
||||||
|
m_enableAutoSizing: 0
|
||||||
|
m_fontSizeMin: 18
|
||||||
|
m_fontSizeMax: 72
|
||||||
|
m_fontStyle: 0
|
||||||
|
m_HorizontalAlignment: 2
|
||||||
|
m_VerticalAlignment: 512
|
||||||
|
m_textAlignment: 65535
|
||||||
|
m_characterSpacing: 0
|
||||||
|
m_wordSpacing: 0
|
||||||
|
m_lineSpacing: 0
|
||||||
|
m_lineSpacingMax: 0
|
||||||
|
m_paragraphSpacing: 0
|
||||||
|
m_charWidthMaxAdj: 0
|
||||||
|
m_enableWordWrapping: 1
|
||||||
|
m_wordWrappingRatios: 0.4
|
||||||
|
m_overflowMode: 0
|
||||||
|
m_linkedTextComponent: {fileID: 0}
|
||||||
|
parentLinkedComponent: {fileID: 0}
|
||||||
|
m_enableKerning: 1
|
||||||
|
m_enableExtraPadding: 0
|
||||||
|
checkPaddingRequired: 0
|
||||||
|
m_isRichText: 1
|
||||||
|
m_parseCtrlCharacters: 1
|
||||||
|
m_isOrthographic: 1
|
||||||
|
m_isCullingEnabled: 0
|
||||||
|
m_horizontalMapping: 0
|
||||||
|
m_verticalMapping: 0
|
||||||
|
m_uvLineOffset: 0
|
||||||
|
m_geometrySortingOrder: 0
|
||||||
|
m_IsTextObjectScaleStatic: 0
|
||||||
|
m_VertexBufferAutoSizeReduction: 0
|
||||||
|
m_useMaxVisibleDescender: 1
|
||||||
|
m_pageToDisplay: 1
|
||||||
|
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_isUsingLegacyAnimationComponent: 0
|
||||||
|
m_isVolumetricText: 0
|
||||||
|
m_hasFontAssetChanged: 0
|
||||||
|
m_baseMaterial: {fileID: 0}
|
||||||
|
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||||
--- !u!1 &3170989633102458883
|
--- !u!1 &3170989633102458883
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -998,6 +1133,7 @@ RectTransform:
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 8800034579894559691}
|
- {fileID: 8800034579894559691}
|
||||||
|
- {fileID: 6441496273096120829}
|
||||||
m_Father: {fileID: 6020242229500997180}
|
m_Father: {fileID: 6020242229500997180}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
@ -1080,6 +1216,7 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 6020242228778469068}
|
- component: {fileID: 6020242228778469068}
|
||||||
- component: {fileID: 6020242228778469067}
|
- component: {fileID: 6020242228778469067}
|
||||||
|
- component: {fileID: -80128037531062320}
|
||||||
m_Layer: 8
|
m_Layer: 8
|
||||||
m_Name: "\u62A5\u8B66"
|
m_Name: "\u62A5\u8B66"
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -1118,6 +1255,20 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
alarmUI: {fileID: 6020242228637615623}
|
alarmUI: {fileID: 6020242228637615623}
|
||||||
alarmQueries: []
|
alarmQueries: []
|
||||||
|
--- !u!114 &-80128037531062320
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6020242228778469069}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 70ce68dbe5ab84647986a9dc95fec2c4, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
targetCamera: {fileID: 0}
|
||||||
|
distanceMultiplier: 0.04
|
||||||
--- !u!1 &6020242228979647709
|
--- !u!1 &6020242228979647709
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -2977,8 +3128,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 13, y: 13.1}
|
m_AnchoredPosition: {x: 31.21, y: 13.1}
|
||||||
m_SizeDelta: {x: 80, y: 30}
|
m_SizeDelta: {x: 43.58, y: 30}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8800034579894559689
|
--- !u!222 &8800034579894559689
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -3008,7 +3159,7 @@ MonoBehaviour:
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_text: 0
|
m_text: 999
|
||||||
m_isRightToLeft: 0
|
m_isRightToLeft: 0
|
||||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||||
|
@ -3035,8 +3186,8 @@ MonoBehaviour:
|
||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 29.08
|
m_fontSize: 24.29
|
||||||
m_fontSizeBase: 29.08
|
m_fontSizeBase: 24.29
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 0
|
m_enableAutoSizing: 0
|
||||||
m_fontSizeMin: 18
|
m_fontSizeMin: 18
|
||||||
|
|
|
@ -694,6 +694,7 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 6206996799886426826}
|
- component: {fileID: 6206996799886426826}
|
||||||
- component: {fileID: 2305191433559606241}
|
- component: {fileID: 2305191433559606241}
|
||||||
|
- component: {fileID: 7186680284490958309}
|
||||||
m_Layer: 8
|
m_Layer: 8
|
||||||
m_Name: "\u6444\u50CF\u5934_web"
|
m_Name: "\u6444\u50CF\u5934_web"
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -731,6 +732,20 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
button: {fileID: 4332229852258479005}
|
button: {fileID: 4332229852258479005}
|
||||||
text: {fileID: 2224874554742167492}
|
text: {fileID: 2224874554742167492}
|
||||||
|
--- !u!114 &7186680284490958309
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6206996799886426827}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 70ce68dbe5ab84647986a9dc95fec2c4, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
targetCamera: {fileID: 0}
|
||||||
|
distanceMultiplier: 0.06
|
||||||
--- !u!1 &6206996800221561051
|
--- !u!1 &6206996800221561051
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -324,6 +324,7 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 6206996799886426826}
|
- component: {fileID: 6206996799886426826}
|
||||||
- component: {fileID: 6206996799886426825}
|
- component: {fileID: 6206996799886426825}
|
||||||
|
- component: {fileID: -677389066425627936}
|
||||||
m_Layer: 8
|
m_Layer: 8
|
||||||
m_Name: "\u6E29\u6E7F\u5EA6"
|
m_Name: "\u6E29\u6E7F\u5EA6"
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -360,6 +361,20 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
sp_ui: {fileID: 6206996800221561049}
|
sp_ui: {fileID: 6206996800221561049}
|
||||||
|
--- !u!114 &-677389066425627936
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6206996799886426827}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 70ce68dbe5ab84647986a9dc95fec2c4, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
targetCamera: {fileID: 0}
|
||||||
|
distanceMultiplier: 0.05
|
||||||
--- !u!1 &6206996800221561051
|
--- !u!1 &6206996800221561051
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 09a8e21b385b3d14ca7b6a7e26c2e63a
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -1 +1 @@
|
||||||
http://xtzxm3.natappfree.cc/
|
http://rc92r3.natappfree.cc/
|
|
@ -1,8 +1,8 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 2e498d1c8094910479dc3e1b768306a4
|
guid: 2e498d1c8094910479dc3e1b768306a4
|
||||||
timeCreated: 1484171803
|
|
||||||
licenseType: Pro
|
|
||||||
NativeFormatImporter:
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 0
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName:
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="AutoMapper" version="12.0.1" />
|
<package id="AutoMapper" version="12.0.1" />
|
||||||
|
<package id="SimpleJson" version="0.38.0" />
|
||||||
</packages>
|
</packages>
|
|
@ -920,6 +920,10 @@ PrefabInstance:
|
||||||
propertyPath: m_text
|
propertyPath: m_text
|
||||||
value: "\u6444\u50CF04"
|
value: "\u6444\u50CF04"
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
|
propertyPath: m_fontAsset
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -927,7 +931,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_fontAsset
|
propertyPath: m_fontAsset
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 11400000, guid: b6aaf136d28747544b874374280f478b, type: 2}
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -935,7 +939,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_fontAsset
|
propertyPath: m_fontAsset
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 11400000, guid: b6aaf136d28747544b874374280f478b, type: 2}
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -1138,6 +1142,10 @@ PrefabInstance:
|
||||||
propertyPath: m_text
|
propertyPath: m_text
|
||||||
value: "\u7EA2\u591604"
|
value: "\u7EA2\u591604"
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
||||||
|
propertyPath: m_fontAsset
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -1145,7 +1153,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
||||||
propertyPath: m_fontAsset
|
propertyPath: m_fontAsset
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 11400000, guid: b6aaf136d28747544b874374280f478b, type: 2}
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -1227,6 +1235,10 @@ PrefabInstance:
|
||||||
propertyPath: m_text
|
propertyPath: m_text
|
||||||
value: "\u7EA2\u591603"
|
value: "\u7EA2\u591603"
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
||||||
|
propertyPath: m_fontAsset
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -1234,7 +1246,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
||||||
propertyPath: m_fontAsset
|
propertyPath: m_fontAsset
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 11400000, guid: b6aaf136d28747544b874374280f478b, type: 2}
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -1316,6 +1328,10 @@ PrefabInstance:
|
||||||
propertyPath: m_text
|
propertyPath: m_text
|
||||||
value: "\u7EA2\u591601"
|
value: "\u7EA2\u591601"
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
||||||
|
propertyPath: m_fontAsset
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -1323,7 +1339,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
||||||
propertyPath: m_fontAsset
|
propertyPath: m_fontAsset
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 11400000, guid: b6aaf136d28747544b874374280f478b, type: 2}
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -1417,6 +1433,10 @@ PrefabInstance:
|
||||||
propertyPath: m_text
|
propertyPath: m_text
|
||||||
value: "\u7EA2\u591602"
|
value: "\u7EA2\u591602"
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
||||||
|
propertyPath: m_fontAsset
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -1424,7 +1444,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
||||||
propertyPath: m_fontAsset
|
propertyPath: m_fontAsset
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 11400000, guid: b6aaf136d28747544b874374280f478b, type: 2}
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -1502,6 +1522,10 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 1781636281}
|
m_TransformParent: {fileID: 1781636281}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
|
propertyPath: m_fontAsset
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -1509,7 +1533,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_fontAsset
|
propertyPath: m_fontAsset
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 11400000, guid: b6aaf136d28747544b874374280f478b, type: 2}
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -1517,7 +1541,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_fontAsset
|
propertyPath: m_fontAsset
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 11400000, guid: b6aaf136d28747544b874374280f478b, type: 2}
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -1588,6 +1612,10 @@ PrefabInstance:
|
||||||
propertyPath: m_text
|
propertyPath: m_text
|
||||||
value: "\u6444\u50CF03"
|
value: "\u6444\u50CF03"
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
|
propertyPath: m_fontAsset
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -1595,7 +1623,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_fontAsset
|
propertyPath: m_fontAsset
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 11400000, guid: b6aaf136d28747544b874374280f478b, type: 2}
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -1603,7 +1631,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_fontAsset
|
propertyPath: m_fontAsset
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 11400000, guid: b6aaf136d28747544b874374280f478b, type: 2}
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -1740,6 +1768,10 @@ PrefabInstance:
|
||||||
propertyPath: m_text
|
propertyPath: m_text
|
||||||
value: "\u6444\u50CF02"
|
value: "\u6444\u50CF02"
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
|
propertyPath: m_fontAsset
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -1747,7 +1779,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_fontAsset
|
propertyPath: m_fontAsset
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 11400000, guid: b6aaf136d28747544b874374280f478b, type: 2}
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
@ -1755,7 +1787,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_fontAsset
|
propertyPath: m_fontAsset
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 11400000, guid: b6aaf136d28747544b874374280f478b, type: 2}
|
objectReference: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||||
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 528e17dcf3c5d36448535bf9aa9c1d5c
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 235a918c7e27fc9478d95d84cea1169f
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -23,9 +23,9 @@ public class GameManager : MonoBehaviour
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public webURL Jk_URL;
|
public webURL Jk_URL;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 登录后返回
|
/// 全局变量
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string token;
|
public GlobalParameter arguments = new GlobalParameter();
|
||||||
|
|
||||||
string ct = null;
|
string ct = null;
|
||||||
|
|
||||||
|
@ -653,7 +653,7 @@ public class GameManager : MonoBehaviour
|
||||||
// })
|
// })
|
||||||
//);
|
//);
|
||||||
yield return StartCoroutine(
|
yield return StartCoroutine(
|
||||||
CombineJSON.GetJson_POST(Jk_URL.sb_cx, token, (jsonResult) =>
|
CombineJSON.GetJson_POST(Jk_URL.sb_cx, arguments.token, (jsonResult) =>
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(jsonResult))
|
if (string.IsNullOrEmpty(jsonResult))
|
||||||
{
|
{
|
||||||
|
@ -662,7 +662,7 @@ public class GameManager : MonoBehaviour
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
root_AllDevice = JsonConvert.DeserializeObject<DeviceQuery.Root>(jsonResult);
|
root_AllDevice = JsonConvert.DeserializeObject<DeviceQuery.Root>(jsonResult);
|
||||||
Debug.Log("设备查询完成" + "URL:" + Jk_URL.sb_cx + "Token:" + token + "返回内容" + jsonResult);
|
Debug.Log("设备查询完成" + "URL:" + Jk_URL.sb_cx + "Token:" + arguments.token + "返回内容" + jsonResult);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
@ -698,7 +698,7 @@ public class GameManager : MonoBehaviour
|
||||||
//);
|
//);
|
||||||
|
|
||||||
yield return StartCoroutine(
|
yield return StartCoroutine(
|
||||||
CombineJSON.GetJson_POST(Jk_URL.dk_cx, token, (jsonResult1) =>
|
CombineJSON.GetJson_POST(Jk_URL.dk_cx, arguments.token, (jsonResult1) =>
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(jsonResult1))
|
if (string.IsNullOrEmpty(jsonResult1))
|
||||||
{
|
{
|
||||||
|
@ -707,7 +707,7 @@ public class GameManager : MonoBehaviour
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
root_AllPort = JsonConvert.DeserializeObject<PortQuery.Root>(jsonResult1);
|
root_AllPort = JsonConvert.DeserializeObject<PortQuery.Root>(jsonResult1);
|
||||||
Debug.Log("端口查询完成" + "URL:" + Jk_URL.dk_cx + "Token:" + token + "返回内容" + jsonResult1);
|
Debug.Log("端口查询完成" + "URL:" + Jk_URL.dk_cx + "Token:" + arguments.token + "返回内容" + jsonResult1);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
@ -738,7 +738,7 @@ public class GameManager : MonoBehaviour
|
||||||
//})
|
//})
|
||||||
//);
|
//);
|
||||||
yield return StartCoroutine(
|
yield return StartCoroutine(
|
||||||
CombineJSON.GetJson_POST(Jk_URL.hj_cx, token, (jsonResult2) =>
|
CombineJSON.GetJson_POST(Jk_URL.hj_cx, arguments.token, (jsonResult2) =>
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(jsonResult2))
|
if (string.IsNullOrEmpty(jsonResult2))
|
||||||
{
|
{
|
||||||
|
@ -747,7 +747,7 @@ public class GameManager : MonoBehaviour
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
root_AllENV = JsonConvert.DeserializeObject<ENVQuery.Root>(jsonResult2);
|
root_AllENV = JsonConvert.DeserializeObject<ENVQuery.Root>(jsonResult2);
|
||||||
Debug.Log("环境查询完成" + "URL:" + Jk_URL.hj_cx + "Token:" + token + "返回内容" + jsonResult2);
|
Debug.Log("环境查询完成" + "URL:" + Jk_URL.hj_cx + "Token:" + arguments.token + "返回内容" + jsonResult2);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
@ -782,7 +782,7 @@ public class GameManager : MonoBehaviour
|
||||||
//})
|
//})
|
||||||
//);
|
//);
|
||||||
yield return StartCoroutine(
|
yield return StartCoroutine(
|
||||||
CombineJSON.GetJson_POST(Jk_URL.gj_cx, token, (jsonResult3) =>
|
CombineJSON.GetJson_POST(Jk_URL.gj_cx, arguments.token, (jsonResult3) =>
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(jsonResult3))
|
if (string.IsNullOrEmpty(jsonResult3))
|
||||||
{
|
{
|
||||||
|
@ -791,7 +791,7 @@ public class GameManager : MonoBehaviour
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
root_AllAlarm = JsonConvert.DeserializeObject<TmsAlarmQuery.Root>(jsonResult3);
|
root_AllAlarm = JsonConvert.DeserializeObject<TmsAlarmQuery.Root>(jsonResult3);
|
||||||
Debug.Log("告警查询完成" + "URL:" + Jk_URL.gj_cx + "Token:" + token + "返回内容" + jsonResult3);
|
Debug.Log("告警查询完成" + "URL:" + Jk_URL.gj_cx + "Token:" + arguments.token + "返回内容" + jsonResult3);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
@ -1329,7 +1329,7 @@ public class GameManager : MonoBehaviour
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 开门
|
/// 开门
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void power_open()
|
public void power_open()
|
||||||
{
|
{
|
||||||
for (int i = 0; i < Cabinets_go.Count; i++)
|
for (int i = 0; i < Cabinets_go.Count; i++)
|
||||||
{
|
{
|
||||||
|
@ -1495,7 +1495,7 @@ public class GameManager : MonoBehaviour
|
||||||
if (www.result == UnityWebRequest.Result.Success)
|
if (www.result == UnityWebRequest.Result.Success)
|
||||||
{
|
{
|
||||||
string fileContent = www.downloadHandler.text;
|
string fileContent = www.downloadHandler.text;
|
||||||
Debug.Log("获取穿透成功:" + fileContent + "Token:" + Inst.token);
|
Debug.Log("获取穿透成功:" + fileContent + "Token:" + Inst.arguments.token);
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(fileContent))
|
if (string.IsNullOrEmpty(fileContent))
|
||||||
{
|
{
|
||||||
|
@ -1539,6 +1539,9 @@ public class GameManager : MonoBehaviour
|
||||||
Load_Port();
|
Load_Port();
|
||||||
Load_TmsAlarm();
|
Load_TmsAlarm();
|
||||||
Load_ENV();
|
Load_ENV();
|
||||||
|
|
||||||
|
Application.ExternalCall("OnSceneLoaded");
|
||||||
|
//三维场景加载时显示地图
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1622,4 +1625,24 @@ public class GameManager : MonoBehaviour
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 全局参数
|
||||||
|
/// </summary>
|
||||||
|
[System.Serializable]
|
||||||
|
public class GlobalParameter
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 登录后返回
|
||||||
|
/// </summary>
|
||||||
|
public string token;
|
||||||
|
/// <summary>
|
||||||
|
/// 温度阈值
|
||||||
|
/// </summary>
|
||||||
|
public string heatThresholdValue;
|
||||||
|
/// <summary>
|
||||||
|
/// 湿度阈值
|
||||||
|
/// </summary>
|
||||||
|
public string humidityThresholdValue;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5c580e73495629348bc24a678455971d
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -0,0 +1,28 @@
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class AutoScaleUI : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] private Camera targetCamera;
|
||||||
|
[SerializeField] private float distanceMultiplier = 0.01f;
|
||||||
|
|
||||||
|
private Canvas canvas;
|
||||||
|
private Vector3 initialScale;
|
||||||
|
//public static Transform Camera;
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
targetCamera = UnityEngine.Camera.main;
|
||||||
|
//Camera = UnityEngine.Camera.main.transform;
|
||||||
|
canvas = GetComponent<Canvas>();
|
||||||
|
initialScale = transform.localScale;
|
||||||
|
}
|
||||||
|
|
||||||
|
void LateUpdate()
|
||||||
|
{
|
||||||
|
//transform.eulerAngles = Camera.eulerAngles;
|
||||||
|
|
||||||
|
Vector3 cameraToCanvasPlane = transform.position - targetCamera.transform.position;
|
||||||
|
float distance = Vector3.Dot(cameraToCanvasPlane, targetCamera.transform.forward);
|
||||||
|
transform.localScale = initialScale * distance * distanceMultiplier;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 70ce68dbe5ab84647986a9dc95fec2c4
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -5,6 +5,7 @@ using System.Collections.Generic;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Networking;
|
using UnityEngine.Networking;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
using SimpleJSON;
|
||||||
using static GameManager;
|
using static GameManager;
|
||||||
|
|
||||||
public class WebInteraction : MonoBehaviour
|
public class WebInteraction : MonoBehaviour
|
||||||
|
@ -33,9 +34,6 @@ public class WebInteraction : MonoBehaviour
|
||||||
|
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
Application.ExternalCall("OnSceneLoaded");
|
|
||||||
//三维场景加载时显示地图
|
|
||||||
|
|
||||||
//bt.onClick.AddListener(() =>
|
//bt.onClick.AddListener(() =>
|
||||||
//{
|
//{
|
||||||
// gameManager.token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTI2NDMyODksInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.uMoC7I4SytLEgYTKHxyvOv7Lygeb9zDCmhLDYv1cJrA";
|
// gameManager.token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTI2NDMyODksInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.uMoC7I4SytLEgYTKHxyvOv7Lygeb9zDCmhLDYv1cJrA";
|
||||||
|
@ -52,9 +50,20 @@ public class WebInteraction : MonoBehaviour
|
||||||
/// Ç°¶Ëµ÷Óô˷½·¨´«µÝToken
|
/// Ç°¶Ëµ÷Óô˷½·¨´«µÝToken
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="token"></param>
|
/// <param name="token"></param>
|
||||||
public void unity_token_value(string token)
|
public void unity_token_value(string jsonData)
|
||||||
{
|
{
|
||||||
gameManager.token = token;
|
try
|
||||||
|
{
|
||||||
|
JSONNode dataNode = JSON.Parse(jsonData);
|
||||||
|
gameManager.arguments.token = dataNode["data"]["token"].Value;
|
||||||
|
gameManager.arguments.heatThresholdValue = dataNode["data"]["heatThresholdValue"].Value;
|
||||||
|
gameManager.arguments.humidityThresholdValue = dataNode["data"]["humidityThresholdValue"].Value;
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
Debug.Log("½âÎöToken´íÎó");
|
||||||
|
}
|
||||||
|
|
||||||
StartCoroutine(GameManager.Inst.LoadAddress((ct) =>
|
StartCoroutine(GameManager.Inst.LoadAddress((ct) =>
|
||||||
{
|
{
|
||||||
if (ct != null)
|
if (ct != null)
|
||||||
|
@ -83,7 +92,7 @@ public class WebInteraction : MonoBehaviour
|
||||||
string fileContent = www.downloadHandler.text;
|
string fileContent = www.downloadHandler.text;
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(fileContent)) yield break;
|
if (string.IsNullOrEmpty(fileContent)) yield break;
|
||||||
gameManager.token = fileContent;
|
gameManager.arguments.token = fileContent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,6 +28,7 @@ public class AlarmUI : MonoBehaviour, IPointerClickHandler
|
||||||
{
|
{
|
||||||
go = Instantiate(expand_image.gameObject);
|
go = Instantiate(expand_image.gameObject);
|
||||||
go.transform.SetParent(canvas.transform);
|
go.transform.SetParent(canvas.transform);
|
||||||
|
go.transform.rotation = Quaternion.identity;
|
||||||
close_bt = canvas.transform.GetChild(0).Find("¹Ø±Õ").GetComponent<Button>();
|
close_bt = canvas.transform.GetChild(0).Find("¹Ø±Õ").GetComponent<Button>();
|
||||||
close_bt.onClick.RemoveAllListeners();
|
close_bt.onClick.RemoveAllListeners();
|
||||||
close_bt.onClick.AddListener(() =>
|
close_bt.onClick.AddListener(() =>
|
||||||
|
@ -67,6 +68,7 @@ public class AlarmUI : MonoBehaviour, IPointerClickHandler
|
||||||
go.GetComponent<RectTransform>().localPosition = new Vector3(overlayPos.x, overlayPos.y, 0);
|
go.GetComponent<RectTransform>().localPosition = new Vector3(overlayPos.x, overlayPos.y, 0);
|
||||||
|
|
||||||
go.GetComponent<RectTransform>().localScale = Vector3.one;
|
go.GetComponent<RectTransform>().localScale = Vector3.one;
|
||||||
|
go.transform.rotation = Quaternion.identity;
|
||||||
go.SetActive(true);
|
go.SetActive(true);
|
||||||
|
|
||||||
for (int i = 0; i < go.transform.Find("Scroll View/Viewport/Content").childCount; i++)
|
for (int i = 0; i < go.transform.Find("Scroll View/Viewport/Content").childCount; i++)
|
||||||
|
|
|
@ -7,6 +7,7 @@ using Unity.VisualScripting.Antlr3.Runtime;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Events;
|
using UnityEngine.Events;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
using static GameManager;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 设备-新增
|
/// 设备-新增
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -99,7 +100,19 @@ public class AddDevice : MonoBehaviour
|
||||||
|
|
||||||
if (URlreturn.message == "操作成功")
|
if (URlreturn.message == "操作成功")
|
||||||
{
|
{
|
||||||
|
yield return StartCoroutine(GameManager.Inst.LoadAddress((ct) =>
|
||||||
|
{
|
||||||
|
if (ct != null)
|
||||||
|
{
|
||||||
|
GameManager.Inst.Jk_URL = new webURL(ct);
|
||||||
|
StartCoroutine(GameManager.Inst.Initialize());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Debug.Log("获取穿透错误!");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -173,7 +186,7 @@ public class AddDevice : MonoBehaviour
|
||||||
|
|
||||||
yield return
|
yield return
|
||||||
StartCoroutine(
|
StartCoroutine(
|
||||||
CombineJSON.UpdateJson_POST(GameManager.Inst.Jk_URL.sb_xz, GameManager.Inst.token, newData, (jsonResult) =>
|
CombineJSON.UpdateJson_POST(GameManager.Inst.Jk_URL.sb_xz, GameManager.Inst.arguments.token, newData, (jsonResult) =>
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
|
@ -93,12 +93,8 @@ public class AddPort : MonoBehaviour
|
||||||
yield return StartCoroutine(saveJson());
|
yield return StartCoroutine(saveJson());
|
||||||
|
|
||||||
if (URlreturn.message == "操作成功")
|
if (URlreturn.message == "操作成功")
|
||||||
{
|
{
|
||||||
Array.ForEach(GameManager.Inst.pop_ups.ToArray(), (itme) =>
|
yield return StartCoroutine(GameManager.Inst.LoadAddress((ct) =>
|
||||||
{
|
|
||||||
itme.gameObject.SetActive(false);
|
|
||||||
});
|
|
||||||
StartCoroutine(GameManager.Inst.LoadAddress((ct) =>
|
|
||||||
{
|
{
|
||||||
if (ct != null)
|
if (ct != null)
|
||||||
{
|
{
|
||||||
|
@ -110,6 +106,11 @@ public class AddPort : MonoBehaviour
|
||||||
Debug.Log("获取穿透错误!");
|
Debug.Log("获取穿透错误!");
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
Array.ForEach(GameManager.Inst.pop_ups.ToArray(), (itme) =>
|
||||||
|
{
|
||||||
|
itme.gameObject.SetActive(false);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -175,7 +176,7 @@ public class AddPort : MonoBehaviour
|
||||||
//URlreturn = JsonConvert.DeserializeObject<Root>(jsonResult);
|
//URlreturn = JsonConvert.DeserializeObject<Root>(jsonResult);
|
||||||
|
|
||||||
yield return StartCoroutine(
|
yield return StartCoroutine(
|
||||||
CombineJSON.UpdateJson_POST(GameManager.Inst.Jk_URL.dk_xz, GameManager.Inst.token, newData, (jsonResult) =>
|
CombineJSON.UpdateJson_POST(GameManager.Inst.Jk_URL.dk_xz, GameManager.Inst.arguments.token, newData, (jsonResult) =>
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
|
@ -24,7 +24,7 @@ public class DeleteDevice : MonoBehaviour
|
||||||
//URlreturn = JsonConvert.DeserializeObject<Root>(jsonResult);
|
//URlreturn = JsonConvert.DeserializeObject<Root>(jsonResult);
|
||||||
|
|
||||||
yield return StartCoroutine(
|
yield return StartCoroutine(
|
||||||
CombineJSON.UpdateJson_POST(GameManager.Inst.Jk_URL.sb_sc, GameManager.Inst.token, newData, (jsonResult) =>
|
CombineJSON.UpdateJson_POST(GameManager.Inst.Jk_URL.sb_sc, GameManager.Inst.arguments.token, newData, (jsonResult) =>
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
|
@ -97,11 +97,7 @@ public class RedactDevice : MonoBehaviour
|
||||||
yield return StartCoroutine(saveJson());
|
yield return StartCoroutine(saveJson());
|
||||||
if (URlreturn.message == "操作成功")
|
if (URlreturn.message == "操作成功")
|
||||||
{
|
{
|
||||||
Array.ForEach(GameManager.Inst. pop_ups.ToArray(), (itme) =>
|
yield return StartCoroutine(GameManager.Inst.LoadAddress((ct) =>
|
||||||
{
|
|
||||||
itme.gameObject.SetActive(false);
|
|
||||||
});
|
|
||||||
StartCoroutine(GameManager.Inst. LoadAddress((ct) =>
|
|
||||||
{
|
{
|
||||||
if (ct != null)
|
if (ct != null)
|
||||||
{
|
{
|
||||||
|
@ -113,6 +109,11 @@ public class RedactDevice : MonoBehaviour
|
||||||
Debug.Log("获取穿透错误!");
|
Debug.Log("获取穿透错误!");
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
Array.ForEach(GameManager.Inst.pop_ups.ToArray(), (itme) =>
|
||||||
|
{
|
||||||
|
itme.gameObject.SetActive(false);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -145,7 +146,7 @@ public class RedactDevice : MonoBehaviour
|
||||||
|
|
||||||
using (UnityWebRequest request = UnityWebRequest.Post(GameManager.Inst.Jk_URL.sb_bj, json))
|
using (UnityWebRequest request = UnityWebRequest.Post(GameManager.Inst.Jk_URL.sb_bj, json))
|
||||||
{
|
{
|
||||||
request.SetRequestHeader("X-Token", GameManager.Inst.token);
|
request.SetRequestHeader("X-Token", GameManager.Inst.arguments.token);
|
||||||
request.SetRequestHeader("Content-Type", "application/json");
|
request.SetRequestHeader("Content-Type", "application/json");
|
||||||
|
|
||||||
yield return request.SendWebRequest();
|
yield return request.SendWebRequest();
|
||||||
|
|
|
@ -175,18 +175,23 @@ public class RedactPort : MonoBehaviour
|
||||||
yield return StartCoroutine(saveJson());
|
yield return StartCoroutine(saveJson());
|
||||||
if (URlreturn.message == "操作成功")
|
if (URlreturn.message == "操作成功")
|
||||||
{
|
{
|
||||||
StartCoroutine(GameManager.Inst.LoadAddress((ct) =>
|
yield return StartCoroutine(GameManager.Inst.LoadAddress((ct) =>
|
||||||
|
{
|
||||||
|
if (ct != null)
|
||||||
|
{
|
||||||
|
GameManager.Inst.Jk_URL = new webURL(ct);
|
||||||
|
StartCoroutine(GameManager.Inst.Initialize());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Debug.Log("获取穿透错误!");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
|
||||||
|
Array.ForEach(GameManager.Inst.pop_ups.ToArray(), (itme) =>
|
||||||
{
|
{
|
||||||
if (ct != null)
|
itme.gameObject.SetActive(false);
|
||||||
{
|
});
|
||||||
GameManager.Inst.Jk_URL = new webURL(ct);
|
|
||||||
StartCoroutine(GameManager.Inst.Initialize());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Debug.Log("获取穿透错误!");
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -275,7 +280,7 @@ public class RedactPort : MonoBehaviour
|
||||||
|
|
||||||
using (UnityWebRequest request = new UnityWebRequest(GameManager.Inst.Jk_URL.dk_bj, "POST"))
|
using (UnityWebRequest request = new UnityWebRequest(GameManager.Inst.Jk_URL.dk_bj, "POST"))
|
||||||
{
|
{
|
||||||
request.SetRequestHeader("X-Token", GameManager.Inst.token);
|
request.SetRequestHeader("X-Token", GameManager.Inst.arguments.token);
|
||||||
request.SetRequestHeader("Content-Type", "application/json");
|
request.SetRequestHeader("Content-Type", "application/json");
|
||||||
|
|
||||||
byte[] jsonBytes = Encoding.UTF8.GetBytes(json);
|
byte[] jsonBytes = Encoding.UTF8.GetBytes(json);
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
BIN
GQ_TongXin/Packages/Newtonsoft.Json.5.0.4/lib/netcore45/Newtonsoft.Json.dll
vendored
Normal file
BIN
GQ_TongXin/Packages/Newtonsoft.Json.5.0.4/lib/netcore45/Newtonsoft.Json.dll
vendored
Normal file
Binary file not shown.
7738
GQ_TongXin/Packages/Newtonsoft.Json.5.0.4/lib/netcore45/Newtonsoft.Json.xml
vendored
Normal file
7738
GQ_TongXin/Packages/Newtonsoft.Json.5.0.4/lib/netcore45/Newtonsoft.Json.xml
vendored
Normal file
File diff suppressed because it is too large
Load Diff
BIN
GQ_TongXin/Packages/Newtonsoft.Json.5.0.4/lib/portable-net40+sl4+wp7+win8/Newtonsoft.Json.dll
vendored
Normal file
BIN
GQ_TongXin/Packages/Newtonsoft.Json.5.0.4/lib/portable-net40+sl4+wp7+win8/Newtonsoft.Json.dll
vendored
Normal file
Binary file not shown.
7374
GQ_TongXin/Packages/Newtonsoft.Json.5.0.4/lib/portable-net40+sl4+wp7+win8/Newtonsoft.Json.xml
vendored
Normal file
7374
GQ_TongXin/Packages/Newtonsoft.Json.5.0.4/lib/portable-net40+sl4+wp7+win8/Newtonsoft.Json.xml
vendored
Normal file
File diff suppressed because it is too large
Load Diff
BIN
GQ_TongXin/Packages/Newtonsoft.Json.5.0.4/lib/portable-net45+wp80+win8/Newtonsoft.Json.dll
vendored
Normal file
BIN
GQ_TongXin/Packages/Newtonsoft.Json.5.0.4/lib/portable-net45+wp80+win8/Newtonsoft.Json.dll
vendored
Normal file
Binary file not shown.
7738
GQ_TongXin/Packages/Newtonsoft.Json.5.0.4/lib/portable-net45+wp80+win8/Newtonsoft.Json.xml
vendored
Normal file
7738
GQ_TongXin/Packages/Newtonsoft.Json.5.0.4/lib/portable-net45+wp80+win8/Newtonsoft.Json.xml
vendored
Normal file
File diff suppressed because it is too large
Load Diff
|
@ -10,6 +10,22 @@
|
||||||
<assemblyIdentity name="netstandard" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
<assemblyIdentity name="netstandard" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
|
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
|
<dependentAssembly>
|
||||||
|
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||||
|
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
|
||||||
|
</dependentAssembly>
|
||||||
|
<dependentAssembly>
|
||||||
|
<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||||
|
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
|
||||||
|
</dependentAssembly>
|
||||||
|
<dependentAssembly>
|
||||||
|
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||||
|
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
|
||||||
|
</dependentAssembly>
|
||||||
|
<dependentAssembly>
|
||||||
|
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
|
||||||
|
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
|
||||||
|
</dependentAssembly>
|
||||||
</assemblyBinding>
|
</assemblyBinding>
|
||||||
</runtime>
|
</runtime>
|
||||||
</configuration>
|
</configuration>
|
|
@ -1,4 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="AutoMapper" version="10.0.0" targetFramework="net471" />
|
<package id="AutoMapper" version="10.0.0" targetFramework="net471" />
|
||||||
|
<package id="Newtonsoft.Json" version="5.0.4" targetFramework="net471" />
|
||||||
</packages>
|
</packages>
|
Loading…
Reference in New Issue