手机端直接隐藏通知；安卓64位

Assets/BannerController.cs

@@ -161,7 +161,7 @@ public class BannerController : MonoBehaviour
            right = GetSideIndex(false);
         if (center == -1 || left == -1 || right == -1 || animateLock) return;
         animateLock = true;
-        DOTween.CompleteAll();
+        if (leftse != null) leftse.Complete(true);
         DORight(itemList[left], itemList[center], itemList[right]);
     }
     void DORight(CanvasGroup left, CanvasGroup center, CanvasGroup right) 
@@ -182,6 +182,7 @@ public class BannerController : MonoBehaviour
         se.Join(left.GetComponent<RectTransform>().DOScale(Vector3.one, 0.3f));
         se.Join(left.GetComponent<RectTransform>().DOLocalMoveX(0, 0.3f));
         se.Play().onComplete = ()=> { animateLock = false; };
+        rightse = se;
         left.transform.SetAsLastSibling();
         //事件改变
         left.GetComponent<Button>().onClick.RemoveAllListeners();
@@ -196,6 +197,7 @@ public class BannerController : MonoBehaviour
 #else
     float offset = 43;
 #endif
+    Sequence leftse, rightse;
     private void Left()
     {
         int center = GetCenterIndex(),
@@ -203,7 +205,7 @@ public class BannerController : MonoBehaviour
            right = GetSideIndex(false);
         if (center == -1 || left == -1 || right == -1|| animateLock) return;
         animateLock = true;
-        DOTween.CompleteAll();
+        if (rightse != null) rightse.Complete(true);
         DOLeft(itemList[left], itemList[center], itemList[right]);
     }
     void DOLeft(CanvasGroup left, CanvasGroup center, CanvasGroup right) 
@@ -226,6 +228,7 @@ public class BannerController : MonoBehaviour
         se.Join(right.GetComponent<RectTransform>().DOScale(Vector3.one, 0.3f));
         se.Join(right.GetComponent<RectTransform>().DOLocalMoveX(0, 0.3f));
         se.Play().onComplete = () => { animateLock = false; };
+        leftse = se;
         right.transform.SetAsLastSibling();
         //事件改变
         right.GetComponent<Button>().onClick.RemoveAllListeners();

Assets/Editor/XCodePostProcessBuild.cs

@@ -5,6 +5,7 @@ using System.IO;
 using UnityEngine;
 using UnityEditor.Callbacks;
 using UnityEditor.iOS.Xcode;
+using System;
 
 #endif
 
@@ -15,7 +16,7 @@ public static class XCodePostProcessBuild
         "Security.framework","WebKit.framework", "CoreGraphics.framework"
     };
 
-    [PostProcessBuild(1)]
+    [PostProcessBuild(11)]
     public static void OnPostprocessBuild(BuildTarget buildTarget, string pathToBuiltProject)
     {
         if (BuildTarget.iOS != buildTarget)
@@ -24,10 +25,27 @@ public static class XCodePostProcessBuild
         }
         string projectPath = pathToBuiltProject + "/Unity-iPhone.xcodeproj/project.pbxproj";
         SetFrameworksAndBuildSettings(projectPath);
+        AddGooglePlist(pathToBuiltProject,projectPath);
         SetInfoList(pathToBuiltProject, "com.ZhiXingPai.PowerFun", "wxe3573a84e7e29902");
         SetAssociatedDomains(projectPath, "wx.powerfun.com.cn");
         Assets.NativeLocale.AddLocalizedStringsIOS(pathToBuiltProject, Path.Combine(Application.dataPath, "Editor/Locale"));
     }
+
+    private static void AddGooglePlist(string pathToBuiltProject,string path)
+    {
+        PBXProject proj = new PBXProject();
+        proj.ReadFromString(File.ReadAllText(path));
+        // This is the Xcode target in the generated project
+        string target = proj.GetUnityMainTargetGuid();
+
+        // Copy plist from the project folder to the build folder
+        FileUtil.CopyFileOrDirectory("Assets/Plugins/iOS/GoogleService-Info.plist", pathToBuiltProject + "/GoogleService-Info.plist");
+        proj.AddFileToBuild(target, proj.AddFile("GoogleService-Info.plist", "GoogleService-Info.plist"));
+
+        // Write PBXProject object back to the file
+        proj.WriteToFile(path);
+    }
+
     private static void SetFrameworksAndBuildSettings(string path)
     {
         PBXProject proj = new PBXProject();
@@ -38,6 +56,7 @@ public static class XCodePostProcessBuild
         proj.AddBuildProperty(target, "Other Linker Flags", "-Objc -all_load");
         proj.SetBuildProperty(target, "ENABLE_BITCODE", "NO");
 
+
         //根据微信SDK文档的要求，加入相关的Frameworks
         for (int i = 0; i < csAddFrameworks.Length; ++i)
         {
@@ -48,6 +67,10 @@ public static class XCodePostProcessBuild
         //苹果登录配置项
         //proj.AddCapability(target, PBXCapabilityType.SignInWithApple);
         proj.AddFrameworkToProject(proj.GetUnityFrameworkTargetGuid(), "AuthenticationServices.framework", false);
+        //移除无用配置项
+        proj.RemoveFrameworkFromProject(proj.GetUnityFrameworkTargetGuid(), "Chromium Embedded Framework.framework");
+        proj.SetBuildProperty(proj.ProjectGuid(), "ENABLE_BITCODE", "NO");
+        proj.SetBuildProperty(proj.ProjectGuid(), "CLANG_ENABLE_MODULES", "YES");
 
         File.WriteAllText(path, proj.WriteToString());
     }
@@ -65,12 +88,19 @@ public static class XCodePostProcessBuild
         dict.SetString("CFBundleURLName", wxUrlName);
         PlistElementArray urlSchemes = dict.CreateArray("CFBundleURLSchemes");
         urlSchemes.AddString(wxScheme);
+
         PlistElementDict dictMine = urlArray.AddDict();
         dictMine.SetString("CFBundleTypeRole", "Editor");
         dictMine.SetString("CFBundleURLName", "powerfunx");
         PlistElementArray urlSchemesMine = dictMine.CreateArray("CFBundleURLSchemes");
         urlSchemesMine.AddString("powerfunx");
 
+        PlistElementDict dictGG = urlArray.AddDict();
+        dictGG.SetString("CFBundleTypeRole", "Editor");
+        dictGG.SetString("CFBundleURLName", "google");
+        PlistElementArray urlSchemesGG = dictGG.CreateArray("CFBundleURLSchemes");
+        urlSchemesGG.AddString("com.googleusercontent.apps.492440200766-spo9287smn7epmlarib2pek9kficsq86");
+
         // 在 “info”标签栏的“LSApplicationQueriesSchemes“添加weixin wechat和weixinULAPI
         PlistElementArray wxArray = plist.root.CreateArray("LSApplicationQueriesSchemes");
         wxArray.AddString("weixin");

Assets/FacebookSDK/Plugins/Editor/Dependencies.xml

@@ -14,5 +14,7 @@
         <iosPod name="FBSDKLoginKit" version="~> 11.0" />
         <iosPod name="FBSDKShareKit" version="~> 11.0" />
         <iosPod name="FBSDKGamingServicesKit" version="~> 11.0" />
+        <iosPod name="Firebase/Auth" />
+        <iosPod name="GoogleSignIn" />
     </iosPods>
 </dependencies>

Assets/HomeMessageController.cs

@@ -18,10 +18,11 @@ public class HomeMessageController : MonoBehaviour
     float timer = 2;
     public float? textWidth = null;
     private bool isAnimated = false;
-    public void Initial()
+    public void Initial(float textWidth)
     {
         transform.Find("TextContainer/Content").localPosition = new Vector2(startX, transform.Find("TextContainer/Content").localPosition.y);
         isAnimated = false;
+        this.textWidth = textWidth;
     }
     float playtime = 0;
 #if UNITY_STANDALONE_WIN

Assets/LongMessageScript.cs

@@ -0,0 +1,78 @@
+using DG.Tweening;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class LongMessageScript : MonoBehaviour
+{
+    // Start is called before the first frame update
+    float startX;
+    private void Awake()
+    {
+        startX = transform.Find("TextContainer/Content").localPosition.x;
+#if (UNITY_ANDROID || UNITY_IOS)
+        UIManager.AddEvent(transform.Find("BtnClose").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
+         {
+             gameObject.SetActive(false);
+         });
+#endif
+    }
+    void Start()
+    {
+
+    }
+    float timer = 2;
+    public float? textWidth = null;
+    private bool isAnimated = false;
+    public void Initial(string txt)
+    {
+        var txtTransform = transform.Find("TextContainer/Content");
+        txtTransform.GetComponent<Text>().text = txt;
+        LayoutRebuilder.ForceRebuildLayoutImmediate(txtTransform.GetComponent<RectTransform>());
+        txtTransform.localPosition = new Vector2(startX + maxWidth, transform.Find("TextContainer/Content").localPosition.y);
+        isAnimated = false;
+        timer = 2;
+    }
+    float playtime = 0;
+#if UNITY_STANDALONE_WIN
+    float maxWidth = 1087;
+#else
+    float maxWidth = 350;
+#endif
+    // Update is called once per frame
+    void Update()
+    {
+        timer -= Time.deltaTime;
+        if (timer <= 0)
+        {
+            var width = transform.Find("TextContainer/Content").GetComponent<RectTransform>().sizeDelta.x;
+            if (textWidth != width) 
+            {
+                this.textWidth = width;
+            }
+            //do
+            if (textWidth.HasValue && textWidth > maxWidth)
+            {
+                var offset = textWidth.Value;
+                var game = transform.Find("TextContainer/Content");
+                var v = 20 / 0.3f;
+                playtime = offset / v;
+                //匀速播放
+                game.DOLocalMoveX(startX - offset, playtime).onComplete
+                    = () => 
+                    {
+                        var txtTransform = transform.Find("TextContainer/Content");
+                        txtTransform.localPosition = new Vector2(startX + maxWidth, transform.Find("TextContainer/Content").localPosition.y);
+                    };
+            }
+            timer += (playtime + 0.5f);
+        }
+    }
+    void returnAni()
+    {
+        var txtTransform = transform.Find("TextContainer/Content");
+        txtTransform.localPosition = new Vector2(startX + maxWidth, transform.Find("TextContainer/Content").localPosition.y);
+        //transform.Find("TextContainer/Content").DOLocalMoveX(startX, playtime);
+    }
+}

Assets/LongMessageScript.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 41ea55049aa944d4d8613ad6e7cec012
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Android/AndroidManifest.xml

@@ -3,6 +3,7 @@
   <queries>
     <package android:name="com.tencent.mm" />
     <package android:name="com.zhixingpai.powerfun" />
+	<package android:name="com.facebook.katana" />
   </queries>
   <application android:requestLegacyExternalStorage="true">
     <activity android:name="com.unityplugins.imageselector.TestMainActivity" android:theme="@style/UnityThemeSelector" android:screenOrientation="landscape" android:launchMode="singleTask" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection|density" android:hardwareAccelerated="false">

Assets/Plugins/iOS/GoogleService-Info.plist

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CLIENT_ID</key>
+	<string>492440200766-spo9287smn7epmlarib2pek9kficsq86.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.492440200766-spo9287smn7epmlarib2pek9kficsq86</string>
+	<key>ANDROID_CLIENT_ID</key>
+	<string>492440200766-0fqskhb6ebtag1hlqpo7fo93cuaarsl6.apps.googleusercontent.com</string>
+	<key>API_KEY</key>
+	<string>AIzaSyCapHL0ck1BuzfS2Drbup4VRO0jf_9fp_U</string>
+	<key>GCM_SENDER_ID</key>
+	<string>492440200766</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.ZhiXingPai.PowerFun</string>
+	<key>PROJECT_ID</key>
+	<string>powerfun-c1019</string>
+	<key>STORAGE_BUCKET</key>
+	<string>powerfun-c1019.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:492440200766:ios:87037cb11ad738c0e4d36f</string>
+</dict>
+</plist>

Assets/Plugins/iOS/GoogleService-Info.plist.meta

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: ccd268c2c2c420741bbf29cb19e4aada
+guid: 8f722ab35ffa939418fdbda7f0793bc7
-folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Plugins/iOS/IOSWechatController.m

@@ -14,6 +14,8 @@
 #import <FBSDKShareKit/FBSDKShareKit.h>
 #import <FBSDKGamingServicesKit/FBSDKGamingServicesKit.h>
 #import <Foundation/NSJSONSerialization.h>
+@import Firebase;
+@import GoogleSignIn;
 
 extern void UnitySendMessage(const char *,const char *,const char *);
 @interface IOSWechatController : UnityAppController<WXApiDelegate>
@@ -49,6 +51,12 @@ options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options
     return [WXApi handleOpenURL:url delegate:self];
 }
 
+- (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+    //google登录
+    [FIRApp configure];
+}
+
 - (void)onResp:(BaseResp *)resp
 {
 NSLog(@"47");

Assets/Plugins/iOS/Podfile

@@ -0,0 +1,15 @@
+source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
+platform :ios, '10.0'
+
+target 'UnityFramework' do
+  pod 'FBSDKCoreKit', '~> 11.0'
+  pod 'FBSDKCoreKit_Basics', '~> 11.0'
+  pod 'FBSDKGamingServicesKit', '~> 11.0'
+  pod 'FBSDKLoginKit', '~> 11.0'
+  pod 'FBSDKShareKit', '~> 11.0'
+  pod 'Firebase/Auth'
+  pod 'GoogleSignIn'
+end
+target 'Unity-iPhone' do
+end
+use_frameworks!

Assets/Plugins/iOS/Podfile.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f168de8faf0b96c4f8bf9708edb05015
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/iOS/SignWithApple.h

@@ -1,4 +1,7 @@
 #import <AuthenticationServices/AuthenticationServices.h>
+@import Firebase;
+@import GoogleSignIn;
+#import "UnityAppController.h"
 
 @interface AppleAuth: NSObject<ASAuthorizationControllerDelegate,ASAuthorizationProvider>
 - (void)authorizationAppleID;

Assets/Plugins/iOS/SignWithApple.m

@@ -40,7 +40,27 @@ static AppleAuth * _appleAuth;
         [authorizationController performRequests];
     }
 }
+- (void) authorizationGoogleID{
+    NSLog(@"cypgoogle");
+    GIDConfiguration *config = [[GIDConfiguration alloc] initWithClientID:[FIRApp defaultApp].options.clientID];
+    __weak __auto_type weakSelf = self;
+    UnityAppController * root = (UnityAppController*)[UIApplication sharedApplication].delegate;
+    [GIDSignIn.sharedInstance signInWithConfiguration:config presentingViewController:root.rootViewController callback:^(GIDGoogleUser * _Nullable user, NSError * _Nullable error) {
+    __auto_type strongSelf = weakSelf;
+    if (strongSelf == nil) { return; }
 
+    if (error == nil) {
+        GIDAuthentication *authentication = user.authentication;
+        UnitySendMessage("LoginPanel", "OnMobileGoogleLoginResp", [NSString stringWithFormat:@"true;%@|%@",user.userID,authentication.idToken ].UTF8String);
+        // FIRAuthCredential *credential =
+        // [FIRGoogleAuthProvider credentialWithIDToken:authentication.idToken
+        //                                 accessToken:authentication.accessToken];
+        // ...
+    } else {
+        // ...
+    }
+    }];
+}
 #pragma mark- ASAuthorizationControllerDelegate
 // 授权成功
 - (void)authorizationController:(ASAuthorizationController *)controller didCompleteWithAuthorization:(ASAuthorization *)authorization API_AVAILABLE(ios(13.0)) {
@@ -122,3 +142,8 @@ void authorizationAppleID(){
     AppleAuth * a = [AppleAuth instance];
     [a authorizationAppleID];
 }
+
+void authorizationGoogleID(){
+    AppleAuth * a = [AppleAuth instance];
+    [a authorizationGoogleID];
+}

Assets/RecommendController.cs

@@ -47,7 +47,7 @@ public class RecommendController : MonoBehaviour
                 break;
             case 1:
                 var res = await ConfigHelper.mapApi.GetMapRouteAreaDetailItem(Area.AreaId);
-                UIManager.ShowNewRouteDetailPanel(res.data);
+                UIManager.ShowNewRouteDetailPanel(res.data.Id);
                 break;
             case 2:
                 Application.OpenURL(Area.Url);

Assets/Resources/Images/NewDesign/bg_message_app.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: deca1e7a817a27c4f872f78a9921e3de
+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
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 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
+    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/Resources/Images/NewDesign/icon_delete.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: 598b8993297726b4da5cab9a96376429
+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
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 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
+    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/Resources/Images/NewDesign/icon_message.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: 6bf8e03f9ba9ba64da37fbc6c2939906
+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
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 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
+    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/Resources/UI/Prefab/Device/DeviceItem.prefab

@@ -30,7 +30,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 189965521107699628}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
@@ -74,6 +74,80 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5083574894189849385
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2937272512562187578}
+  - component: {fileID: 721626668066490155}
+  - component: {fileID: 2932644569775562883}
+  m_Layer: 5
+  m_Name: Panel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2937272512562187578
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5083574894189849385}
+  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_Children: []
+  m_Father: {fileID: 189965521107699628}
+  m_RootOrder: 0
+  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: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &721626668066490155
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5083574894189849385}
+  m_CullTransparentMesh: 0
+--- !u!114 &2932644569775562883
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5083574894189849385}
+  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: 0}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5362620512280803541
 GameObject:
   m_ObjectHideFlags: 0
@@ -102,6 +176,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 2937272512562187578}
   - {fileID: 4347642619387382541}
   - {fileID: 5333104648953487716}
   - {fileID: 6514089965287851756}
@@ -153,7 +228,7 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 0}
+  m_TargetGraphic: {fileID: 2932644569775562883}
 --- !u!1 &6092777681612193971
 GameObject:
   m_ObjectHideFlags: 0
@@ -184,7 +259,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 189965521107699628}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -259,7 +334,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 189965521107699628}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -350,7 +425,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 189965521107699628}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}

Assets/Resources/UI/Prefab/Panel/HomePanel.prefab

@@ -476,6 +476,80 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   radius: 20
+--- !u!1 &979830512863095920
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8225459854144891598}
+  - component: {fileID: 8476704931823866961}
+  - component: {fileID: 1218695838370556193}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8225459854144891598
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 979830512863095920}
+  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_Children: []
+  m_Father: {fileID: 5021686153317968446}
+  m_RootOrder: 0
+  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: 10, y: 0}
+  m_SizeDelta: {x: 28, y: 28}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &8476704931823866961
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 979830512863095920}
+  m_CullTransparentMesh: 0
+--- !u!114 &1218695838370556193
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 979830512863095920}
+  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_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 6bf8e03f9ba9ba64da37fbc6c2939906, type: 3}
+  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
 --- !u!1 &1056884570710093829
 GameObject:
   m_ObjectHideFlags: 0
@@ -1050,6 +1124,95 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   key: 
+--- !u!1 &1760823292303603572
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6638878482574731658}
+  - component: {fileID: 6469431270146606060}
+  - component: {fileID: 9172857339700226812}
+  - component: {fileID: 1526862894549736223}
+  m_Layer: 5
+  m_Name: TextContainer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6638878482574731658
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1760823292303603572}
+  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_Children:
+  - {fileID: 5857520441960753819}
+  m_Father: {fileID: 5021686153317968446}
+  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: 48, y: 0}
+  m_SizeDelta: {x: -58, y: 0}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &6469431270146606060
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1760823292303603572}
+  m_CullTransparentMesh: 0
+--- !u!114 &9172857339700226812
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1760823292303603572}
+  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: 0.003921569}
+  m_RaycastTarget: 1
+  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
+--- !u!114 &1526862894549736223
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1760823292303603572}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1 &1777885814862178516
 GameObject:
   m_ObjectHideFlags: 0
@@ -1086,6 +1249,7 @@ RectTransform:
   - {fileID: 5476117399430850424}
   - {fileID: 565904738278397585}
   - {fileID: 761144064440934135}
+  - {fileID: 5021686153317968446}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1129,6 +1293,99 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!1 &1820078545517810517
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5857520441960753819}
+  - component: {fileID: 4601675833978957791}
+  - component: {fileID: 5666994582578651889}
+  - component: {fileID: 7122294175436086531}
+  m_Layer: 5
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5857520441960753819
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1820078545517810517}
+  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_Children: []
+  m_Father: {fileID: 6638878482574731658}
+  m_RootOrder: 0
+  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: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &4601675833978957791
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1820078545517810517}
+  m_CullTransparentMesh: 0
+--- !u!114 &5666994582578651889
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1820078545517810517}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.94117653, g: 0.94117653, b: 0.94117653, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!114 &7122294175436086531
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1820078545517810517}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &2215345193639944119
 GameObject:
   m_ObjectHideFlags: 0
@@ -3510,6 +3767,109 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8568883967107449780}
   m_CullTransparentMesh: 0
+--- !u!1 &8778292575808578313
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5021686153317968446}
+  - component: {fileID: 2425847121116292237}
+  - component: {fileID: 6637220405354391404}
+  - component: {fileID: 9114990232312110620}
+  - component: {fileID: 1715819549104108146}
+  m_Layer: 5
+  m_Name: LongMessage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &5021686153317968446
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8778292575808578313}
+  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_Children:
+  - {fileID: 8225459854144891598}
+  - {fileID: 6638878482574731658}
+  m_Father: {fileID: 1777885814862178517}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 320, y: -40}
+  m_SizeDelta: {x: 1145, y: 44}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &2425847121116292237
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8778292575808578313}
+  m_CullTransparentMesh: 0
+--- !u!114 &6637220405354391404
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8778292575808578313}
+  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: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.8}
+  m_RaycastTarget: 1
+  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
+--- !u!114 &9114990232312110620
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8778292575808578313}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 41ea55049aa944d4d8613ad6e7cec012, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1715819549104108146
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8778292575808578313}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  radius: 22
 --- !u!1 &9155556658501947211
 GameObject:
   m_ObjectHideFlags: 0
@@ -4050,6 +4410,24 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 652cdefe0475dfd429e5a7e92bc3fa31, type: 3}
+--- !u!1 &2878789241602269182 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4566599628729395000, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
+    type: 3}
+  m_PrefabInstance: {fileID: 1777885815653005510}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2878789242754722739 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4566599627569075061, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
+    type: 3}
+  m_PrefabInstance: {fileID: 1777885815653005510}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2878789241596989269 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4566599628726286227, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
+    type: 3}
+  m_PrefabInstance: {fileID: 1777885815653005510}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4277467338606038296 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 2589794478743172574, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
@@ -4062,33 +4440,15 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 1777885815653005510}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &2878789241596989269 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4566599628726286227, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
-    type: 3}
-  m_PrefabInstance: {fileID: 1777885815653005510}
-  m_PrefabAsset: {fileID: 0}
---- !u!224 &4277467338018245799 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2589794478191162465, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
-    type: 3}
-  m_PrefabInstance: {fileID: 1777885815653005510}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &2878789241602269182 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4566599628729395000, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
-    type: 3}
-  m_PrefabInstance: {fileID: 1777885815653005510}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4277467338451912165 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 2589794478360427811, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
     type: 3}
   m_PrefabInstance: {fileID: 1777885815653005510}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &2878789242754722739 stripped
+--- !u!224 &4277467338018245799 stripped
-GameObject:
+RectTransform:
-  m_CorrespondingSourceObject: {fileID: 4566599627569075061, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
+  m_CorrespondingSourceObject: {fileID: 2589794478191162465, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
     type: 3}
   m_PrefabInstance: {fileID: 1777885815653005510}
   m_PrefabAsset: {fileID: 0}

Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab

@@ -1,5 +1,98 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &39251923491391260
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 496625435961015344}
+  - component: {fileID: 3686779470147895163}
+  - component: {fileID: 3454241008329311380}
+  - component: {fileID: 5735880026677687633}
+  m_Layer: 5
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &496625435961015344
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 39251923491391260}
+  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_Children: []
+  m_Father: {fileID: 6123267120473738440}
+  m_RootOrder: 0
+  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: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &3686779470147895163
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 39251923491391260}
+  m_CullTransparentMesh: 0
+--- !u!114 &3454241008329311380
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 39251923491391260}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.94117653, g: 0.94117653, b: 0.94117653, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
+    m_FontSize: 12
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!114 &5735880026677687633
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 39251923491391260}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &94116701349121391
 GameObject:
   m_ObjectHideFlags: 0
@@ -362,6 +455,96 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!1 &739304589139301305
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3101539257439404383}
+  - component: {fileID: 4470537891739565541}
+  - component: {fileID: 3239680947982107728}
+  - component: {fileID: 8772978365302715748}
+  m_Layer: 5
+  m_Name: LongMessage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3101539257439404383
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 739304589139301305}
+  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_Children:
+  - {fileID: 53415216725554946}
+  - {fileID: 6123267120473738440}
+  - {fileID: 616424717270607455}
+  m_Father: {fileID: 1777885814862178517}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 102, y: 0}
+  m_SizeDelta: {x: 427, y: 30}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &4470537891739565541
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 739304589139301305}
+  m_CullTransparentMesh: 0
+--- !u!114 &3239680947982107728
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 739304589139301305}
+  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_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: deca1e7a817a27c4f872f78a9921e3de, type: 3}
+  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
+--- !u!114 &8772978365302715748
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 739304589139301305}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 41ea55049aa944d4d8613ad6e7cec012, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &814462565054075501
 GameObject:
   m_ObjectHideFlags: 0
@@ -525,6 +708,80 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   radius: 33
+--- !u!1 &1669859688312970477
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 53415216725554946}
+  - component: {fileID: 4115531399334717754}
+  - component: {fileID: 4700204487958702806}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &53415216725554946
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1669859688312970477}
+  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_Children: []
+  m_Father: {fileID: 3101539257439404383}
+  m_RootOrder: 0
+  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: 10, y: 0}
+  m_SizeDelta: {x: 28, y: 28}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &4115531399334717754
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1669859688312970477}
+  m_CullTransparentMesh: 0
+--- !u!114 &4700204487958702806
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1669859688312970477}
+  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_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 6bf8e03f9ba9ba64da37fbc6c2939906, type: 3}
+  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
 --- !u!1 &1709217281902147025
 GameObject:
   m_ObjectHideFlags: 0
@@ -636,6 +893,8 @@ RectTransform:
   - {fileID: 7422200770415638701}
   - {fileID: 1128757190696039284}
   - {fileID: 3431565778213871763}
+  - {fileID: 825902449212828960}
+  - {fileID: 3101539257439404383}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1720,6 +1979,119 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 0000KM
+--- !u!1 &2882590459481290732
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 825902449212828960}
+  - component: {fileID: 8679445741643427231}
+  - component: {fileID: 3435410634832720573}
+  - component: {fileID: 3924220547131846799}
+  - component: {fileID: 1423584879003993720}
+  m_Layer: 5
+  m_Name: Panel (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &825902449212828960
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2882590459481290732}
+  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_Children:
+  - {fileID: 6355271646832174643}
+  m_Father: {fileID: 1777885814862178517}
+  m_RootOrder: 7
+  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: 0}
+  m_SizeDelta: {x: 323.4276, y: 163.92932}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8679445741643427231
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2882590459481290732}
+  m_CullTransparentMesh: 0
+--- !u!114 &3435410634832720573
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2882590459481290732}
+  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: 0.15294118, b: 0.25882354, a: 0}
+  m_RaycastTarget: 1
+  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
+--- !u!114 &3924220547131846799
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2882590459481290732}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 87a02f5a9d8ce2e43b46b9bbbc2a04c4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1423584879003993720
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2882590459481290732}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 598e18fb001004a81960f552978ecf4e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  urlOnStart: 
+  showOnStart: 0
+  fullScreen: 0
+  useToolbar: 0
+  toolbarPosition: 0
+  frame:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 844
+    height: 390
+  referenceRectTransform: {fileID: 825902449212828960}
 --- !u!1 &2894462968154619168
 GameObject:
   m_ObjectHideFlags: 0
@@ -1881,6 +2253,173 @@ MonoBehaviour:
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
+--- !u!1 &3161307210594869611
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6355271646832174643}
+  - component: {fileID: 8270654500462992248}
+  - component: {fileID: 271283379993894462}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6355271646832174643
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3161307210594869611}
+  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_Children: []
+  m_Father: {fileID: 825902449212828960}
+  m_RootOrder: 0
+  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: 100.6}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8270654500462992248
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3161307210594869611}
+  m_CullTransparentMesh: 0
+--- !u!114 &271283379993894462
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3161307210594869611}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
+--- !u!1 &3305547976192018571
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6123267120473738440}
+  - component: {fileID: 4393057312522009308}
+  - component: {fileID: 8334531074317233837}
+  - component: {fileID: 5106731522060201054}
+  m_Layer: 5
+  m_Name: TextContainer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6123267120473738440
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3305547976192018571}
+  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_Children:
+  - {fileID: 496625435961015344}
+  m_Father: {fileID: 3101539257439404383}
+  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: 3.5, y: 0}
+  m_SizeDelta: {x: -77, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4393057312522009308
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3305547976192018571}
+  m_CullTransparentMesh: 0
+--- !u!114 &8334531074317233837
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3305547976192018571}
+  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: 0.003921569}
+  m_RaycastTarget: 1
+  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
+--- !u!114 &5106731522060201054
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3305547976192018571}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1 &3462768965301733335
 GameObject:
   m_ObjectHideFlags: 0
@@ -5856,6 +6395,80 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   radius: 10
+--- !u!1 &7987125498545214300
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 616424717270607455}
+  - component: {fileID: 9109390686136871026}
+  - component: {fileID: 6395684851358040485}
+  m_Layer: 5
+  m_Name: BtnClose
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &616424717270607455
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7987125498545214300}
+  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_Children: []
+  m_Father: {fileID: 3101539257439404383}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -10, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &9109390686136871026
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7987125498545214300}
+  m_CullTransparentMesh: 0
+--- !u!114 &6395684851358040485
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7987125498545214300}
+  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_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 598b8993297726b4da5cab9a96376429, type: 3}
+  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
 --- !u!1 &8058388555972429588
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab

@@ -1332,9 +1332,9 @@ RectTransform:
   m_Father: {fileID: 1936946042244182541}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 10, y: -14}
+  m_AnchoredPosition: {x: 10, y: 0}
   m_SizeDelta: {x: 0, y: 28}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9218960045514105109
@@ -2730,7 +2730,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Texture: {fileID: 2800000, guid: 38b250357a82cd14c9df5129757f2e58, type: 3}
+  m_Texture: {fileID: 2800000, guid: 8a1f5dd0a18144c498c99139fcfa3547, type: 3}
   m_UVRect:
     serializedVersion: 2
     x: 0
@@ -4313,7 +4313,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 10, y: 0}
   m_SizeDelta: {x: 0, y: 28}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4547966394363676322
@@ -4420,7 +4420,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 10, y: 0}
   m_SizeDelta: {x: 0, y: 28}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1116450085117521016
@@ -4670,7 +4670,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 10, y: 0}
   m_SizeDelta: {x: 0, y: 28}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4886094110349649579
@@ -4777,7 +4777,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 20, y: 0}
   m_SizeDelta: {x: 0, y: 16}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8640525812794733518
@@ -4884,7 +4884,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 20, y: 0}
   m_SizeDelta: {x: 0, y: 16}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8640525813296669078

Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab

@@ -2408,7 +2408,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Texture: {fileID: 2800000, guid: 38b250357a82cd14c9df5129757f2e58, type: 3}
+  m_Texture: {fileID: 2800000, guid: 8a1f5dd0a18144c498c99139fcfa3547, type: 3}
   m_UVRect:
     serializedVersion: 2
     x: 0

Assets/Scripts/Apis/Models/MapRouteArea.cs

@@ -95,8 +95,7 @@ namespace Assets.Scripts.Apis.Models
 
         public bool IsFav { get; set; }
     }
-
+    public class MapRouteAreaDetail : MapRouteAreaItem
-    public class MapRouteAreaDetail
     {
         /// <summary>
         /// 
@@ -114,35 +113,11 @@ namespace Assets.Scripts.Apis.Models
         /// 
         /// </summary>
         public int RideCount { get; set; }
-        /// <summary>
-        /// 环徐州
-        /// </summary>
-        public string Name { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public string Description { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public string BannerImage { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public string CoverImage { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public DateTime CreateTime { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public DateTime UpdateTime { get; set; }
-        public bool IsFav { get; set; }
         public string CreateUserHead { get; set; }
         public string CreateUserName { get; set; }
         public List<MapRouteAreaDetailUser> UserList { get; set; }
     }
+
     public class MapRouteAreaDetailUser
     {
         public int Id { get; set; }

Assets/Scripts/Apis/Models/UserResultModel.cs

@@ -77,5 +77,6 @@ namespace Assets.Scripts.Apis.Models
         //第三方userid
         public string AppleUserId { get; set; }
         public string FacebookUserId { get; set; }
+        public string GoogleUserId { get; set; }
     }
 }

Assets/Scripts/Apis/UserApi.cs

@@ -310,6 +310,18 @@ namespace Assets.Scripts.Apis
             var r = await PostAsync<JsonResult<object>>("NoAuth/v1/OnFacebookLogin", new { faceBookUserId, token, phone, pwd, Captcha });
             return GetDataAfterSetCookie(r);
         }
+
+        public async Task<JsonResult<object>> OnGoogleIdLoginCheck(string googleUserId, string token)
+        {
+            var r = await PostAsync<JsonResult<object>>("NoAuth/v1/OnGoogleIdLoginCheck", new { googleUserId, token });
+            return GetDataAfterSetCookie(r);
+        }
+        public async Task<JsonResult<object>> OnGoogleIdLogin(string googleUserId, string token, string phone, string pwd, string Captcha)
+        {
+            var r = await PostAsync<JsonResult<object>>("NoAuth/v1/OnGoogleIdLogin", new { googleUserId, token, phone, pwd, Captcha });
+            return GetDataAfterSetCookie(r);
+        }
+
         private JsonResult<object> GetDataAfterSetCookie(JsonResult<object> r)
         {
             if (r.result)
@@ -329,6 +341,5 @@ namespace Assets.Scripts.Apis
             return r;
         }
 
-        
     }
 }

Assets/Scripts/App.cs

@@ -14,6 +14,7 @@ using System.Threading.Tasks;
 using System.Timers;
 using Newtonsoft.Json;
 using Facebook.Unity;
+using Assets.Scenes.Ride.Scripts;
 
 public delegate void ChangeLanguageDelegate();
 
@@ -62,6 +63,8 @@ public static class App
     //全局用 输入框或者下拉框修改标志位
     public static bool isChanged { get; set; }
     public static string notifyContent { get; internal set; }
+    //全局用，如果弹多条消息用这个队列
+    public static Queue<string> multiNotifyContent;
 
     public static RideSetting RideSetting = new RideSetting();
     public static string pageName { get; set; }
@@ -114,6 +117,9 @@ public static class App
     #region 语言改变事件
     public static event ChangeLanguageDelegate ChangeLanguageEvent;
     static Dictionary<string, Dictionary<string, string>> dic;
+
+    //全局队列保留最后5条消息
+    public static Queue<LinkedMessageEvent> globalMessageQueue = null;
     public static string GetLocalLanguage()
     {
         return language;
@@ -224,6 +230,8 @@ public static class App
             App._IsRowerMode = bool.Parse(isRower);
         }
         //App.ChangeLanguage("en");
+        globalMessageQueue = new Queue<LinkedMessageEvent>();
+        multiNotifyContent = new Queue<string>();
         Screen.sleepTimeout = SleepTimeout.NeverSleep;
     }
 }

Assets/Scripts/Mobile/LoginControllerMobile.cs

@@ -42,11 +42,11 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
             DateTime.Now.ToString("HH:mm");
         weChat = App.weChatController;
         weChat.Init(App.WxAppId);
+        transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Google")
+                .gameObject.SetActive(Utils.CheckGooglePlayServices());
 #if UNITY_IOS
         transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Wechat")
                 .gameObject.SetActive(App.weChatController.IsWeChatAppInstalled());
-        transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Google")
-                .gameObject.SetActive(false);
 #endif
 #if UNITY_IOS
         UIManager.AddEvent(transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Apple").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
@@ -68,7 +68,13 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
         });
         UIManager.AddEvent(transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Google").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
         {
+#if UNITY_EDITOR
+            OnMobileGoogleLoginResp("true;105370187704207825625|eyJhbGciOiJSUzI1NiIsImtpZCI6ImNhMDA2MjBjNWFhN2JlOGNkMDNhNmYzYzY4NDA2ZTQ1ZTkzYjNjYWIiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL2FjY291bnRzLmdvb2dsZS5jb20iLCJhenAiOiI0OTI0NDAyMDA3NjYtMGZxc2toYjZlYnRhZzFobHFwbzdmbzkzY3VhYXJzbDYuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJhdWQiOiI0OTI0NDAyMDA3NjYtZjE0Yjl0OXRtcmF1bGg2N2dxb2JhYTlpc3EzN2cwbmMuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJzdWIiOiIxMDUzNzAxODc3MDQyMDc4MjU2MjUiLCJlbWFpbCI6ImNhaXlhbnBlbmcwNjE5QGdtYWlsLmNvbSIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJuYW1lIjoi6JSh5Lil6bmPIiwicGljdHVyZSI6Imh0dHBzOi8vbGgzLmdvb2dsZXVzZXJjb250ZW50LmNvbS9hL0FBVFhBSnhjeWVkS05iZkcwZ3lIbkRhMXpWemVZRGVpdXI3OHUtNWZfbnVWPXM5Ni1jIiwiZ2l2ZW5fbmFtZSI6IuS4pem5jyIsImZhbWlseV9uYW1lIjoi6JShIiwibG9jYWxlIjoiemgtQ04iLCJpYXQiOjE2NDI0ODUxNzEsImV4cCI6MTY0MjQ4ODc3MX0.ZX-9jmB9GaWQEgcv8jbd4Ojy33DiVvl7m_PQZudJEQaLC1S5C6QJOaZRJEHNQ44mWmfSPlHPEhgsEoP-Qn7lKx7r609OuzMYGUE266bdbYer2KzztMtZIUKrI3i0UGLlybQm8YVGJh4vTvtaLZ3Fi2h2aKlDjx4MvFDaQKIwTDsOXzkCmhidYJ4KOhCToZsGIWmR8OhtwhL531p1oV3kOW28nXSbPhl0GalEbu-n970TtpxxQRvJeK61V8R3F29U71pn9PI863xQQ4itWsvQaFNz03pC8RRBGEKN8dvrmTqbKMuoo44fV4pLiY66EqUUoKYST7dOl15zUGfC-ckq5g");
+#elif UNITY_IOS
+            App.weChatController.SignWithGoogle();
+#else
             Utils.CallAndroidMethod("signInWithGoogle");
+#endif
         });
         //App.weChatController.Init(App.WxAppId);
         //var s = App.weChatController.isApplicationAvilible("com.gugoumainapp","powerfun").ToString();
@@ -203,16 +209,16 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
 
     public void OnMobileGoogleLoginResp(string res)
     {
-        Utils.showToast(null, res);
         Debug.Log(res);
-        //if (res.Contains("true;"))
+        var sp = res.Replace("true;", "").Split('|');
-        //{
+        if (sp.Length == 2)
-        //    GetComponent<LoginController>().goWxLoginWithCode(res.Replace("true;", ""), "mobile");
+        {
-        //}
+            GetComponent<LoginController>().OnGoogleIdLoginCheck(sp[0], sp[1]);
-        //else
+        }
-        //{
+        else 
-        //    Utils.showToast(null, res.Replace("false;", ""));
+        {
-        //}
+            Utils.showToast(null, res.Replace("false;",""));
+        }
     }
 
     public void OnAppleResp(string res) 

Assets/Scripts/Mobile/WeChatController.cs

@@ -36,6 +36,8 @@ public class WeChatController
 
     [DllImport("__Internal")]
     private static extern void authorizationAppleID();
+    [DllImport("__Internal")]
+    private static extern void authorizationGoogleID();
 #endif
     #endregion
     /// <summary>
@@ -83,6 +85,13 @@ public class WeChatController
 #endif
     }
 
+    public void SignWithGoogle()
+    {
+#if UNITY_IOS
+        authorizationGoogleID();
+#endif
+    }
+
     /// <summary>
     /// 判断是否是否安装了微信
     /// </summary>

Assets/Scripts/Scenes/LoginController.cs

@@ -501,6 +501,37 @@ public class LoginController : BaseScene
         transform.Find("Panel").Find("Version").GetComponent<Text>().text = $"V{App.AppVersion}";
 #endif
     }
+
+    private string ggUserId = "";
+    private string ggToken = "";
+    public async void OnGoogleIdLoginCheck(string userId, string token)
+    {
+        ggUserId = userId;
+        ggToken = token;
+        signType = 4;
+        var res = await ConfigHelper.userApi.OnGoogleIdLoginCheck(userId, token);
+        if (res.result) //判断是否成功登录
+        {
+            var data = JObject.FromObject(res.data);
+            if (data.ContainsKey("success") && data.Value<string>("success") == "False")
+            {
+                goSign();
+            }
+            else
+            {
+                RefreshWx3(data.ToObject<UserResultModel>(), 1);
+                wxLogin3.gameObject.SetActive(true);
+                signContainer.gameObject.SetActive(false);
+                pageNums = 3;
+                StartScrollPanel(2);
+            }
+        }
+        else
+        {
+            Utils.showToast(null, res.errMsg);
+        }
+    }
+
     private string fbUserId = "";
     private string fbToken = "";
 
