Przeglądaj źródła

添加隐私政策Activity

lzx 3 tygodni temu
rodzic
commit
e734d914e0

+ 13 - 6
Assets/Plugins/Android/AndroidManifest.xml

@@ -3,24 +3,31 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.unity3d.player"
         xmlns:tools="http://schemas.android.com/tools">
+
+
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+
     <application
             android:allowBackup="false"
             tools:replace="android:allowBackup"
             android:theme="@style/TuanjieThemeSelector">
 
-    <meta-data
-                
-                android:name="Crasheye_appkey"
-                android:value="djpz510z"/>
-        <activity android:name="com.taptap.xy.yousanjie.MainActivity"
-                  android:theme="@style/TuanjieThemeSelector">
+        <activity android:name="com.unity3d.player.PrivacyActivity"
+                  android:theme="@style/TuanjieThemeSelector"
+                  android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+        </activity>
+
+        <meta-data
+                android:name="Crasheye_appkey"
+                android:value="djpz510z"/>
+        <activity android:name="com.taptap.xy.yousanjie.MainActivity"
+                  android:theme="@style/TuanjieThemeSelector">
             <meta-data android:name="unityplayer.UnityActivity" android:value="true"/>
         </activity>
     </application>

+ 8 - 0
Assets/Plugins/Android/com.unity3d.player.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CykbvXj5Vi5iFPnVbcaLdYBbfEf5RqpsORL81+MzLRpRynIXeXPhy6Zrm8q7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 81 - 0
Assets/Plugins/Android/com.unity3d.player/PrivacyActivity.java

@@ -0,0 +1,81 @@
+package com.unity3d.player;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.webkit.WebView;
+ 
+public class PrivacyActivity extends Activity implements DialogInterface.OnClickListener {
+
+   // 隐私协议内容
+   final String privacyContext =
+             "欢迎使用本游戏,在使用本游戏前,请您充分阅读并理解 <a href=\"https://docs.qq.com/doc/DQkJ6UHdkVWhneUV5\">《隐私政策》</a>各条;\n" +
+             "1.保护用户隐私是本游戏的一项基本政策,本游戏不会泄露您的个人信息;\n" +
+             "2.我们会根据您使用的具体功能需要,收集必要的用户信息(如申请设备信息,存储等相关权限);\n" +
+             "3.在您同意App隐私政策后,我们将进行集成SDK的初始化工作,会收集您的android_id、Mac地址、IMEI和应用安装列表,以保障App正常数据统计和安全风控;\n" +
+             "4.为了方便您的查阅,您可以通过“设置”重新查看该协议;\n" +
+             "5.您可以阅读完整版的隐私保护政策了解我们申请使用相关权限的情况,以及对您个人隐私的保护措施。";
+     
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+  
+        // 如果已经同意过隐私协议则直接进入Unity Activity
+        if (GetPrivacyAccept()){
+            EnterUnityActivity();
+            return;
+        }
+        // 弹出隐私协议对话框
+        ShowPrivacyDialog();
+    }
+ 
+    // 显示隐私协议对话框
+    private void ShowPrivacyDialog(){
+        WebView webView = new WebView(this);
+        webView.loadData(privacyContext, "text/html", "utf-8");         
+        AlertDialog.Builder privacyDialog = new AlertDialog.Builder(this);
+        privacyDialog.setCancelable(false);
+        privacyDialog.setView(webView);
+        privacyDialog.setTitle("提示");
+        privacyDialog.setNegativeButton("拒绝",this);
+        privacyDialog.setPositiveButton("同意",this);
+        privacyDialog.create().show();
+    }
+    
+    @Override
+    public void onClick(DialogInterface dialogInterface, int i) {
+        switch (i){
+            case AlertDialog.BUTTON_POSITIVE://点击同意按钮
+                SetPrivacyAccept(true);
+                EnterUnityActivity(); //启动Unity Activity
+                break;
+            case AlertDialog.BUTTON_NEGATIVE://点击拒绝按钮,直接退出App
+                finish();
+                break;
+        }
+    }
+    
+    // 启动Unity Activity
+    private void EnterUnityActivity(){
+        Intent unityAct = new Intent();
+        unityAct.setClassName(this, "com.taptap.xy.yousanjie.MainActivity");
+        this.startActivity(unityAct);
+    }
+    
+    // 本地存储保存同意隐私协议状态
+    private void SetPrivacyAccept(boolean accepted){
+        SharedPreferences.Editor prefs = this.getSharedPreferences("PlayerPrefs", MODE_PRIVATE).edit();
+        prefs.putBoolean("PrivacyAcceptedKey", accepted);
+        prefs.apply();
+    }
+    
+    // 获取是否已经同意过
+    private boolean GetPrivacyAccept(){
+        SharedPreferences prefs = this.getSharedPreferences("PlayerPrefs", MODE_PRIVATE);
+        return prefs.getBoolean("PrivacyAcceptedKey", false);
+    }
+}

