关于资源数量加载的常量还原

Mewnojs · Mewnojs · commit 462db7357827 · 2024-08-02T04:40:38.000+08:00
Restoring constant references related to amounts of resources
diff --git a/Lawn_Shared/Lawn/LawnApp.cs b/Lawn_Shared/Lawn/LawnApp.cs
@@ -280,7 +280,7 @@ public override void LoadingThreadProc()
             mResourceManager.LoadAllResources();
             Resources.ExtractResources(mResourceManager, AtlasResources.mAtlasResources);
             AtlasResources.mAtlasResources.ExtractResources();
-            ReanimatorXnaHelpers.ReanimatorLoadDefinitions(ref GameConstants.gLawnReanimationArray, 119);
+            ReanimatorXnaHelpers.ReanimatorLoadDefinitions(ref GameConstants.gLawnReanimationArray, (int)ReanimationType.NumReanims);
             TodStringFile.TodStringListSetColors(GameConstants.gLawnStringFormats, GameConstants.gLawnStringFormatCount);
             if (mLoadingFailed || mShutdown || mCloseRequest)
             {
@@ -290,9 +290,9 @@ public override void LoadingThreadProc()
             mZenGarden = new ZenGarden();
             mReanimatorCache = new ReanimatorCache();
             mReanimatorCache.ReanimatorCacheInitialize();
-            TodFoley.TodFoleyInitialize(null, 103);
-            GlobalMembersTrail.TrailLoadDefinitions(GameConstants.gLawnTrailArray, 1);
-            TodParticleGlobal.TodParticleLoadDefinitions(ref GameConstants.gLawnParticleArray, 102);
+            TodFoley.TodFoleyInitialize(null, (int)FoleyType.FoleyCount);
+            GlobalMembersTrail.TrailLoadDefinitions(GameConstants.gLawnTrailArray, (int)TrailType.NumTrails);
+            TodParticleGlobal.TodParticleLoadDefinitions(ref GameConstants.gLawnParticleArray, (int)ParticleEffect.ParticleCount);
             PreloadForUser();
             if (!mLoadingFailed && !mShutdown)
             {
@@ -3208,9 +3208,9 @@ public void DelayLoadGamePlayResources(bool doLoad)
                 if (Main.LOW_MEMORY_DEVICE)
                 {
                     ResourceManager.mReanimContentManager.Unload();
-                    ReanimatorXnaHelpers.ReanimatorLoadDefinitions(ref GameConstants.gLawnReanimationArray, 119);
+                    ReanimatorXnaHelpers.ReanimatorLoadDefinitions(ref GameConstants.gLawnReanimationArray, (int)ReanimationType.NumReanims);
                     ResourceManager.mParticleContentManager.Unload();
-                    TodParticleGlobal.TodParticleLoadDefinitions(ref GameConstants.gLawnParticleArray, 102);
+                    TodParticleGlobal.TodParticleLoadDefinitions(ref GameConstants.gLawnParticleArray, (int)ParticleEffect.ParticleCount);
                 }
             }
             else if (gamePlayLoaded && !doLoad)
@@ -3253,9 +3253,9 @@ public void DelayLoadZenGardenResources(bool doLoad)
                 if (Main.LOW_MEMORY_DEVICE)
                 {
                     ResourceManager.mReanimContentManager.Unload();
-                    ReanimatorXnaHelpers.ReanimatorLoadDefinitions(ref GameConstants.gLawnReanimationArray, 119);
+                    ReanimatorXnaHelpers.ReanimatorLoadDefinitions(ref GameConstants.gLawnReanimationArray, (int)ReanimationType.NumReanims);
                     ResourceManager.mParticleContentManager.Unload();
-                    TodParticleGlobal.TodParticleLoadDefinitions(ref GameConstants.gLawnParticleArray, 102);
+                    TodParticleGlobal.TodParticleLoadDefinitions(ref GameConstants.gLawnParticleArray, (int)ParticleEffect.ParticleCount);
                 }
             }
             else if (zenGardenLoaded && !doLoad)
diff --git a/Lawn_Shared/Sexy.TodLib/Foley/TodFoley.cs b/Lawn_Shared/Sexy.TodLib/Foley/TodFoley.cs
@@ -257,7 +257,7 @@ public void RehookupSoundWithMusicVolume()
 
         public static void TodFoleyInitialize(FoleyParams[] theFoleyParamArray, int theFoleyParamArraySize)
         {
-            TodFoley.gFoleyParamArray = new FoleyParams[]
+            TodFoley.gFoleyParamArray = new FoleyParams[(int)FoleyType.FoleyCount]
             {
                 new FoleyParams(FoleyType.Sun, 10f, new int[]
                 {
diff --git a/Lawn_Shared/Sexy.TodLib/Reanim/ReanimatorXnaHelpers.cs b/Lawn_Shared/Sexy.TodLib/Reanim/ReanimatorXnaHelpers.cs
@@ -231,7 +231,7 @@ public static void BlendTransform(out ReanimatorTransform theResult, ref Reanima
         //public static float SECONDS_PER_UPDATE = 0.033333f;
         public static float SECONDS_PER_UPDATE = 0.01f;
 
-        public static ReanimatorDefinition[] gReanimatorDefArray = new ReanimatorDefinition[119];
+        public static ReanimatorDefinition[] gReanimatorDefArray = new ReanimatorDefinition[(int)ReanimationType.NumReanims];
 
         public static ReanimationParams[] gReanimationParamArray = null;
 
@@ -243,7 +243,7 @@ public static void BlendTransform(out ReanimatorTransform theResult, ref Reanima
 
         public static double mLoadingProgress;
 
-        public static int mTotalResources = 118;
+        public static int mTotalResources = (int)ReanimationType.NumReanims - 1;
 
         public static int mLoadedResources;
     }

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ public override void LoadingThreadProc()`
`280`	`280`	`mResourceManager.LoadAllResources();`
`281`	`281`	`Resources.ExtractResources(mResourceManager, AtlasResources.mAtlasResources);`
`282`	`282`	`AtlasResources.mAtlasResources.ExtractResources();`
`283`		`- ReanimatorXnaHelpers.ReanimatorLoadDefinitions(ref GameConstants.gLawnReanimationArray, 119);`
	`283`	`+ ReanimatorXnaHelpers.ReanimatorLoadDefinitions(ref GameConstants.gLawnReanimationArray, (int)ReanimationType.NumReanims);`
`284`	`284`	`TodStringFile.TodStringListSetColors(GameConstants.gLawnStringFormats, GameConstants.gLawnStringFormatCount);`
`285`	`285`	`if (mLoadingFailed \|\| mShutdown \|\| mCloseRequest)`
`286`	`286`	`{`
`@@ -290,9 +290,9 @@ public override void LoadingThreadProc()`
`290`	`290`	`mZenGarden = new ZenGarden();`
`291`	`291`	`mReanimatorCache = new ReanimatorCache();`
`292`	`292`	`mReanimatorCache.ReanimatorCacheInitialize();`
`293`		`- TodFoley.TodFoleyInitialize(null, 103);`
`294`		`- GlobalMembersTrail.TrailLoadDefinitions(GameConstants.gLawnTrailArray, 1);`
`295`		`- TodParticleGlobal.TodParticleLoadDefinitions(ref GameConstants.gLawnParticleArray, 102);`
	`293`	`+ TodFoley.TodFoleyInitialize(null, (int)FoleyType.FoleyCount);`
	`294`	`+ GlobalMembersTrail.TrailLoadDefinitions(GameConstants.gLawnTrailArray, (int)TrailType.NumTrails);`
	`295`	`+ TodParticleGlobal.TodParticleLoadDefinitions(ref GameConstants.gLawnParticleArray, (int)ParticleEffect.ParticleCount);`
`296`	`296`	`PreloadForUser();`
`297`	`297`	`if (!mLoadingFailed && !mShutdown)`
`298`	`298`	`{`
`@@ -3208,9 +3208,9 @@ public void DelayLoadGamePlayResources(bool doLoad)`
`3208`	`3208`	`if (Main.LOW_MEMORY_DEVICE)`
`3209`	`3209`	`{`
`3210`	`3210`	`ResourceManager.mReanimContentManager.Unload();`
`3211`		`- ReanimatorXnaHelpers.ReanimatorLoadDefinitions(ref GameConstants.gLawnReanimationArray, 119);`
	`3211`	`+ ReanimatorXnaHelpers.ReanimatorLoadDefinitions(ref GameConstants.gLawnReanimationArray, (int)ReanimationType.NumReanims);`
`3212`	`3212`	`ResourceManager.mParticleContentManager.Unload();`
`3213`		`- TodParticleGlobal.TodParticleLoadDefinitions(ref GameConstants.gLawnParticleArray, 102);`
	`3213`	`+ TodParticleGlobal.TodParticleLoadDefinitions(ref GameConstants.gLawnParticleArray, (int)ParticleEffect.ParticleCount);`
`3214`	`3214`	`}`
`3215`	`3215`	`}`
`3216`	`3216`	`else if (gamePlayLoaded && !doLoad)`
`@@ -3253,9 +3253,9 @@ public void DelayLoadZenGardenResources(bool doLoad)`
`3253`	`3253`	`if (Main.LOW_MEMORY_DEVICE)`
`3254`	`3254`	`{`
`3255`	`3255`	`ResourceManager.mReanimContentManager.Unload();`
`3256`		`- ReanimatorXnaHelpers.ReanimatorLoadDefinitions(ref GameConstants.gLawnReanimationArray, 119);`
	`3256`	`+ ReanimatorXnaHelpers.ReanimatorLoadDefinitions(ref GameConstants.gLawnReanimationArray, (int)ReanimationType.NumReanims);`
`3257`	`3257`	`ResourceManager.mParticleContentManager.Unload();`
`3258`		`- TodParticleGlobal.TodParticleLoadDefinitions(ref GameConstants.gLawnParticleArray, 102);`
	`3258`	`+ TodParticleGlobal.TodParticleLoadDefinitions(ref GameConstants.gLawnParticleArray, (int)ParticleEffect.ParticleCount);`
`3259`	`3259`	`}`
`3260`	`3260`	`}`
`3261`	`3261`	`else if (zenGardenLoaded && !doLoad)`
Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ public void RehookupSoundWithMusicVolume()`
`257`	`257`
`258`	`258`	`public static void TodFoleyInitialize(FoleyParams[] theFoleyParamArray, int theFoleyParamArraySize)`
`259`	`259`	`{`
`260`		`- TodFoley.gFoleyParamArray = new FoleyParams[]`
	`260`	`+ TodFoley.gFoleyParamArray = new FoleyParams[(int)FoleyType.FoleyCount]`
`261`	`261`	`{`
`262`	`262`	`new FoleyParams(FoleyType.Sun, 10f, new int[]`
`263`	`263`	`{`