123 1 год назад
Родитель
Сommit
04b35b3807

Разница между файлами не показана из-за своего большого размера
+ 593 - 142
Assets/Content/Fonts/VAGRoundedStdRegularSDF.asset


BIN
Assets/Content/Icons/NewStory/img_login02.png


+ 16 - 16
Assets/Content/Prefabs/UI/UILanuch/UILanuch.prefab

@@ -202,10 +202,10 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u62B5\u5236\u4E0D\u826F\u6E38\u620F\uFF0C\u62D2\u7EDD\u76D7\u7248\u6E38\u620F\u3002\u6CE8\u610F\u81EA\u6211\u4FDD\u62A4\uFF0C\u8C28\u9632\u53D7\u9A97\u4E0A\u5F53\u3002\r\n\u9002\u5EA6\u6E38\u620F\u76CA\u8111\uFF0C\u6C89\u8FF7\u6E38\u620F\u4F24\u8EAB\u3002\u5408\u7406\u5B89\u6392\u6642\u95F4\uFF0C\u4EAB\u53D7\u5065\u5EB7\u751F\u6D3B\u3002\r\n\u8457\u4F5C\u6743\u4EBA\uFF1A\u6B66\u6C49\u6307\u60A6\u7F51\u7EDC\u79D1\u6280\u6709\u9650\u516C\u53F8
-    \u8457\u4F5C\u6743\u767B\u8BB0\u53F7\uFF1A2020SR1504967\n\u51FA\u7248\u5355\u4F4D\uFF1A\u5317\u4EAC\u79D1\u6D77\u7535\u5B50\u51FA\u7248\u793E
-    \u6279\u51C6\u6587\u53F7\uFF1A\u56FD\u65B0\u51FA\u5BA1[2018]1267\u53F7\n\u51FA\u7248\u7269\u53F7\uFF1AISBN
-    978-7-498-05603-0"
+  m_text: "\u62B5\u5236\u4E0D\u826F\u6E38\u620F\uFF0C\u62D2\u7EDD\u76D7\u7248\u6E38\u620F\u3002\u6CE8\u610F\u81EA\u6211\u4FDD\u62A4\uFF0C\u8C28\u9632\u53D7\u9A97\u4E0A\u5F53\u3002\r\n\u9002\u5EA6\u6E38\u620F\u76CA\u8111\uFF0C\u6C89\u8FF7\u6E38\u620F\u4F24\u8EAB\u3002\u5408\u7406\u5B89\u6392\u6642\u95F4\uFF0C\u4EAB\u53D7\u5065\u5EB7\u751F\u6D3B\u3002\r\n\u8457\u4F5C\u6743\u4EBA\uFF1A\u6B66\u6C49\u6A58\u8272\u6D77\u5CB8\u7EBF\u7F51\u7EDC\u79D1\u6280\u6709\u9650\u516C\u53F8
+    \u8457\u4F5C\u6743\u767B\u8BB0\u53F7\uFF1A2018SR483372\n\u51FA\u7248\u5355\u4F4D\uFF1A\u4E0A\u6D77\u7A7A\u4E2D\u5B8F\u7535\u7F51\u7EDC\u6280\u672F\u6709\u9650\u516C\u53F8
+    \u6279\u51C6\u6587\u53F7\uFF1A\u56FD\u65B0\u51FA\u5BA1[2019]3416\u53F7\n\u51FA\u7248\u7269\u53F7\uFF1AISBN
+    978-7-498-07088-3"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
   m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505,
@@ -1508,7 +1508,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &6168732449595307662
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1530,7 +1530,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 170}
-  m_SizeDelta: {x: 840, y: 50}
+  m_SizeDelta: {x: 840, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &8325258438246587538
 MonoBehaviour:
@@ -8391,8 +8391,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 500}
-  m_SizeDelta: {x: 920, y: 292}
+  m_AnchoredPosition: {x: 0, y: 300}
+  m_SizeDelta: {x: 895, y: 485}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5882261254970375091
 CanvasRenderer:
@@ -9961,7 +9961,7 @@ RectTransform:
   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: 448, y: 44}
+  m_SizeDelta: {x: 448, y: 81}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2742791068091194763
 CanvasRenderer:
@@ -9984,7 +9984,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0.5688944, b: 1, a: 0.4117647}
+  m_Color: {r: 0, g: 0.5688944, b: 1, a: 0.39215687}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -10301,7 +10301,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 368.005, y: -22.01}
-  m_SizeDelta: {x: 616.01, y: 34.02}
+  m_SizeDelta: {x: 616.01, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2446754421016673636
 CanvasRenderer:
@@ -10331,7 +10331,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u6211\u5DF2\u8BE6\u7EC6\u9605\u8BFB\u5E76\u540C\u610F<link=>\u300A\u7528\u6237\u534F\u8BAE\u300B</link>\u548C\u300A\u9690\u79C1\u653F\u7B56\u300B"
+  m_text: "\u6211\u5DF2\u8BE6\u7EC6\u9605\u8BFB\u5E76\u540C\u610F<u><color=#00ab65><link=https://www.i7game.com/mobile/user/protocol.html>\u300A\u7528\u6237\u534F\u8BAE\u300B</link></color></u>\u548C<u><color=#00ab65><link=https://www.i7game.com/mobile/user/privacy.html>\u300A\u9690\u79C1\u653F\u7B56\u300B</link></color></u>"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
   m_sharedMaterial: {fileID: 2100000, guid: 2a55426dee1005f4ba060aaad88233c4, type: 2}
@@ -10353,7 +10353,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -10366,8 +10366,8 @@ MonoBehaviour:
   m_fontSizeMax: 72
   m_fontStyle: 0
   m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 513
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
@@ -10518,7 +10518,7 @@ RectTransform:
   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: 448, y: 44}
+  m_SizeDelta: {x: 448, y: 81}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3359823752756287131
 CanvasRenderer:

BIN
Assets/Content/Raw_Art/UI/UILanuch/LOGO1.png


BIN
Assets/Content/Raw_Art/UI/UILanuch/img_login00.png


BIN
Assets/Content/Raw_Art/UI/UILanuch/img_login01.png


BIN
Assets/Content/Raw_Art/UI/UILanuch/txt_login_cn.png


+ 1 - 1
Assets/Lua/Core/PlatformPack.lua

@@ -2,7 +2,7 @@ local PlatformPack = {
 	URL_KEY = 'http://43.248.187.68:81//',
 	SERVERLIST_URL = 'http://43.248.187.68:81//serverlist',
 	NOTIFY_URL = 'http://43.248.187.68:88//res/NoticeNew/',
-	SPECIAL_INFO_URL = 'http://43.248.187.68:81//channel',
+	SPECIAL_INFO_URL = 'http://43.248.187.68:88//res/Channel/agreement.json',
 	CUSTOMER_SERVICE_INFO_URL = 'http://43.248.187.68:81//vipService',
 }
 

+ 12 - 9
Assets/Lua/Managers/LoginMgr.lua

@@ -382,15 +382,17 @@ function LoginMgr:StartCheckSpecialInfo()
     if self.checkWWW then
         self.checkWWW:Dispose()
     end
-    local url = PlatformPack.SPECIAL_INFO_URL .. '?timesamp=' .. tostring(os.time())
-	local platform = ManagerContainer.LuaGameMgr.platform
-	if platform and platform ~= '' then
-		url = url .. '&platform=' .. tostring(platform)
-	end
-	local subplatform = ManagerContainer.LuaGameMgr.channelName
-	if subplatform and subplatform ~= '' then
-		url = url .. '&sub_platform=' .. tostring(subplatform)
-	end
+    local url = PlatformPack.SPECIAL_INFO_URL-- .. '?timesamp=' .. tostring(os.time())
+	-- local platform = ManagerContainer.LuaGameMgr.platform
+	-- if platform and platform ~= '' then
+	-- 	url = url .. '&platform=' .. tostring(platform)
+	-- end
+	-- local subplatform = ManagerContainer.LuaGameMgr.channelName
+	-- if subplatform and subplatform ~= '' then
+	-- 	url = url .. '&sub_platform=' .. tostring(subplatform)
+	-- end
+    --LogError(url)
+    --self.agreement =  "我已详细阅读并同意<link=https://www.i7game.com/mobile/user/protocol.html>《用户协议》</link>和<link=https://www.i7game.com/mobile/user/privacy.html>《隐私政策》</link>"--
     self.checkWWW = UnityEngine.WWW(url)
 end
 
@@ -418,6 +420,7 @@ function LoginMgr:CheckSpecialInfoFail()
     if self.checkWWW then
         self.checkWWW:Dispose()
     end
+   
     self.checkWWW = nil
     self:StartCheckServer()
 end

+ 10 - 7
Assets/Lua/UI/UILanuch/UILanuchView.lua

@@ -36,7 +36,7 @@ function UILanuchView:Init()
 	else
 		self.loginAnim.animator:Play('LoginKeep')
 	end
-	self.btnCADPA:SetActive(false)
+	self.btnCADPA:SetActive(true)
 	self.loginRoot:SetActive(false)
 	self.loadingRoot:SetActive(false)
 	self.logo:SetActive(true)
@@ -44,11 +44,14 @@ function UILanuchView:Init()
 	self:RefreshServer()
 	self:RefreshVersionCode()
 	self:RefreshSpecialInfo()
-	if PlatformPack.ShowHealthBulletin then
-		self.editionTxt:SetActive(true)
-	else
-		self.editionTxt:SetActive(false)
-	end
+
+	self.editionTxt:SetActive(true)
+	
+	-- if PlatformPack.ShowHealthBulletin then
+	-- 	self.editionTxt:SetActive(true)
+	-- else
+	-- 	self.editionTxt:SetActive(false)
+	-- end
 end
 
 function UILanuchView:RemoveEventListener()
@@ -69,7 +72,7 @@ end
 
 function UILanuchView:OnShow(data)
 	self.controller:SetData(data)
-	self.btnCADPA:SetActive(false)
+	self.btnCADPA:SetActive(true)
 end
 
 function UILanuchView:OnClose()

+ 2 - 0
Assets/Plugins/VuplexWebViewChromium/debug.log

@@ -0,0 +1,2 @@
+[0114/170724.046:ERROR:context.cc(556)] The cache_path directory (C:/Users/Administrator/AppData/LocalLow/WentingTec/瓒呭啋闄╁皬闀囩墿璇?\Vuplex.WebView\chromium-cache) could not be created.
+[0115/093725.551:ERROR:context.cc(556)] The cache_path directory (C:/Users/Administrator/AppData/LocalLow/WentingTec/瓒呭啋闄╁皬闀囩墿璇?\Vuplex.WebView\chromium-cache) could not be created.

+ 7 - 0
Assets/Plugins/VuplexWebViewChromium/debug.log.meta

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

+ 1 - 1
Assets/Src/Core/DownLoad/AssetDownloader.cs

