diff --git a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/小图标/坐标3.png b/FuZhou_FirstPage/Assets/GameAsset/texture/首页/小图标/坐标3.png
deleted file mode 100644
index 8b6cf465..00000000
Binary files a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/小图标/坐标3.png and /dev/null differ
diff --git a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/小图标/坐标3.png.meta b/FuZhou_FirstPage/Assets/GameAsset/texture/首页/小图标/坐标3.png.meta
deleted file mode 100644
index 1b270887..00000000
--- a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/小图标/坐标3.png.meta
+++ /dev/null
@@ -1,116 +0,0 @@
-fileFormatVersion: 2
-guid: e68695297bab0764d8e14fa0ab5c2861
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 11
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- sRGBTexture: 1
- linearTexture: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapsPreserveCoverage: 0
- alphaTestReferenceValue: 0.5
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- streamingMipmaps: 0
- streamingMipmapsPriority: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -100
- 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: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 1
- spriteTessellationDetail: -1
- textureType: 8
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- applyGammaDecoding: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 512
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: Standalone
- maxTextureSize: 512
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: WebGL
- maxTextureSize: 512
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID: 5e97eb03825dee720800000000000000
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/小图标/坐标4.png b/FuZhou_FirstPage/Assets/GameAsset/texture/首页/小图标/坐标4.png
index e6f37395..3d205af5 100644
Binary files a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/小图标/坐标4.png and b/FuZhou_FirstPage/Assets/GameAsset/texture/首页/小图标/坐标4.png differ
diff --git a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/小图标/坐标5.png b/FuZhou_FirstPage/Assets/GameAsset/texture/首页/小图标/坐标5.png
index 7939ae4c..c4b99cf0 100644
Binary files a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/小图标/坐标5.png and b/FuZhou_FirstPage/Assets/GameAsset/texture/首页/小图标/坐标5.png differ
diff --git a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-三明市.png b/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-三明市.png
index 02c7896d..f89bfb7b 100644
Binary files a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-三明市.png and b/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-三明市.png differ
diff --git a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-南平市.png b/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-南平市.png
index f277c04c..6be2bab7 100644
Binary files a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-南平市.png and b/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-南平市.png differ
diff --git a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-宁德市.png b/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-宁德市.png
index f2762733..26695cba 100644
Binary files a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-宁德市.png and b/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-宁德市.png differ
diff --git a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-福州市.png b/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-福州市.png
index a59c46d7..623befe3 100644
Binary files a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-福州市.png and b/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-福州市.png differ
diff --git a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-莆田市.png b/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-莆田市.png
index e9071484..dba47c1a 100644
Binary files a/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-莆田市.png and b/FuZhou_FirstPage/Assets/GameAsset/texture/首页/市/地图-莆田市.png differ
diff --git a/FuZhou_FirstPage/Assets/Resources/prefeb/modelItem.prefab b/FuZhou_FirstPage/Assets/Resources/prefeb/modelItem.prefab
index 3c9986bf..9e6af813 100644
--- a/FuZhou_FirstPage/Assets/Resources/prefeb/modelItem.prefab
+++ b/FuZhou_FirstPage/Assets/Resources/prefeb/modelItem.prefab
@@ -34,8 +34,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
- m_AnchoredPosition: {x: 24.247314, y: 3.41}
- m_SizeDelta: {x: 284.37427, y: 68.905914}
+ m_AnchoredPosition: {x: 28, y: 16.72}
+ m_SizeDelta: {x: 297.8949, y: 66.88907}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &2485691483878867192
CanvasRenderer:
@@ -179,8 +179,8 @@ RectTransform:
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.7999878, y: 3.3999758}
- m_SizeDelta: {x: 48.45117, y: 52.138977}
+ m_AnchoredPosition: {x: -0.28, y: 16.1}
+ m_SizeDelta: {x: 26.706306, y: 39.01983}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2485691485171461982
CanvasRenderer:
@@ -339,8 +339,8 @@ RectTransform:
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: 99.70001, y: 8.099976}
- m_SizeDelta: {x: 269, y: 85}
+ m_AnchoredPosition: {x: 98.9, y: 10.4}
+ m_SizeDelta: {x: 267, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1750993385045414421
CanvasRenderer:
diff --git a/FuZhou_FirstPage/Assets/Scripts/Item/ModelItem.cs b/FuZhou_FirstPage/Assets/Scripts/Item/ModelItem.cs
index 85bf4599..5f7377b7 100644
--- a/FuZhou_FirstPage/Assets/Scripts/Item/ModelItem.cs
+++ b/FuZhou_FirstPage/Assets/Scripts/Item/ModelItem.cs
@@ -26,9 +26,9 @@ public class ModelItem : MonoBehaviour
text.text = modelData.ModelName;
GetComponent<RectTransform>().anchoredPosition = new Vector2(float.Parse(modelData.MapLongitude)* citytrans.rect.width, float.Parse(modelData.MapLatitude)* citytrans.rect.height);
- btn.onClick.AddListener(() =>
+ btn.onClick.AddListener(() =>
{
- //调前端方法，打开启动器
+ //打开启动器
Application.ExternalCall("StartModel", JsonMapper.ToJson(modelData));
Debug.Log(JsonMapper.ToJson(modelData));
});
@@ -37,10 +37,14 @@ public class ModelItem : MonoBehaviour
public void PointIn(BaseEventData data)
{
icon.sprite = choseSprite;
+ //Application.ExternalCall("ChoseModel", JsonMapper.ToJson(modelData));
+ //Debug.Log(JsonMapper.ToJson(modelData));
}
public void PointOut(BaseEventData data)
{
icon.sprite = nochoseSprite;
+ //Application.ExternalCall("NoChoseModel");
+ //Debug.Log("取消选中");
}
}