@@ -591,12 +622,21 @@ public class LoginController : BaseScene
             //#endif
             App.notifyContent = r.data.Value<string>("Content");
 
-            if (r.data.Value<int>("Id") != notifyId)//r.data.Value<int>("Id") != notifyId
+            if (r.data.Value<int>("Id") > 1)//r.data.Value<int>("Id") != notifyId
             {
                 UIManager.ShowNewsModal();
                 PlayerPrefs.SetInt("notifyId", r.data.Value<int>("Id"));
             }
 #else
+            if (r.data.Value<int>("Id") > 1)
+            {
+                App.notifyContent = r.data.Value<string>("Content");
+                UIManager.ShowNewsModal();
+            }
+            else 
+            {
+                App.notifyContent = null;
+            }
             var rr = await ConfigHelper.userApi.GetVersions();
             if (rr.result)
             {
@@ -612,6 +652,8 @@ public class LoginController : BaseScene
             if (ver.UpdateLog.Count + 1 != notifyId) //ver.UpdateLog.Count != notifyId
             {
                 var log = ver.UpdateLog.FirstOrDefault();
+                if (App.notifyContent == null)
+                {
                     if (log != null)
                     {
                         App.notifyContent = log.Desc;
@@ -620,10 +662,14 @@ public class LoginController : BaseScene
                     {
                         App.notifyContent = r.data.Value<string>("Content");
                     }
-                PlayerPrefs.SetInt("notifyId", ver.UpdateLog.Count + 1);
                     UIManager.ShowNewsModal();
                 }
-            
+                else 
+                {
+                    App.multiNotifyContent.Enqueue(log != null ? log.Desc : r.data.Value<string>("Content"));
+                }
+                PlayerPrefs.SetInt("notifyId", ver.UpdateLog.Count + 1);
+            }
 #endif
         }
         GetRotateImage();
@@ -909,10 +955,14 @@ public class LoginController : BaseScene
         {
             r = await ConfigHelper.userApi.OnAppleIdLogin(appleUserId, appleToken, Email.text, Password.text, Captcha.text);
         }
-        else 
+        else if (signType == 3)
         {
             r = await ConfigHelper.userApi.OnFacebookLogin(fbUserId, fbToken, Email.text, Password.text, Captcha.text);
         }
+        else if (signType == 4)
+        {
+            r = await ConfigHelper.userApi.OnGoogleIdLogin(ggUserId, ggToken, Email.text, Password.text, Captcha.text);
+        }
         if (r != null && r.result)
         {
             var u = JObject.FromObject(r.data).ToObject<UserResultModel>();
@@ -942,6 +992,10 @@ public class LoginController : BaseScene
         {
             r = await ConfigHelper.userApi.OnFacebookLogin(fbUserId, fbToken, Email.text, "", Captcha.text);
         }
+        else if (signType == 4)
+        {
+            r = await ConfigHelper.userApi.OnGoogleIdLogin(ggUserId, ggToken, Email.text, "", Captcha.text);
+        }
         else
         {
             r = await ConfigHelper.userApi.OnWebWxLogin(Email.text,

Assets/Scripts/Scenes/MainController.cs

@@ -71,6 +71,7 @@ public class MainController : BaseScene
     CanvasGroup rightMessage;
     private void InitialMessage()
     {
+        Debug.Log("初始化组件");
 #if UNITY_STANDALONE_WIN
         msgLocation = 1 * msg.transform.localPosition;
         var go = transform.Find("GameObject");
@@ -100,7 +101,6 @@ public class MainController : BaseScene
         DestroyImmediate(transform.Find("GameObject/Message").gameObject);
         var m = Resources.Load<GameObject>("UI/Prefab/NewRoute/Mobile/Message");
         rightMessage = Instantiate<GameObject>(m).GetComponent<CanvasGroup>();
-        
         rightMessage.transform.SetParent(go);
         rightMessage.transform.localScale = Vector3.one;
         rightMessage.transform.localPosition = 1 * msgLocation;
@@ -121,63 +121,38 @@ public class MainController : BaseScene
 #endif
     }
 
+    private void ShowQueueMessage()
+    {
+        int i = 0,count = App.globalMessageQueue.Count;
+        while (App.globalMessageQueue.Count != 0)
+        {
+            //SetMessage(msgs[i], App.globalMessageQueue.Dequeue());
+            var v = 1 * msgLocation;
+            // 0 1 2
+            // 2 1 0
+            msgs[i].transform.localPosition = new Vector3(v.x, v.y - (count - 1 - i) * moveOffset, v.z);
+            msgs[i].alpha = 1;
+            msgs[i].gameObject.SetActive(true);
+            SetMessage(msgs[i], App.globalMessageQueue.Dequeue());
+            i++;
+        }
+        msgIndex = i;
+    }
+
     private void LinkedMessageHandler(LinkedMessageEvent e)
     {
-        //msg.transform.Find("Content")
+        if (App.globalMessageQueue.Count == 5)
+        {
+            App.globalMessageQueue.Dequeue();
+        }
+        App.globalMessageQueue.Enqueue(e);
         emptyt = 0;
-        //#if UNITY_STANDALONE_WIN
-        //        Debug.Log(e.content);
-        //        if (App.currentPageIsHome)
-        //        {
-        //            DoMessage(e);
-        //        }
-        //        else 
-        //        {
-        //            DoMessageRight(e);
-        //        }
-        //#else
-        //        if (App.currentPageIsHome)
-        //        {
-        //            DoMessage6(e);
-        //        }
-        //#endif
         if (App.currentPageIsHome)
         {
             DoMessage6(e);
         }
     }
-    private void DoMessageRight(LinkedMessageEvent e) 
-    {
-        SetMessage(rightMessage, e);
-        rightMessage.DOFade(1, 0.5f).onComplete = () => Invoke("fade0", 0.8f);
-    }
-    private void DoMessage(LinkedMessageEvent e)
-    {
 
-        var selectIndex = msgIndex % 3;
-        var m = msgs[selectIndex];
-        if (msgIndex >= 3) //
-        {
-            //msgIndex = 0;
-            m.DOFade(0, 0.5f).onComplete = ()=> 
-            {
-                SetMessage(m, e);
-                m.transform.localPosition = new Vector3(msgLocation.x, msgLocation.y - 54 * 2, msgLocation.z);
-                m.DOFade(1, 0.5f);
-                foreach (var item in msgs.Where((x, i) => i != selectIndex)) 
-                {
-                    item.transform.DOLocalMoveY(item.transform.localPosition.y + 54, 0.5f);
-                }
-            };
-        }
-        else 
-        {
-            SetMessage(m, e);
-            m.transform.localPosition = new Vector3(msgLocation.x, msgLocation.y - 54 * (msgIndex % 3), msgLocation.z);
-            m.DOFade(1, 0.5f);
-        }
-        msgIndex++;
-    }
 #if UNITY_STANDALONE_WIN
     float moveOffset = 74;
 #else
@@ -187,6 +162,7 @@ public class MainController : BaseScene
     {
         //Resources.UnloadUnusedAssets();
         //GC.Collect();
+        Debug.Log(msgIndex);
         var selectIndex = msgIndex % 5;
         var m = msgs[selectIndex];
         if (msgIndex >= 5) //
@@ -208,7 +184,6 @@ public class MainController : BaseScene
         }
         else
         {
-            Debug.Log(191);
             SetMessage(m, e);
             Sequence se = DOTween.Sequence();
             for (int i = 0; i < msgIndex; i++) 
@@ -264,20 +239,6 @@ public class MainController : BaseScene
 //#endif
     }
 
-    void FinishMessageRight() 
-    {
-        msgIndex = 0;
-        rightMessage.DOFade(0, 0.3f);
-    }
-    void FinishMessage6() 
-    {
-        msgIndex = 0;
-        foreach (var m in msgs)
-        {
-            m.alpha = 0;
-            m.GetComponent<RectTransform>().localPosition = 1 * msgLocation;
-        }
-    }
     private void SetMessage(CanvasGroup m,LinkedMessageEvent e) 
     {
         m.GetComponent<Button>().onClick.RemoveAllListeners();
@@ -304,9 +265,8 @@ public class MainController : BaseScene
         var txt = m.transform.Find("TextContainer/Content").GetComponent<RectTransform>();
         txt.GetComponent<Text>().text = e.content;
         LayoutRebuilder.ForceRebuildLayoutImmediate(txt);
-        Debug.Log(e.content + txt.sizeDelta.x);
+        //Debug.Log(e.content + txt.sizeDelta.x);
-        m.GetComponent<HomeMessageController>().Initial();
+        m.GetComponent<HomeMessageController>().Initial(txt.sizeDelta.x);
-        m.GetComponent<HomeMessageController>().textWidth = txt.sizeDelta.x;
     }
     CanvasGroup msg;
     void fade0()
@@ -317,7 +277,6 @@ public class MainController : BaseScene
     // Start is called before the first frame update
     async void Start()
     {
-        
         UIManager.Instance.Root = root;
         UIManager.Instance.MainPanel = this.transform.Find("Panel").GetComponent<PFUIPanel>();
         UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent<PFUIPanel>();
@@ -325,6 +284,7 @@ public class MainController : BaseScene
             $"{Math.Round(SystemInfo.batteryLevel * 100, 0)}%";
         transform.Find("MobileInfo/TimeText").GetComponent<Text>().text =
             DateTime.Now.ToString("HH:mm");
+        ShowQueueMessage();
 #if UNITY_EDITOR
         if (App.CurrentUser == null) //App.CurrentUser == null
         {
@@ -358,7 +318,7 @@ public class MainController : BaseScene
             }
             if (App.MainSceneParam["Name"] == "NewRouteDetail" && App.currentArea != null) 
             {
-                UIManager.ShowNewRouteDetailPanel(App.currentArea);
+                UIManager.ShowNewRouteDetailPanel(App.currentArea.Id);
             }
             if (App.MainSceneParam["Name"] == "UserInfoPanel")
             {
@@ -444,6 +404,8 @@ public class MainController : BaseScene
                     var message = lang == "zh" ? $"{item.Name}进入了 运动地球" : "entered PowerFun";
                     EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(-1, message, item.HeadImage, item.Name, item.RouteName), $"{item.Id}{item.LastActiveTime}{item.Point}");
                 }
+                if (string.IsNullOrEmpty(item.RouteName))
+                    continue;
                 if (item.RouteId > 0)
                 {
                     var message = "";
@@ -518,18 +480,22 @@ public class MainController : BaseScene
             {
                 var tempRecordData = Newtonsoft.Json.JsonConvert.DeserializeObject<TempRecordData>(content);
                 App.tempRecordData = tempRecordData;
-
+                if (App.tempRecordData.UserId == App.CurrentUser.Id)
-                UIManager.ShowConfirm(App.GetLocalString("Reconnect"), App.GetLocalString("Did you want to reconnect the trip that was interrupted abnormally?"), () => {
+                {
+                    UIManager.ShowConfirm(App.GetLocalString("Reconnect"), App.GetLocalString("Did you want to reconnect the trip that was interrupted abnormally?"), () =>
+                    {
                         App.RouteIdParam = App.tempRecordData.RouteId;
                         App.CompetionId = App.tempRecordData.CompetitionId;
                         SceneManager.LoadScene("Ride");
-                },2,()=> {
+                    }, 2, () =>
+                    {
                         Helper.DelectDir(PFConstants.MapWorkoutRecordTempFolder);
                         App.tempRecordData = null;
                     });
                 }
             }
         }
+    }
     private void OnDestroy()
     {
         EventQueueSystem.RemoveListener<LinkedMessageEvent>(LinkedMessageHandler);

Assets/Scripts/Scenes/Ride/Model/RecorderDataModel.cs

@@ -274,6 +274,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
     public class TempRecordData
     {
         public int CompetitionId { get; set; }
+        public int UserId { get; set; }
         public int RouteId { get; set; }
         public RouteResultParam selectParam { get; set; }
         public double CurrentRouteStartDistance { get; set; }

Assets/Scripts/Scenes/Ride/Scripts/AbstractPlayer.cs

@@ -126,6 +126,10 @@ namespace Assets.Scenes.Ride.Scripts
 			cyclingExcutor = mainController.cyclingController;
 			ComputeNextSlope();//计算下一个坡度相关数据
 		}
+		public virtual void UpdateAnimator()
+		{
+			characterAnimator = GetComponentInChildren<Animator>();
+		}
 
 		protected virtual void Excute()
 		{

Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs

@@ -367,13 +367,14 @@ namespace Assets.Scenes.Ride.Scripts
             }
             else
             {
-                //如果是参赛选手默认进入3d视角
+                ////如果是参赛选手默认进入3d视角
-                if (mainController.cyclingModel == Model.CyclingModel.Competition && !mainController.competition.CanWatch)
+                //if (mainController.cyclingModel == Model.CyclingModel.Competition && !mainController.competition.CanWatch)
-                {
+                //{
-                    return;
+                //    return;
-                }
+                //}
-                mainController.Is3dView = false;
+                //mainController.Is3dView = true;
                 ChangeView(null);
+                
             }
         }
         

Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs

@@ -716,10 +716,21 @@ public class CyclingController : DeviceServiceMonoBase
     private GameObject onlinePlayer { get; set; }
 
     Vector3 MAX_SIZE = new Vector3(3f, 3f, 3f);
-    Vector3 MIN_SIZE = new Vector3(1f, 1f, 1f);
+    Vector3 MIN_SIZE = new Vector3(0.1f, 0.1f, 0.1f);
     public void ChangeCurrentPlayer(int userId)
     {
         var coll = FindObjectsOfType<AbstractPlayer>();
+        
+        var unselectedPlayers = coll.Where(c => c.UserId != userId).ToList();
+        foreach (var item in unselectedPlayers)
+        {
+            item.transform.localScale = MIN_SIZE;
+            if (item.transform.childCount > 0)
+            {
+                Utils.DestroyChildren(item.transform);
+            }
+        }
+
         var selectedPlayer = coll.Where(c => c.UserId == userId).FirstOrDefault();
         if (selectedPlayer != null)
         {
@@ -732,19 +743,20 @@ public class CyclingController : DeviceServiceMonoBase
             {
                 Utils.DestroyChildren(selectedPlayer.transform);
                 var ss = Instantiate(onlineUserPrefab3d, selectedPlayer.transform);
-                ss.transform.localScale = Is3dView ? MAX_SIZE : MIN_SIZE;
+                ss.transform.localScale = new Vector3(1f, 1f, 1f); 
+                selectedPlayer.transform.localScale = Is3dView ? MAX_SIZE : MIN_SIZE;
+                selectedPlayer.UpdateAnimator();
+                selectedPlayer.UserId = userId;
             }
+            Vector2d nextLatLon = Along(selectedPlayer.TotalDistance + 0.1);
+            //设定人物方向
+            var s = map.GeoToWorldPosition(selectedPlayer.Currentlatlong);
+            var e = map.GeoToWorldPosition(nextLatLon);
+            Quaternion neededRotation = Quaternion.LookRotation(s - e);
+            selectedPlayer.transform.rotation = Quaternion.Euler(0, neededRotation.eulerAngles.y, 0);
+            selectedPlayer.currentRotation = neededRotation;
         }
    
-        var unselectedPlayers = coll.Where(c => c.UserId != userId).ToList();
-        foreach (var item in unselectedPlayers)
-        {
-            item.transform.localScale = MIN_SIZE;
-            if (item.transform.childCount > 0)
-            {
-                Utils.DestroyChildren(item.transform);
-            }
-        }
         //重置海拔图进度
         var currentIndex = currentPlayer.CurrentIndex;
         graph.HorizontalScrolling = chartDataSourceScript.GetCurrentStart(currentIndex);
@@ -893,7 +905,7 @@ public BaseUIManager singleUIManager;
             {
                 currentUser.SetDataSource(onlineTotalDistance, onlineDistance, onlineRider.Power, onlineRider.HeartRate, onlineRider.Cadence, onlineRider.TotalTicks, onlineRider.NickName, onlineRider.WeightKg, new Vector2d(onlineRider.Point.Latitude, onlineRider.Point.Longitude), index);
             }
-            //如果是观察者且当前第一此进入场景(TODO：这样切换会闪一下待解决)
+           
             if (isWatch && (currentPlayer is PlayerController || currentPlayer == null))
             {
                 var userId = onlineRiders.FirstOrDefault()?.UserId ?? 0;
@@ -1058,12 +1070,16 @@ public BaseUIManager singleUIManager;
     IEnumerator EnableTrailRenderer(List<TrailRenderer> trailRendererList)
     {
         yield return new WaitForSeconds(2f);
+        try
+        {
             foreach (var item in trailRendererList)
             {
                 item.Clear();
                 item.time = 30;
             }
         }
+        catch (Exception e) { }
+    }
 
     #endregion
 
@@ -1157,6 +1173,7 @@ public BaseUIManager singleUIManager;
         RecorderDataModel recorderData = cyclingController.recorderData;
         tempRecordData.RiderDatas = recorderData.RiderDatas;
         tempRecordData.selectParam = recorderData.selectParam;
+        tempRecordData.UserId = App.CurrentUser.Id;
         tempRecordData.RouteId = mapRoute.Id;
         tempRecordData.CompetitionId = recorderData.Competitionid;
         tempRecordData.StartTime = startTime;

Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs

@@ -128,8 +128,8 @@ namespace Assets.Scenes.Ride.Scripts
 				uploadByUserName.text = userList[0].Name;
 				var countryUrl = App.Host + $"User/GetCountryImg?userid={userList[0].Id}";
 				Utils.DisplayImage(head, userList[0].HeadImage);//头像
-				country.texture = cyclingController.GetCountryImageByCode(route.CountryCode);//上传者国家
+				country.texture = cyclingController.GetCountryImageByName(userList[0].Country);//上传者国家
-				mapCountry.texture = cyclingController.GetCountryImageByName(userList[0].Country);//路书国家
+				mapCountry.texture = cyclingController.GetCountryImageByCode(route.CountryCode);//路书国家
 				//Utils.DisplayImage(altitudeGraph, route.AltitudeGraph);//海拔图
 				Utils.DisplayImageAysnc(StartCoroutine, altitudeGraph, route.AltitudeGraph, DowloadCallBack);
 			}
@@ -196,7 +196,7 @@ namespace Assets.Scenes.Ride.Scripts
 				myselfItemScript.SetName(App.CurrentUser.Nickname);
 				myselfItemScript.SetTimer("--:--:--");
 				myselfItemScript.SetHead(App.CurrentUser.WxHeadImg);
-				var texture = cyclingController.GetCountryImageByCode(App.CurrentUser.Country);
+				var texture = cyclingController.GetCountryImageByName(App.CurrentUser.Country);
 				myselfItemScript.SetCountry(texture);
             }
             else

Assets/Scripts/Scenes/Ride/Scripts/MessagePanelScript.cs

@@ -107,6 +107,14 @@ namespace Assets.Scenes.Ride.Scripts
             this.nickname = nickname;
             this.routeName = routeName;
         }
+        public LinkedMessageEvent(LinkedMessageEvent data) 
+        {
+            this.routeId = data.routeId;
+            this.content = data.content;
+            this.avatar = data.avatar;
+            this.nickname = data.nickname;
+            this.routeName = data.routeName;
+        }
 
         private void CreateContent()
         { 

Assets/Scripts/Scenes/Ride/Scripts/OnlinePlayerController.cs

@@ -30,27 +30,32 @@ namespace Assets.Scenes.Ride.Scripts
             //创建UI
             var uipanel = mainController.GetUIPanel();
             uiObject = uipanel.transform.Find("ArrowList");
-            if (mainController.cyclingController.Mode == CyclingModel.Competition)
+//            if (mainController.cyclingController.Mode == CyclingModel.Competition)
-            {
+//            {
-#if UNITY_IOS || UNITY_ANDROID
+//#if UNITY_IOS || UNITY_ANDROID
-                var CompetitionArrow = mainController.GetCompetitionMobileArrow();
+//                var CompetitionArrow = mainController.GetCompetitionMobileArrow();
-                arrowImage = Instantiate(CompetitionArrow, uiObject);
+//                arrowImage = Instantiate(CompetitionArrow, uiObject);
-#else
+//#else
-                var CompetitionArrow = mainController.GetCompetitionArrow();
+//                var CompetitionArrow = mainController.GetCompetitionArrow();
-                arrowImage = Instantiate(CompetitionArrow, uiObject);
+//                arrowImage = Instantiate(CompetitionArrow, uiObject);
-#endif
+//#endif
-                //比赛模式
+//                //比赛模式
-                if (!string.IsNullOrEmpty(headUrl))
+//                if (!string.IsNullOrEmpty(headUrl))
-                {
+//                {
-                    var rawImge = arrowImage.transform.Find("Head").GetComponent<RawImage>();
+//                    var rawImge = arrowImage.transform.Find("Head").GetComponent<RawImage>();
-                    Utils.DisplayImage(rawImge, headUrl, true);
+//                    Utils.DisplayImage(rawImge, headUrl, true);
-                    rawImge.gameObject.SetActive(true);
+//                    rawImge.gameObject.SetActive(true);
-                }
+//                }
-            }
+//            }
-            else
+//            else
             {
                 arrowImage = Instantiate(Resources.Load<Image>("UI/Prefab/Ride/ReviewArrow"), uiObject);
                 arrowImage.color = new Color(0.1529412f, 0.8745098f, 0.8901961f);
+#if UNITY_IOS || UNITY_ANDROID
+                arrowImage.transform.DOScale(new Vector3(1f,1f,1f),0);
+#else
+                arrowImage.transform.DOScale(new Vector3(2f,2f,2f),0);
+#endif
             }
         }
         public override bool GetStart()
@@ -156,11 +161,11 @@ namespace Assets.Scenes.Ride.Scripts
         protected override void AfterExcute()
         {
             var playerScreenPos = Camera.main.WorldToScreenPoint(transform.position);
-            //如果是比赛模式头像
+            ////如果是比赛模式头像
-            if (mainController.cyclingModel == CyclingModel.Competition)
+            //if (mainController.cyclingModel == CyclingModel.Competition)
-            {
+            //{
-                playerScreenPos.y += 10f;
+            //    playerScreenPos.y += 10f;
-            }
+            //}
             //如果观察的是当前用户 隐藏UI 添加trailrender
             var iscurrentUser = mainController.currentPlayer.UserId == UserId;
             var s = mainController.currentPlayer.Currentlatlong;

Assets/Scripts/UI/Control/PfUIButton.cs

@@ -136,7 +136,7 @@ namespace Assets.Scripts.UI.Control
             {
                 Debug.Log(131);
                 timer.Stop();
-                
+                group.DOFade(1, 1f);
             };
            
             //鼠标进入
@@ -158,19 +158,21 @@ namespace Assets.Scripts.UI.Control
 
                     //tooltips.GetComponent<CanvasGroup>().DOFade(1, 0.5f);
                     //DOTween.CompleteAll(true);
-                    se = DOTween.Sequence();
+                    //se = DOTween.Sequence();
-                    se.SetDelay(1);
+                    //se.SetDelay(1);
-                    se.AppendCallback(() =>
+                    //se.AppendCallback(() =>
-                    {
+                    //{
-                        if(a!=null) a.Complete(true);
+                    //    if(a!=null) a.Complete(true);
-                        if (b != null) b.Complete(true);
+                    //    if (b != null) b.Complete(true);
+                    //    tooltips.SetActive(true);
+                    //    tooltips.GetComponent<CanvasGroup>().alpha = 0f;
+                    //    c = tooltips.GetComponent<CanvasGroup>().DOFade(1, 0.5f);
+                    //});
+                    //a = se.Play();
                     tooltips.SetActive(true);
                     tooltips.GetComponent<CanvasGroup>().alpha = 0f;
-                        c = tooltips.GetComponent<CanvasGroup>().DOFade(1, 0.5f);
-                    });
-                    a = se.Play();
                     //StartCoroutine(DelayShowTooltip());
-                    //timer.Start();
+                    timer.Start();
                 }
                 switch (mType)
                 {
@@ -207,10 +209,7 @@ namespace Assets.Scripts.UI.Control
                 if (!string.IsNullOrWhiteSpace(Tooltips) && showTooltip)
                 {
 #endif
-                    if (a != null) a.Complete(true);
+                    group.DOFade(0, 1f).onComplete += () => {
-                    if (c != null) c.Complete(true);
-                    b = group.DOFade(0, 1f);
-                    b.onComplete += () => {
                         tooltips.SetActive(false);
                     };
                 }
@@ -242,9 +241,9 @@ namespace Assets.Scripts.UI.Control
             UIManager.AddEvent(this.gameObject, EventTriggerType.PointerDown, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
             {
                 if (!this.isActiveAndEnabled) return;
-                if (a != null) a.Complete(true);
+                //if (a != null) a.Complete(true);
-                if (b != null) b.Complete(true);
+                //if (b != null) b.Complete(true);
-                if (c != null) c.Complete(true);
+                //if (c != null) c.Complete(true);
                 tooltips.SetActive(false);
 
                 //else
@@ -273,6 +272,11 @@ namespace Assets.Scripts.UI.Control
                             image.color = ConvertColor("#BD2255");
                         }
                         break;
+                    case Type.Image:
+                        {
+                            tooltips.SetActive(tooltips.activeSelf);
+                        }
+                        break;
                     default:
                         break;
                 }
@@ -304,7 +308,7 @@ namespace Assets.Scripts.UI.Control
                         break;
                     case Type.Image:
                         {
-                            //tooltips.SetActive(false);
+                            tooltips.SetActive(false);
                         }
                         break;
                     default:

Assets/Scripts/UI/Prefab/Login/LoginRegOptions.cs

@@ -56,7 +56,7 @@ namespace Assets.Scripts.UI.Prefab.Login
             }
             
             days = new List<Dropdown.OptionData>();
-            genders = new List<Dropdown.OptionData>() {new Dropdown.OptionData(App.GetLocalString("Male")), new Dropdown.OptionData(App.GetLocalString("FeMale")) };
+            genders = new List<Dropdown.OptionData>() {new Dropdown.OptionData(App.GetLocalString("Male")), new Dropdown.OptionData(App.GetLocalString("Female")) };
             var countryJson = Resources.Load<TextAsset>("UI/flags-mini").text;
             countryList = JsonConvert.DeserializeObject<List<CountryModel>>(countryJson);
             countrys = countryList.Select(x => new Dropdown.OptionData(x.country)).ToList();

Assets/Scripts/UI/Prefab/NewRoute/NewRouteItemController.cs

@@ -27,7 +27,7 @@ public class NewRouteItemController : MonoBehaviour
         GetComponent<Button>().onClick.RemoveAllListeners();
         GetComponent<Button>().onClick.AddListener(() =>
         {
-            UIManager.ShowNewRouteDetailPanel(area);
+            UIManager.ShowNewRouteDetailPanel(area.Id);
         });
         StartCoroutine(displayImage(area, caches));
     }

Assets/Scripts/UI/Prefab/NewsController.cs

@@ -17,10 +17,19 @@ public class NewsController : PFUIPanel
             UIManager.AddEvent(exit.gameObject, EventTriggerType.PointerClick, (b) =>
             {
                 Close();
+                if (App.multiNotifyContent.Count > 0)
+                {
+                    transform.Find("Main").Find("Inner").Find("Content").GetComponent<Text>().text = App.multiNotifyContent.Dequeue();
+                    Invoke("Open", 0.3f);
+                }
             });
         }
         Get();
     }
+    void Open() 
+    {
+        gameObject.SetActive(true);
+    }
     Transform content,exit;
     void Get() 
     {

Assets/Scripts/UI/Prefab/Panel/EditUserController.cs

@@ -292,6 +292,10 @@ public class EditUserController : PFUIPanel, INativeOnMobileImageSelect
             string.IsNullOrEmpty(currentUser.AppleUserId)
             ? Resources.Load<Sprite>("Images/link-apple")
             : Resources.Load<Sprite>("Images/Login_Apple");
+        linkContainer.Find("Gg").GetComponent<Image>().sprite =
+            string.IsNullOrEmpty(currentUser.GoogleUserId)
+            ? Resources.Load<Sprite>("Images/link-google")
+            : Resources.Load<Sprite>("Images/Login_Google");
     }
     // Start is called before the first frame update
     protected override void Start()

Assets/Scripts/UI/Prefab/Panel/HomeController.cs

@@ -116,6 +116,7 @@ public class HomeController : PFUIPanel
             //    }
             //},
         };
+        
     }
     private void GoRide(BaseEventData e)
     {
@@ -299,7 +300,7 @@ public class HomeController : PFUIPanel
         if (maxt <= 0)
         {
             GetMaxRanking();
-            maxt += 60f;
+            maxt += 60f * 5;
         }
         if (maxdataTime > 0)
         {
@@ -363,8 +364,7 @@ public class HomeController : PFUIPanel
         var txt = m.transform.Find("TextContainer/Content").GetComponent<RectTransform>();
         txt.GetComponent<Text>().text = e.Message;
         LayoutRebuilder.ForceRebuildLayoutImmediate(txt);
-        m.GetComponent<HomeMessageController>().Initial();
+        m.GetComponent<HomeMessageController>().Initial(txt.sizeDelta.x);
-        m.GetComponent<HomeMessageController>().textWidth = txt.sizeDelta.x;
     }
 
     public override void Show()
@@ -372,5 +372,27 @@ public class HomeController : PFUIPanel
         base.Show();
         transform.MyDOFade();
         GetSummary();
+#if UNITY_STANDALONE_WIN
+        GetNotify();
+#endif
+        //transform.Find("Panel (1)").GetComponent<test>().startPage();
+    }
+
+    private async Task GetNotify()
+    {
+        var r = await ConfigHelper.userApi.GetNotify();
+        if (r.result) 
+        {
+            var lm = transform.Find("LongMessage");
+            if (r.data.Value<int>("Id") > 1)
+            {
+                lm.gameObject.SetActive(true);
+                lm.GetComponent<LongMessageScript>().Initial(r.data["Content"].ToString().Replace("\r\n"," "));
+            }
+            else 
+            {
+                lm.gameObject.SetActive(false);
+            }
+        }
     }
 }

Assets/Scripts/UI/Prefab/Panel/MapListController.cs

@@ -326,7 +326,7 @@ public class MapListController : PFUIPanel
         mc.GetComponent<CanvasGroup>().alpha = 0;
         mc.GetComponent<CanvasGroup>().DOFade(1, 0.3f);
 #else
-        var topRect = topContainer;
+        var topRect = transform.Find("Panel/Top/Container");
 #endif
         if (isFocusSearch)
         {

Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs

@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
+using System.Threading.Tasks;
 
 public class NewRouteDetailController : PFUIPanel
 {
@@ -130,14 +131,13 @@ public class NewRouteDetailController : PFUIPanel
         //    timer += 1f;
         //}
     }
-    MapRouteAreaItem area;
+    MapRouteAreaDetail area;
-    int pageIndex = 0, pageSize = 10;
+    int pageIndex = 0, pageSize = 12;
     bool isEnd = false, startMouse = false;
-    public async void Initial(MapRouteAreaItem area)
+    public async void Initial(int areaId)
     {
         isEnd = false;
         pageIndex = 0;
-        this.area = area;
         var left = transform.Find("Container/Left");
         left.Find("Icon").GetComponent<RawImage>().texture = null;
         scroll.content.DestroyChildren();
@@ -151,46 +151,9 @@ public class NewRouteDetailController : PFUIPanel
             .text = string.Empty;
         transform.Find("Container/Left/DescScroll/Viewport/Content/Desc").GetComponent<Text>()
             .text = string.Empty;
-        if (area.CoverImage != null) 
-        {
-            Utils.DisplayImageTempDict(left.Find("Icon").GetComponent<RawImage>(), area.CoverImage, caches
-                , b =>
-                 {
-//                     if (b != null)
-//                     {
-//                         cacheByte.Add(area.CoverImage, b);
-//                     }
-//                     else if(cacheByte.ContainsKey(area.CoverImage))
-//                     {
-//                         b = cacheByte[area.CoverImage];
-//                     }
         
-//#if UNITY_EDITOR
-//                     var _t = new Texture2D(4, 4, TextureFormat.DXT5, false);
-//#else
-//#if UNITY_IOS
-//                var _t = new Texture2D(4, 4, TextureFormat.ASTC_RGB_4x4,false);
-//                Debug.Log("使用了壓縮");
-//#elif UNITY_ANDROID
-//                var _t = new Texture2D(4, 4, TextureFormat.ASTC_RGB_4x4,false);
-//                Debug.Log("使用了壓縮");
-//#else //pc
-//                var _t = new Texture2D(4, 4, TextureFormat.DXT5,false);
-//#endif
-//#endif
-//                     _t.LoadImage(b);
-//                     //Graphics.CopyTexture(t, _t);
-//                     //Debug.Log($"{t.width},{t.height}");
-//                     left.Find("Thumbnail").GetComponent<RawImage>().texture =
-//                        ScaleTextureCutOut(_t, 0, _t.height / 2, _t.width / 3, _t.height / 3);
-                 });
-            //Utils.DisplayImageTempDict(left.Find("Thumbnail").GetComponent<RawImage>(), area.CoverImage, caches);
-        }
-        Debug.Log(153 + area.IsFav.ToString());
         
-        left.Find("Name").GetComponent<Text>().text = area.Name;
+        await GetData(areaId);
-        
-        GetData();
         GetList();
         
     }
@@ -243,11 +206,13 @@ public class NewRouteDetailController : PFUIPanel
             GetList();
         }
     }
-    private async void GetData() 
+    private async Task GetData(int areaId) 
     {
-        var res = await ConfigHelper.mapApi.GetMapRouteAreaDetail(area.Id);
+        var res = await ConfigHelper.mapApi.GetMapRouteAreaDetail(areaId);
         if (res.result) 
         {
+            this.area = res.data;
+            transform.Find("Container/Left/Name").GetComponent<Text>().text = res.data.Name;
             transform.Find("Container/Left/RideContainer/Text").GetComponent<Text>()
                 .text = res.data.RideCount.ToString();
             transform.Find("Container/Left/Infos/DistanceContainer/Text").GetComponent<Text>()
@@ -264,6 +229,41 @@ public class NewRouteDetailController : PFUIPanel
             transform.Find("Container/Left/Fav").GetComponent<Image>().sprite = FavDict[res.data.IsFav];
             LayoutRebuilder.ForceRebuildLayoutImmediate(transform.Find("Container/Left/RideContainer").GetComponent<RectTransform>());
             var userinfo = Resources.Load<GameObject>("UI/Prefab/NewRoute/UserInfo");
+            if (res.data.CoverImage != null)
+            {
+                Utils.DisplayImageTempDict(transform.Find("Container/Left/Icon").GetComponent<RawImage>(), area.CoverImage, caches
+                    , b =>
+                    {
+                    //                     if (b != null)
+                    //                     {
+                    //                         cacheByte.Add(area.CoverImage, b);
+                    //                     }
+                    //                     else if(cacheByte.ContainsKey(area.CoverImage))
+                    //                     {
+                    //                         b = cacheByte[area.CoverImage];
+                    //                     }
+
+                    //#if UNITY_EDITOR
+                    //                     var _t = new Texture2D(4, 4, TextureFormat.DXT5, false);
+                    //#else
+                    //#if UNITY_IOS
+                    //                var _t = new Texture2D(4, 4, TextureFormat.ASTC_RGB_4x4,false);
+                    //                Debug.Log("使用了壓縮");
+                    //#elif UNITY_ANDROID
+                    //                var _t = new Texture2D(4, 4, TextureFormat.ASTC_RGB_4x4,false);
+                    //                Debug.Log("使用了壓縮");
+                    //#else //pc
+                    //                var _t = new Texture2D(4, 4, TextureFormat.DXT5,false);
+                    //#endif
+                    //#endif
+                    //                     _t.LoadImage(b);
+                    //                     //Graphics.CopyTexture(t, _t);
+                    //                     //Debug.Log($"{t.width},{t.height}");
+                    //                     left.Find("Thumbnail").GetComponent<RawImage>().texture =
+                    //                        ScaleTextureCutOut(_t, 0, _t.height / 2, _t.width / 3, _t.height / 3);
+                });
+                //Utils.DisplayImageTempDict(left.Find("Thumbnail").GetComponent<RawImage>(), area.CoverImage, caches);
+            }
 #if !(UNITY_ANDROID || UNITY_IOS)
             transform.Find("Container/Left/NOData").gameObject.SetActive(res.data.UserList.Count == 0);
             transform.Find("Container/Left/Users").DestroyChildren();

Assets/Scripts/UIManager.cs

@@ -332,10 +332,10 @@ public class UIManager : MonoBehaviour
             return this.GetPanelInstance("NewRouteDetailPanel", ref this.mNewRouteDetailController);
         }
     }
-    public static void ShowNewRouteDetailPanel(MapRouteAreaItem area)
+    public static void ShowNewRouteDetailPanel(int areaId)
     {
         UIManager.Show(UIManager.Instance.NewRouteDetailPanel, UIManager.Instance.MainPanel);
-        UIManager.Instance.NewRouteDetailPanel.GetComponent<NewRouteDetailController>().Initial(area);
+        UIManager.Instance.NewRouteDetailPanel.GetComponent<NewRouteDetailController>().Initial(areaId);
     }
     #endregion
     private CountDownAnimation mCountDownAnimation;

Assets/Scripts/Utils/Utils.cs

@@ -274,6 +274,20 @@ namespace Assets.Scripts
 #endif
         }
 
+        public static bool CheckGooglePlayServices() 
+        {
+#if UNITY_ANDROID && !UNITY_EDITOR
+            AndroidJavaClass jc = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
+            var activity = jc.GetStatic<AndroidJavaObject>("currentActivity");
+            return activity.Call<bool>("CheckGooglePlayServices");
+#elif UNITY_EDITOR || UNITY_IOS
+            return true;
+#else
+            return false;
+#endif
+
+        }
+
         public static void showLoadingExtension(this GameObject game)
         {
             game.SetActive(true);

Assets/test.cs

@@ -9,20 +9,26 @@ public class test : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
+        
+    }
+    public void startPage() 
+    {
+        Invoke("startPageFunc", 1f);
+    }
+    private void startPageFunc()
+    {
+        var rect = GetComponent<RectTransform>();
         var webView = gameObject.GetComponent<UniWebView>();
         webView.Frame = new Rect(0, 0, Screen.width, Screen.height);
 
+        webView.ReferenceRectTransform = rect;
         // Load a URL.
         webView.Load("http://192.168.0.101:3081");
-
         // Show it.
         webView.Show();
-
-        webView.ReferenceRectTransform = GetComponent<RectTransform>();
         webView.OnMessageReceived -= FromJs;
         webView.OnMessageReceived += FromJs;
     }
-
     private void FromJs(UniWebView webView, UniWebViewMessage message)
     {
         if (message.Path.Equals("Test")) 

ProjectSettings/AndroidResolverDependencies.xml

@@ -13,7 +13,7 @@
   </packages>
   <files />
   <settings>
-    <setting name="androidAbis" value="arm64-v8a,armeabi-v7a" />
+    <setting name="androidAbis" value="armeabi-v7a" />
     <setting name="bundleId" value="com.ZhiXingPai.PowerFunUnity" />
     <setting name="explodeAars" value="True" />
     <setting name="gradleBuildEnabled" value="True" />
@@ -22,7 +22,7 @@
     <setting name="packageDir" value="Assets/Plugins/Android" />
     <setting name="patchAndroidManifest" value="True" />
     <setting name="patchMainTemplateGradle" value="True" />
-    <setting name="projectExportEnabled" value="False" />
+    <setting name="projectExportEnabled" value="True" />
     <setting name="useJetifier" value="False" />
   </settings>
 </dependencies>

ProjectSettings/EditorBuildSettings.asset

@@ -6,8 +6,8 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/Login.unity
+    path: Assets/Scenes/Login-Mobile.unity
-    guid: 6dce3e17997730b4492f91dd8fede429
+    guid: 4be878da00cf764499988cf403faf94d
   - enabled: 1
     path: Assets/Scenes/MainScene.unity
     guid: ab586a3c1bacd4a48a55178eb06fe0cc

ProjectSettings/GraphicsSettings.asset

@@ -38,6 +38,7 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

ProjectSettings/ProjectSettings.asset

@@ -133,7 +133,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 2.1.1
+  bundleVersion: 2.1.2
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -179,8 +179,8 @@ PlayerSettings:
   applicationIdentifier:
     Android: com.ZhiXingPai.PowerFunUnity
   buildNumber:
-    iPhone: 2.1.1.2
+    iPhone: 2.1.2.1
-  AndroidBundleVersionCode: 15
+  AndroidBundleVersionCode: 16
   AndroidMinSdkVersion: 24
   AndroidTargetSdkVersion: 30
   AndroidPreferredInstallLocation: 1