+ 37 - 0
Assets/Plugins/Android/com.unity3d.player/PrivacyActivity.java.meta

@@ -0,0 +1,37 @@
+fileFormatVersion: 2
+guid: BnhL5iv4AX6yzYKGnt8m/oYWieDej0R0qUtHEBvvpdgvuYfQe5qSeMTrmcH2
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      HMIAndroid: HMIAndroid
+    second:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -3035,7 +3035,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3275273584098972649
 RectTransform:
   m_ObjectHideFlags: 0

Plik diff jest za duży
+ 0 - 0
Assets/Resources/PerformanceTestRunInfo.json


+ 0 - 7
Assets/Resources/PerformanceTestRunInfo.json.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DHsfti/7Bn6KrszqtCVz9xrvoh3COHRPR8rWK9SwiULnu2Dyni3X8amGtMZD
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 1
Assets/Resources/PerformanceTestRunSettings.json

@@ -1 +0,0 @@
-{"MeasurementCount":-1}

+ 0 - 7
Assets/Resources/PerformanceTestRunSettings.json.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WigasS3/V30NZ/ulgpiliwL8E18uaU2fYcXqooM08d6MQ7ic7JzDBQQU8tIh
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 4
Assets/TapSDK/CloudSave/link.xml

@@ -1,4 +0,0 @@
-<linker>
-  <assembly fullname="TapSDK.CloudSave.Runtime" preserve="all" />
-  <assembly fullname="TapSDK.CloudSave.Mobile.Runtime" preserve="all" />
-</linker>

+ 0 - 7
Assets/TapSDK/CloudSave/link.xml.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XngX53ukBSnFSAbVv8AT6S3DBFJZbvvmca8snvScUI5uHVT0VvAg+til+N0b
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 4
Assets/TapSDK/Core/link.xml

@@ -1,4 +0,0 @@
-<linker>
-  <assembly fullname="TapSDK.Core.Runtime" preserve="all" />
-  <assembly fullname="TapSDK.Core.Mobile.Runtime" preserve="all" />
-</linker>

+ 0 - 7
Assets/TapSDK/Core/link.xml.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XC4asS34UClzItH+/+JuTO4QNLkpQA2+mHdGlXlbGUgMnvGNisvJ5crcWdWo
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 4
Assets/TapSDK/Login/link.xml

@@ -1,4 +0,0 @@
-<linker>
-  <assembly fullname="TapSDK.Login.Runtime" preserve="all" />
-  <assembly fullname="TapSDK.Login.Mobile.Runtime" preserve="all" />
-</linker>

+ 0 - 7
Assets/TapSDK/Login/link.xml.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DC9Jsin/VChXZE6deLk2KwHKoSXpLS84OYOkkz+5dZ9rQ6MZM/0mMI04C7iL
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 106 - 218
UserSettings/Layouts/default-2022.dwlt

@@ -14,13 +14,13 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: -2494
-    y: 524
+    x: -1675
+    y: 300
     width: 1343
     height: 1078
   m_ShowMode: 0
   m_Title: Console
-  m_RootView: {fileID: 6}
+  m_RootView: {fileID: 5}
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
   m_Maximized: 0
@@ -38,41 +38,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: -1080
-    y: 533
-    width: 829
-    height: 521
-  m_ShowMode: 0
-  m_Title: Animation
-  m_RootView: {fileID: 8}
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_Maximized: 0
---- !u!114 &3
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_PixelRect:
-    serializedVersion: 2
-    x: 76
-    y: 243
-    width: 596
-    height: 1232
+    x: -1303
+    y: 155
+    width: 684
+    height: 1229
   m_ShowMode: 0
   m_Title: Game
-  m_RootView: {fileID: 10}
+  m_RootView: {fileID: 7}
   m_MinSize: {x: 200, y: 221}
   m_MaxSize: {x: 4000, y: 4021}
   m_Maximized: 0
---- !u!114 &4
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -92,11 +68,11 @@ MonoBehaviour:
     height: 1349
   m_ShowMode: 4
   m_Title: Hierarchy
-  m_RootView: {fileID: 11}
+  m_RootView: {fileID: 8}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !u!114 &5
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -117,12 +93,12 @@ MonoBehaviour:
     height: 1078
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 19}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 19}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &6
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -135,7 +111,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 5}
+  - {fileID: 4}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -145,60 +121,9 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 34578
+  controlID: 86
   draggingID: 0
