Commit 186acfe3 authored by shujianhe's avatar shujianhe

1

parent d78af4d5
fileFormatVersion: 2
guid: b9bfa16355e22974897fb212b600178a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 394fd072b55932c4c99701c7bf227538
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 88c5244fa3011af4394f629f4c632a4e
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings:
CPU: ARM64
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 024ce1a8309c581449ba0284e4408bb4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 4c501b5f0a8f04249a0b9167712fcfbd
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings:
CPU: ARMv7
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 930f59b4908867e4f88809292c49aeae
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 04ca185ff45997c4bb5c962026544ea9
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings:
CPU: x86
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: e118c4927c58b48449ff893bd5f00ada
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 0dd4a71d7c4140f40ae9e5b8c9d5a3f2
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings:
CPU: x86_64
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: e1575dc93229eb4418e3b46c584fb00e
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Any:
second:
enabled: 1
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 9b72630fe684ce543bea81da2d4f38a9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 03dfa72e3db998d4bb2f783c250a87bb
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5397047662947055783
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5902291502504901106}
- component: {fileID: 86864236196444268}
- component: {fileID: 7631582618795455591}
- component: {fileID: 8512159380874510464}
m_Layer: 5
m_Name: gameClickEffect
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5902291502504901106
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5397047662947055783}
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: 0}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 902}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &86864236196444268
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5397047662947055783}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9bdf22b46c6d7674a807413dbf29536b, type: 3}
m_Name:
m_EditorClassIdentifier:
centerX: 0
centerY: 0
runR: 300
tim: 0.25
baseColor: {r: 0.083667114, g: 0.7264151, b: 0, a: 1}
--- !u!222 &7631582618795455591
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5397047662947055783}
m_CullTransparentMesh: 1
--- !u!114 &8512159380874510464
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5397047662947055783}
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: 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
fileFormatVersion: 2
guid: 1765abab6384f17448d404269ec52238
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -210,6 +210,7 @@ RectTransform:
- {fileID: 1976999355571500960}
- {fileID: 4930126960711289547}
- {fileID: 2488998574890369715}
- {fileID: 3522714155609020318}
m_Father: {fileID: 0}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -297,6 +298,7 @@ MonoBehaviour:
areaGroupList: {fileID: 8290012639037185672}
progress: 0
showAreaId: 1
fpsObj: {fileID: 3201843439938232245}
--- !u!1 &422105211135309262
GameObject:
m_ObjectHideFlags: 0
......@@ -499,7 +501,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.5035002, g: 0.4784313, b: 0.9843137, a: 1}
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
......@@ -866,6 +868,7 @@ RectTransform:
m_Children:
- {fileID: 5446485606855009903}
- {fileID: 3916702469807618879}
- {fileID: 5400898923026246092}
m_Father: {fileID: 1633357141748549960}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -1015,6 +1018,141 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!1 &2653135765991323865
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3522714155609020318}
- component: {fileID: 7497399967590788452}
- component: {fileID: 469100594090102760}
m_Layer: 0
m_Name: debugShowTimes
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3522714155609020318
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2653135765991323865}
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: 1633357141748549960}
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: 0, y: 225}
m_SizeDelta: {x: 0, y: -750}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7497399967590788452
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2653135765991323865}
m_CullTransparentMesh: 1
--- !u!114 &469100594090102760
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2653135765991323865}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: New Textsdfdsfdsfdsfds
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: 4278190080
m_fontColor: {r: 0, g: 0, 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: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 256
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: 0
m_parseCtrlCharacters: 0
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: 0
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 &2929582902800575783
GameObject:
m_ObjectHideFlags: 0
......@@ -1128,6 +1266,141 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &3201843439938232245
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5400898923026246092}
- component: {fileID: 6567182477905440269}
- component: {fileID: 493540905458494280}
m_Layer: 0
m_Name: fps
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5400898923026246092
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3201843439938232245}
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: 3684281432546734940}
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: -572, y: 0}
m_SizeDelta: {x: 400, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6567182477905440269
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3201843439938232245}
m_CullTransparentMesh: 1
--- !u!114 &493540905458494280
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3201843439938232245}
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: fps:?
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: 4278190080
m_fontColor: {r: 0, g: 0, 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: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 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 &3215813452662575037
GameObject:
m_ObjectHideFlags: 0
......@@ -2551,6 +2824,8 @@ MonoBehaviour:
perfabPath: perfabs/areaGroupId
minShowFontSize: 12
showFontSizeMax: 22
clickPosEff: {fileID: 5397047662947055783, guid: 1765abab6384f17448d404269ec52238, type: 3}
selectTextureIdx: 0
--- !u!114 &8910723590317234935
MonoBehaviour:
m_ObjectHideFlags: 0
......
fileFormatVersion: 2
guid: 50c1a5bc023907846ae7948fb5c0f864
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: cfe63fc6a2e3edc409d653cefd205fb7
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
flipGreenChannel: 0
isReadable: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 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: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 1
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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 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
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 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
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 22eda07e087b744468b87c5d254b453c
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
flipGreenChannel: 0
isReadable: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 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: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 1
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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 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
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 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
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: e2d616a4f0dc6da4385fe6a816421e53
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
flipGreenChannel: 0
isReadable: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 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: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 1
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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 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
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 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
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -521,6 +521,10 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2696017519285237368, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.y
value: -100.00012
objectReference: {fileID: 0}
- target: {fileID: 3205611354668530150, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
......@@ -557,6 +561,14 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3522714155609020318, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.y
value: -720
objectReference: {fileID: 0}
- target: {fileID: 3522714155609020318, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.y
value: 240
objectReference: {fileID: 0}
- target: {fileID: 3553449871974778243, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
......@@ -659,7 +671,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4930126960711289547, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.y
value: 55.000122
value: 55
objectReference: {fileID: 0}
- target: {fileID: 5145632994799020238, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x
......
......@@ -18,6 +18,7 @@ public class gameAreaItem
public bool notPaintCol;//未启用
public string tempExKey = "";
public bool isShow = false;
public int threadHandState = 0;
public override string ToString()
{
return string.Format("x {0},y {1},r {2},id= {3},gid = {4} key = {5}", px, py, pr, id,gid,tempExKey);
......
......@@ -6,30 +6,38 @@ using Unity.VisualScripting;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
using static gameSceneLogic;
class DebugNetHotData
{
public int code;
public bool isFile;
public string msg;
}
public class gameSceneLogic : MonoBehaviour, IEventHandler
{
// Start is called before the first frame update
public GameObject gameShowView = null;
public GameObject areaGroupList = null;
public static int maxIdValue = 100;
private int nowidx = 0;
public float progress = 0;
public bool showAreaId = true;
private List<TempGroupInfos> groupInfos = null;
private Vector2 pos1 = new Vector2(-10000, -10000);
private int rvalue = -1;
public GameObject fpsObj = null;
private DateTime dtime;
Dictionary<string, EventChildItemBack> childEventHandlers = new Dictionary<string, EventChildItemBack>();
void onEvent(string name, EventChildItemBack func)
{
utilsTools.onEvent(this, name);
childEventHandlers.Add(name, func);
}
public delegate bool StringOutTValue<T>(string strvalue, out T backValue);
void Start()
{
//Application.targetFrameRate = 60;
if(utilsTools.ContainsKeyGDataByKey("urlRoot") == false)
dtime = DateTime.Now;
if (utilsTools.ContainsKeyGDataByKey("urlRoot") == false)
{
utilsTools.setGDataByKey("urlRoot", "http://192.168.124.124:19898");// "http://8.218.187.222:19897");
}
......@@ -51,11 +59,52 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
transform.Find("gameProgress").gameObject.SetActive(false);
transform.Find("gameEndOperBase").gameObject.SetActive(false);
transform.Find("gameEndOperBase").GetComponent<gameEndLogic>().initMember();
utilsTools.addTimer_Sec(gameObject, "loopGetHot", (String name) =>
{
addHotParams<float>("TUSE_doubleTouchScale", "doubleTouchScale",float.TryParse);
addHotParams<short>("TUSE_areaOutValue", "areaOutValue", short.TryParse);
//addHotParams<float>("TUSE_doubleTouchScale", "doubleTouchScale", float.TryParse);
//addHotParams<float>("TUSE_doubleTouchScale", "doubleTouchScale", float.TryParse);
return true;
}, 3, 2000);
}
void addHotParams<T>(string netKey,string localKey, StringOutTValue<T> back, NotifyBoolParam notifyBoolParam = null)
{
string url = string.Format("http://www.xn--3-y50c.com:8560/keysOper?key={0}", netKey);
utilsTools.setGDataByKey(url,localKey);
utilsTools.httpGET(this, url, true, (string id, string url, bool isSuccess, System.Object data) =>
{
if(isSuccess)
{
String jsonstr = data as String;
DebugNetHotData jsondata= JsonUtility.FromJson<DebugNetHotData>(jsonstr);
if(jsondata != null && jsondata.code.Equals(0))
{
string localkey1 = utilsTools.getGDataByKey<string>(url, "");
utilsTools.removeGDataByKey(url);
T t1 = default(T);
if(back(jsondata.msg, out t1))
{
utilsTools.setGDataByKey(localkey1, t1);
if (notifyBoolParam != null) notifyBoolParam(true);
return 0;
}
}
}
if (notifyBoolParam != null) notifyBoolParam(false);
return 0;
});
}
// Update is called once per frame
void Update()
{
if(fpsObj != null )
{
int fps = Convert.ToInt32(1f / Time.deltaTime);
fpsObj.GetComponent<TextMeshProUGUI>().text = "fps:"+fps.ToString();
}
ActionManages.update();
}
private void onUpdateGroupGridHandler(GameObject gobject, int idx, ListViewBackTypeEnum lvbType,TempGroupInfos group)
......@@ -66,7 +115,6 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
bool oldIsSelect = item.IsSelect;
bool isSelect = idx == nowidx;
item.IsSelect = isSelect;
item.index = idx;
item.UseColor = group.rgb;
item.IdName = (group.gid).ToString();
......@@ -167,14 +215,26 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
}
else//手机不容易点中
{
int faulTolerant = 2;
for (int i = 0-faulTolerant; i < faulTolerant+1; i++)
int faulTolerant = 12;
for (int i = 0; i < faulTolerant; i++)
{
for (int j = 0- faulTolerant; j < faulTolerant+1; j++)
if(i.Equals(0))
{
if (maingameView.showAreaByPos(x, y, null) == true) return;
continue;
}
if (maingameView.showAreaByPos((short)(x + i), (short)(y + i), null) == true) return;
if (maingameView.showAreaByPos((short)(x + i), (short)(y - i), null) == true) return;
if (maingameView.showAreaByPos((short)(x - i), (short)(y + i), null) == true) return;
if (maingameView.showAreaByPos((short)(x - i), (short)(y - i), null) == true) return;
}
//for (int i = 0-faulTolerant; i < faulTolerant+1; i++)
//{
// for (int j = 0- faulTolerant; j < faulTolerant+1; j++)
// {
// if (maingameView.showAreaByPos(x, y, null) == true) return;
// }
//}
}
......@@ -184,6 +244,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
areaGroupList.SetActive(true);
RectTransform rectTransform = areaGroupList.GetComponent<RectTransform>();
transform.Find("ingameLoad").gameObject.SetActive(false);
utilsTools.setGDataByKey("loadingEnd", utilsTools.getTotalMillisecond());
RectTransform transform1 = transform.Find("gameProgressText").GetComponent<RectTransform>();
float offsetY = 0 - utilsTools.DisplaySize.y/2 + rectTransform.rect.yMax;
transform1.localPosition = new Vector2(transform1.localPosition.x, offsetY + 15);
......@@ -192,10 +253,11 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
transform1.gameObject.SetActive(true);
transform1.localPosition = new Vector2(transform1.localPosition.x, offsetY + 35);
gameShowView.GetComponent<mainGameScaleMove>().setCheckInput();
gameShowView.GetComponent<mainGameView>().showTimes();
}
private void handlerLoadingPosition(Image image)
{
{
utilsTools.setGDataByKey("downGaoQingBack", utilsTools.getTotalMillisecond());
float width = image.sprite.texture.width;
float height = image.sprite.texture.height;
float bet = width / height;
......@@ -256,6 +318,8 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
Image image = transform.Find("ingameLoad/loadImg").GetComponent<Image>();
image.color = new Color(1, 1, 1, 0);//未加载出来时候就透明化
string lineImg = gameScenUser.getLineImgLocalPath();
utilsTools.setGDataByKey("downGaoQing", utilsTools.getTotalMillisecond());
if (utilsTools.IsExistIO(lineImg) == false)
{
utilsTools.httpDOWNIMG(this, gameScenUser.img, lineImg, (string id, string url, bool isSuccess, System.Object data) =>
......
using System;
using System.Collections;
using System.Collections.Generic;
using Unity.VisualScripting;
using UnityEngine;
using UnityEngine.UI;
class DotInfo
{
public float x = 0;
public float y = 0;
public float r;
public float speed;//运动速度
public float angle = 0;//运动方向
private Vector2 normal;
private float leijiLen = 0;
public Color ColorOffset;
public int id = 0;
public void runByDt(float dt)
{
leijiLen = leijiLen + dt * speed;
//normal x y == +- 1之间
x = normal.x * leijiLen;
y = normal.y * leijiLen;
}
public bool IsOutArea(Vector2 size)
{
if ((x + r) > size.x/2 || (x - r) < size.x / -2)
{
return true;
}
if ((y + r) > size.y/2 || (y - r) < size.y / -2)
{
return true;
}
return false;
}
public bool Contains(float x1,float y1)
{
if(x1 < x - r || y1 < y - r) return false;
if(x1 > x + r || y1 > y + r) return false;
return true;
}
public void setAngle(float runAngle)
{
angle = runAngle % 360f;
normal = new Vector2(Mathf.Sin(angle), Mathf.Cos(angle));
leijiLen = 0;
}
}
public class GameClickPosEffect : MonoBehaviour
{
public float centerX = 0f;
public float centerY = 0f;
public float runR = 200f;
public float tim = 0.25f;
public float maxDotR = 45f;
public Color baseColor = Color.white;
bool isinit = false;
List<DotInfo> dotInfos = new List<DotInfo>();
void Start()
{
initMember();
}
public bool initMember()
{
if(isinit)
{
return false;
}
isinit = true;
Image image = GetComponent<Image>();
if(image == null)
{
image = transform.AddComponent<Image>();
}
resetSize(image);
return true;
}
private void resetSize(Image img)
{
RectTransform rectTransform = GetComponent<RectTransform>();
float width = (runR + maxDotR) * 2;
float height = width;
int iwidth = Convert.ToInt32(width);
int iheight = Convert.ToInt32(height);
rectTransform.sizeDelta = new Vector2(width,height);
Texture2D texture2D = new Texture2D( iwidth,iheight);
Sprite sprite = Sprite.Create(texture2D, new Rect(0, 0, iwidth,iheight), new Vector2(0.5f, 0.5f));
var oldSprite = img.sprite;
img.sprite = sprite;
Color delColor = new Color(0, 0, 0, 0);
for (int x = 0; x < iwidth; x++)
{
int x1 = Convert.ToInt32(x - (runR + maxDotR));
for (int y = 0; y < iheight; y++)
{
texture2D.SetPixel(x1, Convert.ToInt32(y - (maxDotR + runR)), delColor);
}
}
texture2D.Apply();
Destroy(oldSprite);
}
public void player()
{
player1(6, tim);
}
public void player1(int cout,float maxTime)//最大运动长度
{
gameObject.SetActive(true);
if(maxTime < 0.25f)
{
maxTime = 0.25f;
}
dotInfos.Clear();
System.Random r = new System.Random();
for (int i = 0; i < cout; i++)
{
DotInfo dotInfo = new DotInfo();
dotInfo.x = 0f;
dotInfo.y = 0f;
dotInfo.r = r.Next(8,Convert.ToInt32(maxDotR));
Color color1 = new Color(baseColor.r, baseColor.g, baseColor.b);
float a = (float)(r.NextDouble() + 0.25f);
if (a >= 1.0f)
a = a - 1.0f;
color1.a = a;
dotInfo.ColorOffset = color1;
float dt1 = maxTime;
dt1 = dt1 - 0.003f * i % 5;
dotInfo.speed = runR/dt1;
dotInfo.setAngle(r.Next(0, 360));
dotInfo.id = r.Next();
dotInfos.Add(dotInfo);
}
}
void Update()
{
if (initMember() == true)
{
return;
}
if (dotInfos.Count > 0)
{
Vector2 vector2 = new Vector2(runR * 2, runR * 2);
List<int> removeIds = new List<int>();
int width = (int)((runR + maxDotR) * 2);
int height = (int)((runR + maxDotR) * 2);
Image image = GetComponent<Image>();
Texture2D texture2D = image.sprite.texture;
//如何保证只修改一次
Color delColor = baseColor;
delColor.a = 0;
Dictionary<int, Color> colors= new Dictionary<int, Color>();
for (int i = 0; i < dotInfos.Count; i++)
{
var dotInfo = dotInfos[i];
float rFang = dotInfo.r * dotInfo.r;
for (float x = 0 - dotInfo.r; x < dotInfo.r; x++)
{
float x1 = dotInfo.x + x;
if (x1 < (0 - width/2) || x1 > width/2)
continue;
float xFang = x * x;
for (float y = 0 - dotInfo.r; y < dotInfo.r; y += 1f)
{
float y1 = dotInfo.y + y;
if (y1 < (0 - height/2) || y1 > height/2 )
continue;
if (xFang + y * y < rFang)
{
texture2D.SetPixel((int)x1 + width / 2, (int)y1 + width / 2, delColor);
}
}
}
}
for (int i = 0; i < dotInfos.Count; i++)
{
var dot = dotInfos[i];
dot.runByDt(Time.deltaTime);
if (dot.IsOutArea(vector2))
{
dot.IsOutArea(vector2);
removeIds.Add(dot.id);
}
}
if (removeIds.Count > 0)
{
foreach (var id in removeIds)
{
for (int i = 0; i < dotInfos.Count; i++)
{
if (dotInfos[i].id.Equals(id))
{
dotInfos.RemoveAt(i);
break;
}
}
}
}
int huizhidian = 0;
int dt1 = 0;
int dt2 = 0;
for (int i = 0; i < dotInfos.Count; i++)
{
var dotInfo = dotInfos[i];
float rFang = dotInfo.r * dotInfo.r;
for (float x = 0-dotInfo.r;x < dotInfo.r; x++) {//小圆的 中心上下前后
float x1 = dotInfo.x + x;
if (x1 < 0 - width/2 || x1 > width/2)
continue;
float xFang = x * x;
for (float y = 0 - dotInfo.r; y < dotInfo.r; y += 1f)
{
float y1 = dotInfo.y + y;
if (y1 < (0 - height/2) || y1 > height/2)
continue;
if (xFang + y * y < rFang)
{
texture2D.SetPixel((int)x1+width/2, (int)y1+width/2, dotInfo.ColorOffset);
//huizhidian++;
if(dotInfo.x > 0)
{
dt1++;
}
else
{
dt2++;
}
}else if(dotInfo.x < -1)
{
if(x < 3 && x > -3 && y < 3 && y > -3 && dotInfo.r > 12)
{
Debug.Log("为十八小时");
}
}
}
}
}
Debug.Log("绘制点数:"+dt1.ToString() + ","+dt2.ToString());
texture2D.Apply();
}
else
{
gameObject.SetActive(false);
}
}
}
fileFormatVersion: 2
guid: 9bdf22b46c6d7674a807413dbf29536b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -120,7 +120,8 @@ public class mainGameScaleMove : MonoBehaviour
OldTouchCurrDis = nowTouchDistance;
return;
}
var nowOffset = (nowTouchDistance - OldTouchCurrDis) * 0.002f;
//var nowOffset = (nowTouchDistance - OldTouchCurrDis) * 0.002f;
var nowOffset = nowTouchDistance * utilsTools.getGDataByKey<float>("doubleTouchScale",0.002f);
if(nowOffset < 0)
{
if (nowScale.x + nowOffset < minScale)
......@@ -136,7 +137,9 @@ public class mainGameScaleMove : MonoBehaviour
return;
}
}
nowScale = new Vector2(nowScale.x + nowOffset,nowScale.y + nowOffset) ;
//nowScale = new Vector2(nowScale.x + nowOffset,nowScale.y + nowOffset) ;
nowScale = new Vector2(nowOffset, nowOffset);
OldTouchCurrDis = nowTouchDistance;
for (int i = 0; i < transform.childCount; i++)
{
......
This diff is collapsed.
......@@ -30,5 +30,7 @@ public delegate void EventChildItemBack(List<UnityEngine.Object> uobjects, List<
public delegate void OnAreaHandler(int id, bool isOk);//显示区域或者显示组完成回调
public delegate void LoadImageBack(Sprite sprite,string id,Image image);
public delegate void NotifyEmptParam();
public delegate void NotifyBoolParam(bool isOk);
public delegate void NotifyParam2(string p1, string p2);
public delegate void ActionBack(GameObject gameobject,int aid);
//}
......@@ -27,7 +27,7 @@ public class utilsDB
}
else
{
db = new SqlHelper("data source=" + path);
db = null;// new SqlHelper("data source=" + path);
}
initTableHashKVS();
......
......@@ -467,15 +467,17 @@ public class utilsTools
public static Texture2D ScaleTexture(Texture2D source, int targetWidth, int targetHeight)
{
Texture2D result = new Texture2D(targetWidth, targetHeight, source.format, false);
Color[] colors = result.GetPixels(0,0,targetWidth,targetHeight);
for (int i = 0; i < result.height; ++i)
{
for (int j = 0; j < result.width; ++j)
{
Color newColor = source.GetPixelBilinear((float)j / (float)result.width, (float)i / (float)result.height);
result.SetPixel(j, i, newColor);
//result.SetPixel(j, i, newColor);
colors[i * targetWidth + i] = newColor;
}
}
result.SetPixels(0, 0, targetWidth, targetHeight, colors);
return result;
}
public static bool isEqualByValue(float value1,float value2,float mismatch)
......@@ -606,6 +608,11 @@ public class utilsTools
{
return (float)random.NextDouble() * (max - min) + min;
}
public static int getTotalMillisecond()
{
DateTime dt = DateTime.Now;
return dt.Minute * 60000 + dt.Second * 1000 + dt.Millisecond%1000;
}
public static string copyFile(string path)
{
//string retpath = path;
......@@ -669,4 +676,5 @@ public class utilsTools
}
return readPath;
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment