From f02a778a83f869eac08e1761991bd8e87113f9f3 Mon Sep 17 00:00:00 2001 From: touka <617088122@qq.com> Date: Thu, 23 Nov 2023 12:18:51 +0800 Subject: [PATCH] no message --- .../Editor/Build/Editor_Android/export_apk.sh | 2 +- .../Editor/Build/Editor_iOS/export_ipa.sh | 2 +- .../Core/StringKey/StringKeyManger.cs | 22 +---- .../AndroidJPSDK/JoyPacCurrentcyAdSingle.cs | 2 +- .../Joypac/Scripts/JoypacAnalyticsManager.cs | 7 +- .../Assets/Joypac/Scripts/Tool/JoypacUtils.cs | 5 +- .../CornField_Seedling_one_a.psb.meta | 3 + .../CornField_Seedling_one_b.psb.meta | 3 + .../CornField_Seedling_one_c.psb.meta | 3 + .../CornField_Seedling_one_d.psb.meta | 3 + .../CornField_Seedling_three_a.psb.meta | 3 + .../CornField_Seedling_three_b.psb.meta | 3 + .../CornField_Seedling_three_c.psb.meta | 3 + .../CornField_Seedling_three_d.psb.meta | 3 + .../CornField_Seedling_two_a.psb.meta | 3 + .../CornField_Seedling_two_b.psb.meta | 3 + .../CornField_Seedling_two_c.psb.meta | 3 + .../CornField_Seedling_two_d.psb.meta | 3 + .../Scenes/Main/Scripts/KitchenManager.cs | 2 +- .../Scripts/InitializeUnityEditorChecker.cs | 9 -- popcorn/Logs/Packages-Update.log | 16 ++++ popcorn/Packages/manifest.json | 18 ++-- popcorn/Packages/packages-lock.json | 90 ++++++++----------- .../AndroidResolverDependencies.xml | 4 +- .../AutoStreamingSettings.asset | 21 +++++ .../PackageManagerSettings.asset | 24 +++-- popcorn/ProjectSettings/ProjectSettings.asset | 29 ++++-- popcorn/ProjectSettings/ProjectVersion.txt | 4 +- 28 files changed, 166 insertions(+), 127 deletions(-) create mode 100644 popcorn/ProjectSettings/AutoStreamingSettings.asset diff --git a/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_Android/export_apk.sh b/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_Android/export_apk.sh index 36bd3575..0971592b 100644 --- a/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_Android/export_apk.sh +++ b/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_Android/export_apk.sh @@ -31,7 +31,7 @@ PROJ_PATH=${CurrentScriptPath//${CurrentScriptRelativePath}//""} PROJ_PATH=${PROJ_PATH%?} # unity app path -UNITY_PATH=/Applications/Unity/Hub/Editor/2021.3.3f1/Unity.app/Contents/MacOS/Unity +UNITY_PATH=/Applications/Unity/Hub/Editor/2021.3.20f1c1/Unity.app/Contents/MacOS/Unity # 构建日志的输出路径 LOG_PATH=$PROJ_PATH/BuildProductDir/Android/Log/BuildApk.log diff --git a/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_iOS/export_ipa.sh b/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_iOS/export_ipa.sh index b4b68dbd..3d5fa275 100644 --- a/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_iOS/export_ipa.sh +++ b/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_iOS/export_ipa.sh @@ -31,7 +31,7 @@ PROJ_PATH=${CurrentScriptPath//${CurrentScriptRelativePath}//""} PROJ_PATH=${PROJ_PATH%?} # unity app path -UNITY_PATH=/Applications/Unity/Hub/Editor/2021.3.3f1/Unity.app/Contents/MacOS/Unity +UNITY_PATH=/Applications/Unity/Hub/Editor/2021.3.20f1c1/Unity.app/Contents/MacOS/Unity # 构建日志的输出路径 LOG_PATH=$PROJ_PATH/BuildProductDir/iOS/Log/BuildIpa.log diff --git a/popcorn/Assets/JoyPacSDK/Core/StringKey/StringKeyManger.cs b/popcorn/Assets/JoyPacSDK/Core/StringKey/StringKeyManger.cs index 35a6e878..861dfacd 100644 --- a/popcorn/Assets/JoyPacSDK/Core/StringKey/StringKeyManger.cs +++ b/popcorn/Assets/JoyPacSDK/Core/StringKey/StringKeyManger.cs @@ -1,11 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using Newtonsoft.Json; -using System; using System.IO; -using Newtonsoft.Json.Linq; -using System.Text; using UnityEngine.Networking; public class StringKeyManger @@ -76,8 +72,6 @@ public class StringKeyManger if (dic.Count == 0) return; CreatFile(); - string jsonStr = JsonConvert.SerializeObject(dic); - Debug.Log("JoyPacSDK写入参数: " + jsonStr); if (!File.Exists(jsonPath)) // 判断是否已有相同文件 { @@ -87,8 +81,6 @@ public class StringKeyManger File.WriteAllText(jsonPath, ""); - File.WriteAllText(jsonPath, JsonConvert.SerializeObject(jsonStr)); - isUndateStringKey = true; @@ -147,16 +139,7 @@ public class StringKeyManger isUndateStringKey = false; #elif UNITY_ANDROID - TextAsset text = Resources.Load(JsonName); - string json = (string)new JsonSerializer().Deserialize(new JsonTextReader(new StringReader((text.text)))); - if (string.IsNullOrEmpty(json)) - { - Debug.LogError(JsonPath + "---------不存在此json文件请先生成json文件"); - return null; - } - - stringsKey = JsonConvert.DeserializeObject(json); - isUndateStringKey = false; + #endif return stringsKey; @@ -182,9 +165,6 @@ public class StringKeyManger return settingKey; } - string json = (string)new JsonSerializer().Deserialize(new JsonTextReader(new StringReader((File.ReadAllText(BuildJsonPath))))); - - settingKey = JsonConvert.DeserializeObject(json); return settingKey; } diff --git a/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacCurrentcyAdSingle.cs b/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacCurrentcyAdSingle.cs index 066080f4..c7eb4b42 100644 --- a/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacCurrentcyAdSingle.cs +++ b/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacCurrentcyAdSingle.cs @@ -325,7 +325,7 @@ public class JoyPacCurrentcyAdSingle public int getAndroidVersion() { - return _currentcyAdSinglePlugin.Call("getAndroidVersion"); + return 1; } } diff --git a/popcorn/Assets/Joypac/Scripts/JoypacAnalyticsManager.cs b/popcorn/Assets/Joypac/Scripts/JoypacAnalyticsManager.cs index c2464c04..0366a55c 100644 --- a/popcorn/Assets/Joypac/Scripts/JoypacAnalyticsManager.cs +++ b/popcorn/Assets/Joypac/Scripts/JoypacAnalyticsManager.cs @@ -14,7 +14,6 @@ using GameAnalyticsSDK; using GameAnalyticsSDK.Events; using GameAnalyticsSDK.Wrapper; using LitJson; -using Newtonsoft.Json; using Umeng; using UnityEngine; @@ -39,6 +38,9 @@ public class JoypacAnalyticsManager : MonoBehaviour s_instance = GameObject.FindObjectOfType(); if (s_instance == null) { + //PlayerPrefs.DeleteAll(); + //PlayerPrefs.Save(); + //Debug.Log("yangwu clear"); GameObject Joypac = new GameObject(); Joypac.name = "JoypacAnalyticsManager"; s_instance = Joypac.AddComponent(); @@ -103,7 +105,7 @@ public class JoypacAnalyticsManager : MonoBehaviour return null; } - return "[" + JsonConvert.SerializeObject(jsonObject) + "]"; + return null; } public void ReYun(VolcanoReYunJson json) @@ -155,7 +157,6 @@ public class JoypacAnalyticsManager : MonoBehaviour public void Volcano(VolcanoReYunJson json) { // ReYUNTracking.Instance.setEvent(json.eventname, json.values.toJson()); - Debug.Log("VolcanoVolcano" + json.eventname + " " + JsonConvert.SerializeObject(json.values)); #if UNITY_IOS && JOYPAC_Volcano_OS&&!UNITY_EDITOR JoypacAdClient.Instance.UploadEvent(json.eventname, JsonConvert.SerializeObject(json.values)); #endif diff --git a/popcorn/Assets/Joypac/Scripts/Tool/JoypacUtils.cs b/popcorn/Assets/Joypac/Scripts/Tool/JoypacUtils.cs index d8660786..9d4b4aab 100644 --- a/popcorn/Assets/Joypac/Scripts/Tool/JoypacUtils.cs +++ b/popcorn/Assets/Joypac/Scripts/Tool/JoypacUtils.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Runtime.InteropServices; -using Newtonsoft.Json.Linq; using UnityEngine; public static class JoypacUtils { @@ -293,9 +292,7 @@ public static class JoypacUtils { try { - JObject jobject = JObject.Parse(JoypacUtils.extraData); - string results = jobject[_param.Key].ToString(); - value = results; + return value; } catch diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_one_a.psb.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_one_a.psb.meta index 8e5fca41..fecfd47f 100644 --- a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_one_a.psb.meta +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_one_a.psb.meta @@ -47,6 +47,7 @@ ScriptedImporter: flipbookRows: 0 flipbookColumns: 0 ignorePngGamma: 0 + cookieMode: 0 filterMode: 1 aniso: 1 mipBias: 0 @@ -89,6 +90,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: - name: CornFieldImage @@ -1621,6 +1623,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} characterData: bones: - name: bone_root diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_one_b.psb.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_one_b.psb.meta index 8d8a2c23..7eddbfc2 100644 --- a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_one_b.psb.meta +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_one_b.psb.meta @@ -47,6 +47,7 @@ ScriptedImporter: flipbookRows: 0 flipbookColumns: 0 ignorePngGamma: 0 + cookieMode: 0 filterMode: 1 aniso: 1 mipBias: 0 @@ -89,6 +90,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: - name: CornFieldImage @@ -2633,6 +2635,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} characterData: bones: - name: bone_1 diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_one_c.psb.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_one_c.psb.meta index e24fd9fb..09108381 100644 --- a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_one_c.psb.meta +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_one_c.psb.meta @@ -47,6 +47,7 @@ ScriptedImporter: flipbookRows: 0 flipbookColumns: 0 ignorePngGamma: 0 + cookieMode: 0 filterMode: 1 aniso: 1 mipBias: 0 @@ -89,6 +90,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: - name: CornFieldImage @@ -1774,6 +1776,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} characterData: bones: - name: bone_root diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_one_d.psb.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_one_d.psb.meta index 0a6e2ec3..b77f8fcf 100644 --- a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_one_d.psb.meta +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_one_d.psb.meta @@ -47,6 +47,7 @@ ScriptedImporter: flipbookRows: 0 flipbookColumns: 0 ignorePngGamma: 0 + cookieMode: 0 filterMode: 1 aniso: 1 mipBias: 0 @@ -89,6 +90,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: - name: CornFieldImage @@ -2250,6 +2252,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} characterData: bones: - name: bone_root diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_a.psb.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_a.psb.meta index 95fb291d..cc2e45de 100644 --- a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_a.psb.meta +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_a.psb.meta @@ -53,6 +53,7 @@ ScriptedImporter: flipbookRows: 0 flipbookColumns: 0 ignorePngGamma: 0 + cookieMode: 0 filterMode: 1 aniso: 1 mipBias: 0 @@ -95,6 +96,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: - name: CornFieldImage @@ -1675,6 +1677,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} characterData: bones: - name: bone_root diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_b.psb.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_b.psb.meta index 3a14dc13..d66f6245 100644 --- a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_b.psb.meta +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_b.psb.meta @@ -53,6 +53,7 @@ ScriptedImporter: flipbookRows: 0 flipbookColumns: 0 ignorePngGamma: 0 + cookieMode: 0 filterMode: 1 aniso: 1 mipBias: 0 @@ -95,6 +96,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: - name: CornFieldImage @@ -4626,6 +4628,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} characterData: bones: - name: bone_1 diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_c.psb.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_c.psb.meta index 57a6b799..96bfe673 100644 --- a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_c.psb.meta +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_c.psb.meta @@ -53,6 +53,7 @@ ScriptedImporter: flipbookRows: 0 flipbookColumns: 0 ignorePngGamma: 0 + cookieMode: 0 filterMode: 1 aniso: 1 mipBias: 0 @@ -95,6 +96,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: - name: CornFieldImage @@ -3910,6 +3912,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} characterData: bones: - name: bone_root diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_d.psb.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_d.psb.meta index 299ec7d2..380aa434 100644 --- a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_d.psb.meta +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_d.psb.meta @@ -53,6 +53,7 @@ ScriptedImporter: flipbookRows: 0 flipbookColumns: 0 ignorePngGamma: 0 + cookieMode: 0 filterMode: 1 aniso: 1 mipBias: 0 @@ -95,6 +96,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: - name: CornFieldImage @@ -2592,6 +2594,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} characterData: bones: - name: bone_root diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_a.psb.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_a.psb.meta index 3b652295..07fd3c27 100644 --- a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_a.psb.meta +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_a.psb.meta @@ -50,6 +50,7 @@ ScriptedImporter: flipbookRows: 0 flipbookColumns: 0 ignorePngGamma: 0 + cookieMode: 0 filterMode: 1 aniso: 1 mipBias: 0 @@ -92,6 +93,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: - name: CornFieldImage @@ -1704,6 +1706,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} characterData: bones: - name: bone_root diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_b.psb.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_b.psb.meta index 2bf481d3..f79a88ef 100644 --- a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_b.psb.meta +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_b.psb.meta @@ -50,6 +50,7 @@ ScriptedImporter: flipbookRows: 0 flipbookColumns: 0 ignorePngGamma: 0 + cookieMode: 0 filterMode: 1 aniso: 1 mipBias: 0 @@ -92,6 +93,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: - name: CornFieldImage @@ -2794,6 +2796,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} characterData: bones: - name: bone_1 diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_c.psb.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_c.psb.meta index 1c132572..41f1e6fd 100644 --- a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_c.psb.meta +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_c.psb.meta @@ -50,6 +50,7 @@ ScriptedImporter: flipbookRows: 0 flipbookColumns: 0 ignorePngGamma: 0 + cookieMode: 0 filterMode: 1 aniso: 1 mipBias: 0 @@ -92,6 +93,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: - name: CornFieldImage @@ -3011,6 +3013,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} characterData: bones: - name: bone_root diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_d.psb.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_d.psb.meta index b21c8325..27fa9ebf 100644 --- a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_d.psb.meta +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_d.psb.meta @@ -50,6 +50,7 @@ ScriptedImporter: flipbookRows: 0 flipbookColumns: 0 ignorePngGamma: 0 + cookieMode: 0 filterMode: 1 aniso: 1 mipBias: 0 @@ -92,6 +93,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: - name: CornFieldImage @@ -1956,6 +1958,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} characterData: bones: - name: bone_root diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 53af958c..3960caee 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -214,7 +214,7 @@ public class KitchenManager : MonoBehaviour globalGameData.ViewedShopLevel = 0; // アイテム付与 globalGameData.CornSeed = 100; - globalGameData.Coin = 0; + globalGameData.Coin = 99999999; if (!(globalGameData.Material.FirstOrDefault(x => x.Id == 2) is MaterialData materialData)) { materialData = new MaterialData {Id = 2}; diff --git a/popcorn/Assets/USAYAUnityLib/Scripts/InitializeUnityEditorChecker.cs b/popcorn/Assets/USAYAUnityLib/Scripts/InitializeUnityEditorChecker.cs index 138a61d7..f0b2449c 100644 --- a/popcorn/Assets/USAYAUnityLib/Scripts/InitializeUnityEditorChecker.cs +++ b/popcorn/Assets/USAYAUnityLib/Scripts/InitializeUnityEditorChecker.cs @@ -4,15 +4,6 @@ public sealed class InitializeUnityEditorChecker : MonoBehaviour { [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)] static void Initialize(){ -#if UNITY_EDITOR - if(Application.unityVersion != Const.UnityVersion){ - Debug.LogError("現在開いているUnityのVersionが " + Const.UnityVersion + " ではない為停止します。UnityのVersionは必ず合わせて下さい。"); - UnityEditor.EditorApplication.isPlaying = false; - } - // var unityChecker = new GameObject("UnityChecker"); - // DontDestroyOnLoad(unityChecker); - // unityChecker.AddComponent(); -#endif } } diff --git a/popcorn/Logs/Packages-Update.log b/popcorn/Logs/Packages-Update.log index 47267871..e8d809cf 100644 --- a/popcorn/Logs/Packages-Update.log +++ b/popcorn/Logs/Packages-Update.log @@ -48,3 +48,19 @@ The following packages were updated: com.unity.2d.pixel-perfect from version 2.0.4 to 2.1.0 com.unity.2d.psdimporter from version 2.1.5 to 2.1.6 com.unity.2d.spriteshape from version 3.0.13 to 3.0.14 + +=== Thu Nov 23 11:04:03 2023 + +Packages were changed. +Update Mode: updateDependencies + +The following packages were updated: + com.unity.2d.animation from version 7.0.5 to 7.0.9 + com.unity.2d.pixel-perfect from version 5.0.1 to 5.0.3 + com.unity.2d.psdimporter from version 6.0.3 to 6.0.7 + com.unity.2d.spriteshape from version 7.0.4 to 7.0.6 + com.unity.burst from version 1.6.5 to 1.6.6 + com.unity.collab-proxy from version 1.15.16 to 2.0.1 + com.unity.collections from version 1.2.3 to 1.2.4 + com.unity.ide.rider from version 3.0.14 to 3.0.18 + com.unity.ide.visualstudio from version 2.0.15 to 2.0.17 diff --git a/popcorn/Packages/manifest.json b/popcorn/Packages/manifest.json index 240d82f9..4bd767e8 100644 --- a/popcorn/Packages/manifest.json +++ b/popcorn/Packages/manifest.json @@ -2,18 +2,18 @@ "dependencies": { "com.coffee.ui-effect": "https://github.com/mob-sakai/UIEffect.git", "com.coffee.unmask": "https://github.com/mob-sakai/UnmaskForUGUI.git", - "com.unity.2d.animation": "7.0.5", - "com.unity.2d.pixel-perfect": "5.0.1", - "com.unity.2d.psdimporter": "6.0.3", + "com.unity.2d.animation": "7.0.9", + "com.unity.2d.pixel-perfect": "5.0.3", + "com.unity.2d.psdimporter": "6.0.7", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "7.0.4", + "com.unity.2d.spriteshape": "7.0.6", "com.unity.2d.tilemap": "1.0.0", "com.unity.ads.ios-support": "1.0.0", - "com.unity.burst": "1.6.5", - "com.unity.collab-proxy": "1.15.16", - "com.unity.collections": "1.2.3", - "com.unity.ide.rider": "3.0.14", - "com.unity.ide.visualstudio": "2.0.15", + "com.unity.burst": "1.6.6", + "com.unity.collab-proxy": "2.0.1", + "com.unity.collections": "1.2.4", + "com.unity.ide.rider": "3.0.18", + "com.unity.ide.visualstudio": "2.0.17", "com.unity.ide.vscode": "1.2.5", "com.unity.recorder": "3.0.3", "com.unity.test-framework": "1.1.31", diff --git a/popcorn/Packages/packages-lock.json b/popcorn/Packages/packages-lock.json index c046a189..7c341a28 100644 --- a/popcorn/Packages/packages-lock.json +++ b/popcorn/Packages/packages-lock.json @@ -15,19 +15,19 @@ "hash": "bba7df9616502051c4ab993077fb53316fd760a0" }, "com.unity.2d.animation": { - "version": "7.0.5", + "version": "7.0.9", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "6.0.3", + "com.unity.2d.common": "6.0.6", "com.unity.2d.sprite": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.2d.common": { - "version": "6.0.3", + "version": "6.0.6", "depth": 1, "source": "registry", "dependencies": { @@ -36,32 +36,32 @@ "com.unity.modules.uielements": "1.0.0", "com.unity.burst": "1.5.1" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.2d.path": { "version": "5.0.2", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.2d.pixel-perfect": { - "version": "5.0.1", + "version": "5.0.3", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.2d.psdimporter": { - "version": "6.0.3", + "version": "6.0.7", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.animation": "7.0.4", - "com.unity.2d.common": "6.0.3", + "com.unity.2d.animation": "7.0.9", + "com.unity.2d.common": "6.0.6", "com.unity.2d.sprite": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.2d.sprite": { "version": "1.0.0", @@ -70,16 +70,16 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "7.0.4", + "version": "7.0.6", "depth": 0, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "6.0.3", + "com.unity.2d.common": "6.0.4", "com.unity.2d.path": "5.0.2", "com.unity.modules.physics2d": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.2d.tilemap": { "version": "1.0.0", @@ -92,81 +92,72 @@ "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.burst": { - "version": "1.6.5", + "version": "1.6.6", "depth": 0, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.collab-proxy": { - "version": "1.15.16", + "version": "2.0.1", "depth": 0, "source": "registry", - "dependencies": { - "com.unity.services.core": "1.0.1" - }, - "url": "https://packages.unity.com" + "dependencies": {}, + "url": "https://packages.unity.cn" }, "com.unity.collections": { - "version": "1.2.3", + "version": "1.2.4", "depth": 0, "source": "registry", "dependencies": { - "com.unity.burst": "1.6.4", + "com.unity.burst": "1.6.6", "com.unity.test-framework": "1.1.31" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ide.rider": { - "version": "3.0.14", + "version": "3.0.18", "depth": 0, "source": "registry", "dependencies": { "com.unity.ext.nunit": "1.0.6" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ide.visualstudio": { - "version": "2.0.15", + "version": "2.0.17", "depth": 0, "source": "registry", "dependencies": { "com.unity.test-framework": "1.1.9" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ide.vscode": { "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.mathematics": { "version": "1.2.6", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.recorder": { "version": "3.0.3", @@ -175,18 +166,7 @@ "dependencies": { "com.unity.timeline": "1.0.0" }, - "url": "https://packages.unity.com" - }, - "com.unity.services.core": { - "version": "1.3.1", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.modules.androidjni": "1.0.0" - }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.test-framework": { "version": "1.1.31", @@ -197,7 +177,7 @@ "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.textmeshpro": { "version": "3.0.6", @@ -206,7 +186,7 @@ "dependencies": { "com.unity.ugui": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.timeline": { "version": "1.6.4", @@ -218,7 +198,7 @@ "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ugui": { "version": "1.0.0", diff --git a/popcorn/ProjectSettings/AndroidResolverDependencies.xml b/popcorn/ProjectSettings/AndroidResolverDependencies.xml index c6576a06..d4d92cc4 100644 --- a/popcorn/ProjectSettings/AndroidResolverDependencies.xml +++ b/popcorn/ProjectSettings/AndroidResolverDependencies.xml @@ -6,7 +6,7 @@ - + @@ -16,7 +16,7 @@ - + \ No newline at end of file diff --git a/popcorn/ProjectSettings/AutoStreamingSettings.asset b/popcorn/ProjectSettings/AutoStreamingSettings.asset new file mode 100644 index 00000000..d3e071e2 --- /dev/null +++ b/popcorn/ProjectSettings/AutoStreamingSettings.asset @@ -0,0 +1,21 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1200 &1 +AutoStreamingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + mSearchMode: 15 + mCustomSearchFile: + mTextureSearchString: + mMeshSearchString: + mTextures: [] + mAudios: [] + mMeshes: [] + mScenes: [] + mConfigCCD: + useCCD: 0 + cosKey: + projectGuid: + bucketUuid: + bucketName: + badgeName: diff --git a/popcorn/ProjectSettings/PackageManagerSettings.asset b/popcorn/ProjectSettings/PackageManagerSettings.asset index 6920e3ad..78648f04 100644 --- a/popcorn/ProjectSettings/PackageManagerSettings.asset +++ b/popcorn/ProjectSettings/PackageManagerSettings.asset @@ -12,27 +12,25 @@ MonoBehaviour: m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: + m_EnablePreReleasePackages: 0 + m_EnablePackageDependencies: 0 + m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 + m_SeeAllPackageVersions: 0 oneTimeWarningShown: 0 m_Registries: - m_Id: main m_Name: - m_Url: https://packages.unity.com + m_Url: https://packages.unity.cn m_Scopes: [] m_IsDefault: 1 + m_Capabilities: 7 + m_ConfigSource: 0 m_UserSelectedRegistryName: m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: - m_ErrorMessage: - m_Original: - m_Id: - m_Name: - m_Url: - m_Scopes: [] - m_IsDefault: 0 m_Modified: 0 - m_Name: - m_Url: - m_Scopes: - - - m_SelectedScopeIndex: 0 + m_ErrorMessage: + m_UserModificationsInstanceId: -852 + m_OriginalInstanceId: -854 + m_LoadAssets: 0 diff --git a/popcorn/ProjectSettings/ProjectSettings.asset b/popcorn/ProjectSettings/ProjectSettings.asset index 732004b8..e6c2af3f 100644 --- a/popcorn/ProjectSettings/ProjectSettings.asset +++ b/popcorn/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 23 + serializedVersion: 24 productGUID: da0596332854f406e9e3025b07f64794 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 0 companyName: joypac - productName: Chicks & Popcorn + productName: popcorn defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1} @@ -44,6 +44,12 @@ PlayerSettings: duration: 2 m_VirtualRealitySplashScreen: {fileID: 2800000, guid: 8505ae4422e0645d7b82c63b6ae9615b, type: 3} + m_ShowUnitySplashAds: 0 + m_AdsAndroidGameId: + m_AdsIosGameId: + m_ShowSplashAdsSlogan: 0 + m_SloganImage: {fileID: 0} + m_SloganHeight: 150 m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1024 defaultScreenHeight: 768 @@ -88,6 +94,11 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + autoStreaming: 0 + useAnimationStreaming: 0 + useFontStreaming: 0 + autoStreamingId: + instantGameAppId: bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -137,7 +148,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.2.0 + bundleVersion: preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -158,7 +169,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: jp.usaya.popcornos + Android: iPhone: jp.usaya.popcornos buildNumber: Standalone: 0 @@ -480,6 +491,7 @@ PlayerSettings: m_Kind: 2 m_SubKind: m_BuildTargetBatching: [] + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -520,6 +532,8 @@ PlayerSettings: m_APIs: 10000000 m_Automatic: 1 m_BuildTargetVRSettings: [] + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -626,7 +640,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -668,6 +681,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -680,6 +694,7 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 @@ -754,6 +769,7 @@ PlayerSettings: ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] @@ -778,6 +794,7 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLPowerPreference: 2 scriptingDefineSymbols: Android: ANDROID_GP;TextMeshPro;JOYPAC_Volcano_OS;BANNER_ENABLE CloudRendering: TextMeshPro @@ -806,6 +823,7 @@ PlayerSettings: allowUnsafeCode: 0 useDeterministicCompilation: 1 enableRoslynAnalyzers: 1 + selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 @@ -886,6 +904,7 @@ PlayerSettings: m_VersionName: apiCompatibilityLevel: 6 activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: b87bd54b-5da9-4aa2-806b-50a06c18d901 framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] diff --git a/popcorn/ProjectSettings/ProjectVersion.txt b/popcorn/ProjectSettings/ProjectVersion.txt index fbb7c0b0..53df9d93 100644 --- a/popcorn/ProjectSettings/ProjectVersion.txt +++ b/popcorn/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.3f1 -m_EditorVersionWithRevision: 2021.3.3f1 (af2e63e8f9bd) +m_EditorVersion: 2021.3.20f1c1 +m_EditorVersionWithRevision: 2021.3.20f1c1 (7cf0fbd73406)