Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified UnityProject/Assets/HotUpdate/Compiled/AOT.bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified UnityProject/Assets/HotUpdate/Compiled/AOT/mscorlib.dll.bytes
Binary file not shown.
Binary file modified UnityProject/Assets/HotUpdate/Compiled/HotUpdate.Code.dll.bytes
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
// System.Func<object,System.ValueTuple<byte,byte>>
// System.Func<object,System.ValueTuple<byte,object>>
// System.Func<object,byte>
// System.Func<object,object,object,object,Cysharp.Threading.Tasks.UniTask<byte>>
// System.Func<object,object>
// System.Func<object>
// System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<System.ValueTuple<byte,System.ValueTuple<byte,System.ValueTuple<byte,System.ValueTuple<byte,System.ValueTuple<byte,System.ValueTuple<byte,byte>>>>>>>
Expand Down
3 changes: 2 additions & 1 deletion UnityProject/Assets/HybridCLRGenerate/link.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<assembly fullname="JEngine.Core">
<type fullname="JEngine.Core.Bootstrap" preserve="all" />
<type fullname="JEngine.Core.Encrypt.EncryptionOption" preserve="all" />
<type fullname="JEngine.Core.Misc.MessageBox" preserve="all" />
<type fullname="JEngine.Core.Prompt" preserve="all" />
<type fullname="JEngine.Core.Update.PackageInitializationCallbacks" preserve="all" />
<type fullname="JEngine.Core.Update.PackageInitializationStatus" preserve="all" />
<type fullname="JEngine.Core.Update.SceneLoadCallbacks" preserve="all" />
Expand Down Expand Up @@ -60,6 +60,7 @@
<type fullname="System.Exception" preserve="all" />
<type fullname="System.Func`2" preserve="all" />
<type fullname="System.Func`3" preserve="all" />
<type fullname="System.Func`5" preserve="all" />
<type fullname="System.Int32" preserve="all" />
<type fullname="System.Object" preserve="all" />
<type fullname="System.Runtime.CompilerServices.AsyncStateMachineAttribute" preserve="all" />
Expand Down
185 changes: 133 additions & 52 deletions UnityProject/Assets/Obfuz/SymbolObfus/symbol-mapping.xml

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

This file was deleted.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

This file was deleted.

Binary file not shown.
54 changes: 27 additions & 27 deletions UnityProject/Assets/StreamingAssets/yoo/main/BuildinCatalog.json
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
{
"FileVersion": "1.0.0",
"PackageName": "main",
"PackageVersion": "260122842",
"PackageVersion": "260202209",
"Wrappers": [
{
"BundleGUID": "15ce485b672a77a1aa540ef46e39dd60",
"FileName": "15ce485b672a77a1aa540ef46e39dd60.bundle"
"BundleGUID": "427571ab4f40f72802eba023fca7a5e8",
"FileName": "427571ab4f40f72802eba023fca7a5e8.bundle"
},
{
"BundleGUID": "1832d193ad604c285e2456ba2a7855c7",
"FileName": "1832d193ad604c285e2456ba2a7855c7.bundle"
"BundleGUID": "4549b29fd00b2e57f75873c7c370340b",
"FileName": "4549b29fd00b2e57f75873c7c370340b.bundle"
},
{
"BundleGUID": "20c6686ce660502e16a881f74dde76d7",
"FileName": "20c6686ce660502e16a881f74dde76d7.bundle"
"BundleGUID": "5154722f17ed26abd07f0275b2fb315c",
"FileName": "5154722f17ed26abd07f0275b2fb315c.bundle"
},
{
"BundleGUID": "490ed19cf4dd5e128fb13cf883211456",
"FileName": "490ed19cf4dd5e128fb13cf883211456.bundle"
"BundleGUID": "578aebd507ab15c1f73f9a41b5962e15",
"FileName": "578aebd507ab15c1f73f9a41b5962e15.bundle"
},
{
"BundleGUID": "56d90d09aba519ecd1cba11dfc31f5d8",
"FileName": "56d90d09aba519ecd1cba11dfc31f5d8.bundle"
"BundleGUID": "743303a92561c811cf9e428d59f4eed5",
"FileName": "743303a92561c811cf9e428d59f4eed5.bundle"
},
{
"BundleGUID": "85bf7a8000e78a0640dd575c462d71de",
"FileName": "85bf7a8000e78a0640dd575c462d71de.bundle"
"BundleGUID": "76c5d9ebda370e318d1d711bf29db391",
"FileName": "76c5d9ebda370e318d1d711bf29db391.bundle"
},
{
"BundleGUID": "ae16386504461146b4ec88eabc7de89f",
"FileName": "ae16386504461146b4ec88eabc7de89f.bundle"
"BundleGUID": "7d008b589c7529b71f703107fc14b2a1",
"FileName": "7d008b589c7529b71f703107fc14b2a1.bundle"
},
{
"BundleGUID": "c4964674a708bf22bbb753ca23c93aec",
"FileName": "c4964674a708bf22bbb753ca23c93aec.bundle"
"BundleGUID": "a99f206109faf44e637346323f255c84",
"FileName": "a99f206109faf44e637346323f255c84.bundle"
},
{
"BundleGUID": "c792026eb6f717273422cfb875e3121d",
"FileName": "c792026eb6f717273422cfb875e3121d.bundle"
"BundleGUID": "aa7811a04dda58d98435ef7170ce0828",
"FileName": "aa7811a04dda58d98435ef7170ce0828.bundle"
},
{
"BundleGUID": "c9cd151a5606eec7bf47ac8d9401fb94",
"FileName": "c9cd151a5606eec7bf47ac8d9401fb94.bundle"
"BundleGUID": "bd7a40533fe708ab184ec75ceac853ee",
"FileName": "bd7a40533fe708ab184ec75ceac853ee.bundle"
},
{
"BundleGUID": "cde787d0afee29507a54189b7372cf14",
"FileName": "cde787d0afee29507a54189b7372cf14.bundle"
"BundleGUID": "e578f9b5397d53f41a2b284805860df8",
"FileName": "e578f9b5397d53f41a2b284805860df8.bundle"
},
{
"BundleGUID": "dcb1b5ed74667265ec98799a1576d5d3",
"FileName": "dcb1b5ed74667265ec98799a1576d5d3.bundle"
"BundleGUID": "e6ed0b286414267962e71c6bd3e19aae",
"FileName": "e6ed0b286414267962e71c6bd3e19aae.bundle"
},
{
"BundleGUID": "ec451612fae802d07094821d3808809f",
"FileName": "ec451612fae802d07094821d3808809f.bundle"
"BundleGUID": "eb53152c634d44794e4aebca15ee8b0b",
"FileName": "eb53152c634d44794e4aebca15ee8b0b.bundle"
}
]
}
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

This file was deleted.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
260122842
260202209
Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7f2ba677

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@ private static GameObject Prefab
/// When true, simulates prefab being unavailable. Used for testing "no prefab" error handling.
/// </summary>
internal static bool SimulateNoPrefab;

/// <summary>
/// When true, skips DontDestroyOnLoad call. Required for EditMode tests since
/// DontDestroyOnLoad only works in PlayMode.
/// </summary>
internal static bool SkipDontDestroyOnLoad;
#endif

#if UNITY_INCLUDE_TESTS
Expand Down Expand Up @@ -462,7 +468,12 @@ private void Init(string title, string content, string ok, string no)

// Set initial state for animation and play it
GameObject.transform.localScale = InitialScale;
Object.DontDestroyOnLoad(GameObject);
#if UNITY_EDITOR
if (!SkipDontDestroyOnLoad)
#endif
{
Object.DontDestroyOnLoad(GameObject);
}
}

private T GetComponent<T>(string path) where T : Component
Expand Down
Loading
Loading