---- !u!114 &7
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: AnimationWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 829
-    height: 521
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 20}
-  m_Panes:
-  - {fileID: 20}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &8
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 7}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 829
-    height: 521
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 33919
-  draggingID: 0
---- !u!114 &9
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -215,16 +140,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 596
-    height: 1232
+    width: 684
+    height: 1229
   m_MinSize: {x: 200, y: 221}
   m_MaxSize: {x: 4000, y: 4021}
-  m_ActualView: {fileID: 25}
+  m_ActualView: {fileID: 21}
   m_Panes:
-  - {fileID: 25}
+  - {fileID: 21}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -237,19 +162,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
+  - {fileID: 6}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 596
-    height: 1232
+    width: 684
+    height: 1229
   m_MinSize: {x: 200, y: 221}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
   controlID: 18
   draggingID: 0
---- !u!114 &11
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -262,9 +187,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 12}
-  - {fileID: 13}
-  - {fileID: 14}
+  - {fileID: 9}
+  - {fileID: 10}
+  - {fileID: 11}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -277,7 +202,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &12
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -299,7 +224,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &13
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -312,10 +237,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 18}
   - {fileID: 15}
-  - {fileID: 16}
-  - {fileID: 17}
+  - {fileID: 12}
+  - {fileID: 13}
+  - {fileID: 14}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -325,9 +250,9 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 50}
   m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 199
+  controlID: 134
   draggingID: 0
---- !u!114 &14
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -348,7 +273,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &15
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -365,16 +290,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1209
     y: 0
-    width: 426
+    width: 411
     height: 1299
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 22}
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 22}
+  - {fileID: 18}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &16
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -389,18 +314,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1635
+    x: 1620
     y: 0
-    width: 527
+    width: 542
     height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 24}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 24}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &17
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -419,14 +344,14 @@ MonoBehaviour:
     y: 0
     width: 398
     height: 1299
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 23}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 23}
+  - {fileID: 19}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &18
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -445,15 +370,15 @@ MonoBehaviour:
     y: 0
     width: 1209
     height: 1299
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 26}
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 22}
   m_Panes:
-  - {fileID: 26}
-  - {fileID: 21}
+  - {fileID: 22}
+  - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 1
---- !u!114 &19
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -473,8 +398,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -2494
-    y: 524
+    x: -1675
+    y: 300
     width: 1343
     height: 1057
   m_SerializedDataModeController:
@@ -487,44 +412,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &20
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Animation
-    m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: -1080
-    y: 533
-    width: 829
-    height: 500
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_LockTracker:
-    m_IsLocked: 0
-  m_LastSelectedObjectID: 52968
---- !u!114 &21
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -596,9 +484,9 @@ MonoBehaviour:
       e32: 0
       e33: 1
   m_PreviewAnimator: {fileID: 0}
-  m_AnimatorController: {fileID: 9100000, guid: edf91e3e885f22347b39b4067f6fabac, type: 2}
+  m_AnimatorController: {fileID: 9100000, guid: 497239a8d5fe4f84eb17a2d46596f013, type: 2}
   m_BreadCrumbs:
-  - m_Target: {fileID: -286912451515267344, guid: edf91e3e885f22347b39b4067f6fabac, type: 2}
+  - m_Target: {fileID: -7946071565220439783, guid: 497239a8d5fe4f84eb17a2d46596f013, type: 2}
     m_ScrollPosition: {x: 0, y: 0}
   stateMachineGraph: {fileID: 0}
   stateMachineGraphGUI: {fileID: 0}
@@ -611,7 +499,7 @@ MonoBehaviour:
   m_CurrentEditor: 0
   m_LayerEditor:
     m_SelectedLayerIndex: 0
---- !u!114 &22
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -633,7 +521,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1209
     y: 73
-    width: 424
+    width: 409
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -650,7 +538,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: ce85f1ffd685f1ff4487f1ff1c89f1ff2689f1ff3089f1ffe489f1fffc89f1ff268af1ff0ec9f1ff14c9f1ff14caf1ff58caf1ff5ccaf1ff6ecaf1ff74f1f6ff7cf1f6ffc0f2f6ffb026f7fff426f7fffc26f7ff0a27f7ffdec1f7ffe4c1f7ff76f0f7ff7ef0f7ff96f0f7ff38f1f7ff42f1f7ff4af1f7ff6af1f7ffdaf1f7ffde2af8ffec2af8ffca58f9ffd258f9ff1059f9ff8e59f9ff9859f9ffa059f9ff305af9ff585af9ff605af9ff3a92f9ff4092f9ff4093f9ff8493f9ff8893f9ff8c93f9ff9a93f9fff69efdfffc9efdff6ad3fdff02f0fdff0af0fdfff829fefffe29fefffe2afeff422bfeff462bfeff4a2bfeff582bfeffcaa3feffd8a3feff4eb6feff5cb6feff6828ffff6c28ffff7a28ffffa2b9ffff12baffff20baffff64f5ffff78fafffff4ffffffe8ce000016cf0000
+      m_ExpandedIDs: 2aaef6fff0aef6ff7ab8f6ff50fdf7ff54fdf7ff68fdf7ff6efdf7ff8c0df8ff520ef8ffdc17f8ff8037f8ff4638f8ffd041f8ff7020f9ff6435f9ff2a36f9ffb43ff9ffda3afcff3a55fcff0656fcff905ffcff5879fcff267afcffb083fcff682efeff822efeffb4e2feffb8e2feffcce2feffd2e2feff224dfffff04dffff1a56ffff8064ffff4e65ffffe66effffd475ffffd875ffffec75fffff275fffffae2ffffcee3ffff66edffff78fafffff4ffffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -666,7 +554,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 15}
+        m_ClientGUIView: {fileID: 12}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -674,7 +562,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &23
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -721,7 +609,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &24
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -741,9 +629,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1635
+    x: 1620
     y: 73