@@ -34,7 +34,7 @@ public class AssetDownloader : SingletonMono<AssetDownloader>
     {
         if (!CancelDownLoad && HasNotDownloadedEntity())
         {
-            while (HasIdleTask())
+            if (HasIdleTask())
             {
                 DownloadTask task = FindIdleTask();
                 //

BIN
GPUCache/data_0


BIN
GPUCache/data_1


BIN
GPUCache/data_2


BIN
GPUCache/data_3


BIN
GPUCache/index


+ 33 - 47
ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: WentingTec
-  productName: "\u5FC3\u529B\u7269\u8BED"
+  productName: "\u8D85\u5192\u9669\u5C0F\u9547\u7269\u8BED2"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}
@@ -21,7 +21,7 @@ PlayerSettings:
   m_ShowUnitySplashLogo: 1
   m_SplashScreenOverlayOpacity: 1
   m_SplashScreenAnimation: 0
-  m_SplashScreenLogoStyle: 1
+  m_SplashScreenLogoStyle: 0
   m_SplashScreenDrawMode: 0
   m_SplashScreenBackgroundAnimationZoom: 1
   m_SplashScreenLogoAnimationZoom: 1
@@ -42,8 +42,6 @@ PlayerSettings:
   m_SplashScreenLogos:
   - logo: {fileID: 21300000, guid: f8d525a61ebf6c94682727cb97feeaa3, type: 3}
     duration: 2
-  - logo: {fileID: 21300000, guid: 5dbb0c14d9cbf754ca68dc0c1b8d51ff, type: 3}
-    duration: 2
   m_VirtualRealitySplashScreen: {fileID: 0}
   m_HolographicTrackingLossScreen: {fileID: 0}
   defaultScreenWidth: 480
@@ -141,7 +139,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.0.0.6
+  bundleVersion: 0.1.0.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -170,7 +168,7 @@ PlayerSettings:
     iPhone: 0.1.0.2
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
-  AndroidBundleVersionCode: 1000006
+  AndroidBundleVersionCode: 10000
   AndroidMinSdkVersion: 23
   AndroidTargetSdkVersion: 34
   AndroidPreferredInstallLocation: 1
@@ -282,7 +280,7 @@ PlayerSettings:
   - m_BuildTarget: 
     m_Icons:
     - serializedVersion: 2
-      m_Icon: {fileID: 2800000, guid: 6374958e8ea2d4b298139be0e9f3ed31, type: 3}
+      m_Icon: {fileID: 2800000, guid: ac9fb38a31625534fb9313dbfb04a409, type: 3}
       m_Width: 128
       m_Height: 128
       m_Kind: 0
@@ -319,74 +317,62 @@ PlayerSettings:
       m_Height: 81
       m_Kind: 2
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 6dcff828c1b917f488f7d34273f2f98d, type: 3}
+    - m_Textures: []
       m_Width: 192
       m_Height: 192
       m_Kind: 1
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: a32a51eff6097144094d766d17d5e0ab, type: 3}
+    - m_Textures: []
       m_Width: 144
       m_Height: 144
       m_Kind: 1
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 29fd9c74ffcc6e9478635490c656b675, type: 3}
+    - m_Textures: []
       m_Width: 96
       m_Height: 96
       m_Kind: 1
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: fc2648ac3df291148a46120935c53719, type: 3}
+    - m_Textures: []
       m_Width: 72
       m_Height: 72
       m_Kind: 1
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 70d59af57e8c6ec41bb5fa5feb9cbe83, type: 3}
+    - m_Textures: []
       m_Width: 48
       m_Height: 48
       m_Kind: 1
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 1913e24dbb846364bbbc91b14b9f36c6, type: 3}
+    - m_Textures: []
       m_Width: 36
       m_Height: 36
       m_Kind: 1
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 6dcff828c1b917f488f7d34273f2f98d, type: 3}
+    - m_Textures: []
       m_Width: 192
       m_Height: 192
       m_Kind: 0
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: a32a51eff6097144094d766d17d5e0ab, type: 3}
+    - m_Textures: []
       m_Width: 144
       m_Height: 144
       m_Kind: 0
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 29fd9c74ffcc6e9478635490c656b675, type: 3}
+    - m_Textures: []
       m_Width: 96
       m_Height: 96
       m_Kind: 0
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: fc2648ac3df291148a46120935c53719, type: 3}
+    - m_Textures: []
       m_Width: 72
       m_Height: 72
       m_Kind: 0
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 70d59af57e8c6ec41bb5fa5feb9cbe83, type: 3}
+    - m_Textures: []
       m_Width: 48
       m_Height: 48
       m_Kind: 0
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 1913e24dbb846364bbbc91b14b9f36c6, type: 3}
+    - m_Textures: []
       m_Width: 36
       m_Height: 36
       m_Kind: 0
@@ -394,49 +380,49 @@ PlayerSettings:
   - m_BuildTarget: iPhone
     m_Icons:
     - m_Textures:
-      - {fileID: 2800000, guid: a1700d1903faf4807b0ba9e184c2d6a3, type: 3}
+      - {fileID: 0}
       m_Width: 180
       m_Height: 180
       m_Kind: 0
       m_SubKind: iPhone
     - m_Textures:
-      - {fileID: 2800000, guid: 94d5dfc7c637a473e9887d7f06f940c2, type: 3}
+      - {fileID: 0}
       m_Width: 120
       m_Height: 120
       m_Kind: 0
       m_SubKind: iPhone
     - m_Textures:
-      - {fileID: 2800000, guid: c559ff4126f5d4950834d409fca25ccc, type: 3}
+      - {fileID: 0}
       m_Width: 167
       m_Height: 167
       m_Kind: 0
       m_SubKind: iPad
     - m_Textures:
-      - {fileID: 2800000, guid: e7c049a1569cc42fea55811fb4cdbcb8, type: 3}
+      - {fileID: 0}
       m_Width: 152
       m_Height: 152
       m_Kind: 0
       m_SubKind: iPad
     - m_Textures:
-      - {fileID: 2800000, guid: 4ec4058331e444ef790ec88acf9faf3d, type: 3}
+      - {fileID: 0}
       m_Width: 76
       m_Height: 76
       m_Kind: 0
       m_SubKind: iPad
     - m_Textures:
-      - {fileID: 2800000, guid: 94d5dfc7c637a473e9887d7f06f940c2, type: 3}
+      - {fileID: 0}
       m_Width: 120
       m_Height: 120
       m_Kind: 3
       m_SubKind: iPhone
     - m_Textures:
-      - {fileID: 2800000, guid: a3258c6e121d04f30b2765d0cb75d8b7, type: 3}
+      - {fileID: 0}
       m_Width: 80
       m_Height: 80
       m_Kind: 3
       m_SubKind: iPhone
     - m_Textures:
-      - {fileID: 2800000, guid: a3258c6e121d04f30b2765d0cb75d8b7, type: 3}
+      - {fileID: 0}
       m_Width: 80
       m_Height: 80
       m_Kind: 3
@@ -447,37 +433,37 @@ PlayerSettings:
       m_Kind: 3
       m_SubKind: iPad
     - m_Textures:
-      - {fileID: 2800000, guid: 9492644cb23c6442387e83de3143f753, type: 3}
+      - {fileID: 0}
       m_Width: 87
       m_Height: 87
       m_Kind: 1
       m_SubKind: iPhone
     - m_Textures:
-      - {fileID: 2800000, guid: 38d9ad06b176244f4be60f3c4e9851bb, type: 3}
+      - {fileID: 0}
       m_Width: 58
       m_Height: 58
       m_Kind: 1
       m_SubKind: iPhone
     - m_Textures:
-      - {fileID: 2800000, guid: 14322bd1d21154803a7435f241b06d4c, type: 3}
+      - {fileID: 0}
       m_Width: 29
       m_Height: 29
       m_Kind: 1
       m_SubKind: iPhone
     - m_Textures:
-      - {fileID: 2800000, guid: 38d9ad06b176244f4be60f3c4e9851bb, type: 3}
+      - {fileID: 0}
       m_Width: 58
       m_Height: 58
       m_Kind: 1
       m_SubKind: iPad
     - m_Textures:
-      - {fileID: 2800000, guid: 14322bd1d21154803a7435f241b06d4c, type: 3}
+      - {fileID: 0}
       m_Width: 29
       m_Height: 29
       m_Kind: 1
       m_SubKind: iPad
     - m_Textures:
-      - {fileID: 2800000, guid: 4835a47a3815a421fa419dd58190dce9, type: 3}
+      - {fileID: 0}
       m_Width: 60
       m_Height: 60
       m_Kind: 2
@@ -493,13 +479,13 @@ PlayerSettings:
       m_Kind: 2
       m_SubKind: iPad
     - m_Textures:
-      - {fileID: 2800000, guid: b64ea29ac28134d1f85905262f138780, type: 3}
+      - {fileID: 0}
       m_Width: 20
       m_Height: 20
       m_Kind: 2
       m_SubKind: iPad
     - m_Textures:
-      - {fileID: 2800000, guid: 6374958e8ea2d4b298139be0e9f3ed31, type: 3}
+      - {fileID: 0}
       m_Width: 1024
       m_Height: 1024
       m_Kind: 4

Некоторые файлы не были показаны из-за большого количества измененных файлов