Merge branch 'develop_mjb_cscmnq_1.0.5' of…

Merge branch 'develop_mjb_cscmnq_1.0.5' of gitlab.huolea.com:wangxuewei/wdlc_mjb_unity into develop_mjb_cscmnq_1.0.5

Merge branch 'develop_mjb_cscmnq_1.0.5' of…
Merge branch 'develop_mjb_cscmnq_1.0.5' of gitlab.huolea.com:wangxuewei/wdlc_mjb_unity into develop_mjb_cscmnq_1.0.5
cfab8099 · zhangzhe · e7a76b9d · db364679 · e7a76b9d · e7a76b9d
Commit cfab8099 authored Jun 11, 2021 by zhangzhe
12 changed files
--- a/Assets/AdSDK/AD.meta
+++ b/Assets/AdSDK/AD.meta
-fileFormatVersion: 2
-guid: 66e2d68a3d594c442ba620e41fb79243
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/AdSDK/AD/CSJ.meta
+++ b/Assets/AdSDK/AD/CSJ.meta
-fileFormatVersion: 2
-guid: 62d1c1fa98be64555b74d41268d96b0a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/Main/Resource/Guide/使用钻石加速成熟.png
+++ b/Assets/Game/Main/Resource/Guide/使用钻石加速成熟.png
--- a/Assets/Game/Main/Resource/Guide/手.png
+++ b/Assets/Game/Main/Resource/Guide/手.png
--- a/Assets/Game/Main/Resource/Guide/收获.png
+++ b/Assets/Game/Main/Resource/Guide/收获.png
--- a/Assets/Game/Main/Resource/Guide/画板.png
+++ b/Assets/Game/Main/Resource/Guide/画板.png
--- a/Assets/Game/Main/Resource/Guide/画板.png.meta
+++ b/Assets/Game/Main/Resource/Guide/画板.png.meta
-fileFormatVersion: 2
-guid: 2f04f5c9365c644cca676c0057c517bc
-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: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/Main/Resource/Guide/画板备份.png
+++ b/Assets/Game/Main/Resource/Guide/画板备份.png
--- a/Assets/Game/Main/Resource/Guide/画板备份.png.meta
+++ b/Assets/Game/Main/Resource/Guide/画板备份.png.meta
-fileFormatVersion: 2
-guid: b4a4707dfda244d18b580ef1c9ca1ebe
-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: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Game/Main/Resource/Guide/种植第一块地.png
+++ b/Assets/Game/Main/Resource/Guide/种植第一块地.png
--- a/Assets/Game/Main/Scenes/CrazyCar.unity
+++ b/Assets/Game/Main/Scenes/CrazyCar.unity
@@ -666,7 +666,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: -193, y: -138}
-  m_SizeDelta: {x: 360, y: 143}
+  m_SizeDelta: {x: 288, y: 115}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &14516859
 MonoBehaviour:
@@ -11752,7 +11752,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
  m_AnchoredPosition: {x: 93, y: -340}
-  m_SizeDelta: {x: 154, y: 138}
+  m_SizeDelta: {x: 112, y: 101}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &382383543
 MonoBehaviour:
@@ -13968,7 +13968,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
  m_AnchoredPosition: {x: 91, y: -347}
-  m_SizeDelta: {x: 154, y: 138}
+  m_SizeDelta: {x: 112, y: 101}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &455875925
 MonoBehaviour:
@@ -18818,7 +18818,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: -182, y: -129}
-  m_SizeDelta: {x: 385, y: 143}
+  m_SizeDelta: {x: 359, y: 115}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &604644949
 MonoBehaviour:
@@ -50408,7 +50408,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: -192, y: -123}
-  m_SizeDelta: {x: 360, y: 143}
+  m_SizeDelta: {x: 288, y: 115}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1681316800
 MonoBehaviour:
@@ -51057,7 +51057,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
  m_AnchoredPosition: {x: 83, y: -347}
-  m_SizeDelta: {x: 140, y: 140}
+  m_SizeDelta: {x: 112, y: 101}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1699807654
 MonoBehaviour:
--- a/Assets/Game/Main/Scripts/View/DialogControl.cs
+++ b/Assets/Game/Main/Scripts/View/DialogControl.cs
@@ -494,7 +494,7 @@ public class DialogControl : MonoBehaviour
    }
    private void moveDiamondDialog()
    {
-        diamondcontent.transform.localPosition += new Vector3(0, 300, 0);
+        diamondcontent.transform.localPosition += new Vector3(0, 340, 0);
    }
    //关闭获取钻石弹窗
    public void closeDiamondDialog()
@@ -502,7 +502,7 @@ public class DialogControl : MonoBehaviour

        AudioUtils.ins.PlayBtnAudio();
        DiamondDialog.SetActive(false);
-        diamondcontent.transform.localPosition -= new Vector3(0, 300, 0);
+        diamondcontent.transform.localPosition -= new Vector3(0, 340, 0);
        AdUtils.closeFeedAd();
    }
    //获取钻石奖励