-    width: 525
+    width: 540
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -756,7 +644,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: gongfad
+    m_NameFilter: dial
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -766,24 +654,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res/UI/ItemDetailsPanel
+    - Assets/xiuxian/FXV/VolumeFog/URP/Shaders
     m_Globs: []
-    m_OriginalText: gongfad
+    m_OriginalText: dial
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/UI/ItemDetailsPanel
+  - Assets/xiuxian/FXV/VolumeFog/URP/Shaders
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\FB\XiuXianGame
+  m_LastProjectPath: D:\FB\XiuXianGame_Taptap
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 358}
-    m_SelectedIDs: 74ce0000
-    m_LastClickedID: 52852
-    m_ExpandedIDs: 00000000c0cd0000c2cd0000c4cd0000c6cd0000c8cd0000cacd0000cccd0000cecd0000d0cd0000d2cd0000d4cd0000d6cd0000f8cd00003ece000076ce000054ae010000ca9a3b
+    scrollPos: {x: 0, y: 1734}
+    m_SelectedIDs: 36b40200
+    m_LastClickedID: 177206
+    m_ExpandedIDs: 0000000006ac0000bcd10000bed10000c0d10000c2d10000c4d10000c6d10000c8d10000cad10000ccd10000ced10000d0d10000d2d10000d4d10000d6d10000d8d10000dad10000dcd10000ded1000038d2000062d200008ed20000fa95020038b402003ab4020000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -811,7 +699,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000c0cd0000c2cd0000c4cd0000c6cd0000c8cd0000cacd0000cccd0000cecd0000d0cd0000d2cd0000d4cd0000d6cd0000
+    m_ExpandedIDs: 00000000bcd10000bed10000c0d10000c2d10000c4d10000c6d10000c8d10000cad10000ccd10000ced10000d0d10000d2d10000d4d10000d6d10000d8d10000dad10000dcd10000ded10000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -839,23 +727,23 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: 86c800008cc8000088c8000080b90000
+    m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: GongFaDetailsPanel
-      m_OriginalName: GongFaDetailsPanel
+      m_Name: MainPanel
+      m_OriginalName: MainPanel
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 116006
+      m_UserData: 88648
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
       m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 16}
+      m_ClientGUIView: {fileID: 13}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -866,8 +754,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 275
---- !u!114 &25
+  m_DirectoriesAreaWidth: 195
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -887,10 +775,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 76
-    y: 243
-    width: 596
-    height: 1211
+    x: -1303
+    y: 155
+    width: 684
+    height: 1208
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -943,29 +831,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 596
-      height: 1190
-    m_Scale: {x: 0.73275864, y: 0.73275864}
-    m_Translation: {x: 298, y: 595}
+      width: 684
+      height: 1187
+    m_Scale: {x: 0.7309113, y: 0.7309113}
+    m_Translation: {x: 342, y: 593.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -406.68234
+      x: -467.90903
       y: -812
-      width: 813.3647
+      width: 935.81805
       height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.73275864
-  m_LastWindowPixelSize: {x: 596, y: 1211}
+  m_defaultScale: 0.7309113
+  m_LastWindowPixelSize: {x: 684, y: 1208}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &26
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1360,9 +1248,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.4246046, y: -1.8223176, z: 0.050965738}
+    m_Target: {x: -680.3896, y: -657.5704, z: 545676.56}
     speed: 2
-    m_Value: {x: 584.17346, y: 1014.9901, z: -4.106431}
+    m_Value: {x: 882.76715, y: 256.3372, z: -17.261051}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1412,9 +1300,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 2.958336
+    m_Target: 3707.3723
     speed: 2
-    m_Value: 699.7546
+    m_Value: 1796.8087
   m_Ortho:
     m_Target: 1
     speed: 2

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików