修改幸运农田

Assets/Base/UnityTool/Constant.cs

@@ -19,8 +19,8 @@ public class Constant
     /// </summary>
     public bool IsTestNet{ get; set; }
     //微信key
-    public string WX_APP_ID= "wxe7a03eb52cce1b51";
-    public string WX_APP_Key= "6fa72a89ea188c4dff5729cff328b587";
+    public string WX_APP_ID= "wx21eef1b1b33e2ccd";
+    public string WX_APP_Key= "dff00145f278fc1b808197a68e8cb5db";
     public string universalLink = "https://feedapi.zhangxineducation.com/simulator/";
 
     // 友盟key ios
@@ -31,7 +31,7 @@ public class Constant
 #if UNITY_IOS
             return "609a589b53b6726499f8543d";
 #else
-            return "5f9bb48945b2b751a91fb2d5";
+            return "602f890b668f9e17b8b31413";
 #endif
 
         }
@@ -47,7 +47,7 @@ public class Constant
 #if UNITY_IOS
             return "399d87a2b8c8d900";
 #else
-            return "afcbef40e31631d3";
+            return "1d8a0d53c33a9b95";
 #endif
         }
     }

Assets/Base/UnityTool/Plugins/Android/WXEntryActivity.java

-package com.ym.ddcy.wxapi;
+package com.ym.xynt.wxapi;
 
 import android.app.Activity;
 import android.content.Intent;

Assets/Game/Main/Resource/ui/logo/多多菜园启动页.png.meta

-fileFormatVersion: 2
-guid: 435acc85cae8b4501ae6c3cac4ee7b0a
-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: 

Assets/Game/Main/Resource/ui/wechat/1 拷贝-2.png.meta → Assets/Game/Main/Resource/ui/logo/幸运农田ICON.png.meta

 fileFormatVersion: 2
-guid: 88ed56c44689841a0928663abd458cdf
+guid: e0261ce30740a4bf48ad64b71e2fa3e9
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Game/Main/Resource/ui/logo/多多菜园.png.meta → Assets/Game/Main/Resource/ui/logo/幸运农田启动页.png.meta

 fileFormatVersion: 2
-guid: 38725b19eb1014550bacb8298480aca2
+guid: ed26650440cea418ea517380c23ab85d
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Game/Main/Resource/ui/wechat/多多菜园.png.meta → Assets/Game/Main/Resource/ui/wechat/1 拷贝.png.meta

 fileFormatVersion: 2
-guid: 6eab1d45db92e4e4fb97b6c7ddc37305
+guid: ae861514b83054701b4d5c3615c66d53
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Game/Main/Resource/ui/wechat/我的菜园login.png.meta

-fileFormatVersion: 2
-guid: 0bc9c1e1b4ea09648958166c6d884337
-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: 

Assets/Game/Main/Resource/ui/wechat/背景-4.png.meta

-fileFormatVersion: 2
-guid: e744ff1c0e6284ff09eeec14a81e7da5
-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: 

Assets/Game/Main/Scenes/CrazyCar.unity

@@ -4492,7 +4492,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u591A\u591A\u83DC\u56ED\u7684\u7EA2\u5305"
+  m_Text: "\u5E78\u8FD0\u519C\u7530\u7684\u7EA2\u5305"
 --- !u!222 &137787768
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -30722,7 +30722,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 38725b19eb1014550bacb8298480aca2, type: 3}
+  m_Sprite: {fileID: 21300000, guid: e0261ce30740a4bf48ad64b71e2fa3e9, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Game/Main/Scenes/InitScene.unity

@@ -441,7 +441,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 435acc85cae8b4501ae6c3cac4ee7b0a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ed26650440cea418ea517380c23ab85d, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Game/Main/Scripts/View/SettingControl.cs

@@ -131,7 +131,7 @@ public class SettingControl : MonoBehaviour
 #if UNITY_IOS
         ShowIOSWebView(PlayerDataControl.Instance.PrivacyPolicyUrl, "隐私政策");
 #elif UNITY_ANDROID
-        CallLocalFunUtil.Instance.OpenWebPage(PlayerDataControl.Instance.PrivacyPolicyUrl, "隐私政策");
+        CallingNativeMethods.Instance.OpenWebPage(Constant.Instance.PrivacyPolicy, "隐私政策");
 #endif
     }
     public void OnClicAboutUs()

Assets/Game/Splash/Splash.unity

@@ -1513,7 +1513,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 435acc85cae8b4501ae6c3cac4ee7b0a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ed26650440cea418ea517380c23ab85d, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3021,7 +3021,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 88ed56c44689841a0928663abd458cdf, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ae861514b83054701b4d5c3615c66d53, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Plugins/Android/AndroidManifest.xml

@@ -47,7 +47,7 @@
             android:value="yanmao" />
       <!-- 微信配置 -->
         <activity
-            android:name="com.ym.ddcy.wxapi.WXEntryActivity"
+            android:name="com.ym.xynt.wxapi.WXEntryActivity"
             android:exported="true"
             android:launchMode="singleTop"/>
         <!-- 友盟配置 -->

Assets/Scripts/Splash/LoginView.cs

@@ -33,10 +33,11 @@ public class LoginView : MonoBehaviour
     /// </summary>
     public void DidSelectedYSZCButton()
     {
+        Debug.Log("URL:" + PlayerDataControl.Instance.PrivacyPolicyUrl);
 #if UNITY_IOS
         ShowIOSWebView(PlayerDataControl.Instance.PrivacyPolicyUrl, "隐私政策");
 #elif UNITY_ANDROID
-        CallingNativeMethods.Instance.OpenWebPage(PlayerDataControl.Instance.PrivacyPolicyUrl, "隐私政策");
+        CallingNativeMethods.Instance.OpenWebPage(Constant.Instance.PrivacyPolicy, "隐私政策");
 #endif
     }
 

Assets/Scripts/Splash/Splash.cs

@@ -135,10 +135,10 @@ public class Splash : MonoBehaviour
         HttpTool.Instance._Get("app/v1/novel/info", null, new Action<NovelData>((bean) =>
         {
             EventUtils.OnEvent("novel_info_success", "拉取配置信息成功");
+            Debug.Log("隐私政策URL"+bean.h5_url.privacy+"用户协议"+bean.h5_url.user);
             Constant.Instance.splash_time = bean.@switch.splash_time;
             Constant.Instance.video_time = bean.@switch.video_time;
             Constant.Instance.Interstitial_time = bean.@switch.Interstitial_time;
-
             Constant.Instance.PrivacyPolicy = bean.h5_url.privacy;
             Constant.Instance.UserAgreement = bean.h5_url.user;
             //PrefenceUtils.GetInstance().setFlowTag(bean.flowTag);

ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: ym
-  productName: "\u591A\u591A\u83DC\u56ED"
+  productName: "\u5E78\u8FD0\u519C\u7530"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -175,7 +175,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.ym.ddcy
+    Android: com.ym.xynt
     iPhone: com.ym.simulator
   buildNumber:
     iPhone: 6
@@ -277,7 +277,7 @@ PlayerSettings:
   - m_BuildTarget: 
     m_Icons:
     - serializedVersion: 2
-      m_Icon: {fileID: 2800000, guid: 38725b19eb1014550bacb8298480aca2, type: 3}
+      m_Icon: {fileID: 2800000, guid: e0261ce30740a4bf48ad64b71e2fa3e9, type: 3}
       m_Width: 128
       m_Height: 128
       m_Kind: 0