student 1 hónapja
szülő
commit
d3a6c9c4f2
22 módosított fájl, 102 hozzáadás és 22 törlés
  1. BIN
      KittyFallWs/etc/key/kitty_subkeys.zip
  2. BIN
      KittyFallWs/etc/key/kitty_subkeys/kitty_subkeys.xlsx
  3. 18 0
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Language/Lang.Designer.cs
  4. 3 0
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Language/Lang.resx
  5. 4 1
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Language/Lang.vi.resx
  6. 1 1
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Views/Play/Index.cshtml
  7. 4 4
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Views/Shared/_Layout.cshtml
  8. 0 0
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/data.json
  9. BIN
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/block1a-sheet0.webp
  10. BIN
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/block1a-sheet1.webp
  11. BIN
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/cats-sheet0.webp
  12. BIN
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/cats-sheet1.webp
  13. BIN
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/cats-sheet2.webp
  14. BIN
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/cats-sheet3.webp
  15. BIN
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/cats-sheet4.webp
  16. BIN
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/sprite3-sheet0.webp
  17. BIN
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/sprite3-sheet2.webp
  18. 1 1
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/offline.json
  19. 22 7
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/scripts/c3runtime.js
  20. 13 5
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/scripts/objRefTable.js
  21. 36 3
      Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/scripts/project/main.js
  22. BIN
      Kitty_Fall/catpuzzle_aquang.zip

BIN
KittyFallWs/etc/key/kitty_subkeys.zip


BIN
KittyFallWs/etc/key/kitty_subkeys/kitty_subkeys.xlsx


+ 18 - 0
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Language/Lang.Designer.cs

@@ -95,6 +95,24 @@ namespace Kitty_Fall.Website.Language {
                 return ResourceManager.GetString("AccountCancelCatAlt", resourceCulture);
             }
         }
+
+        public static string AccountSaveProfile {
+            get {
+                return ResourceManager.GetString("AccountSaveProfile", resourceCulture);
+            }
+        }
+
+        public static string AccountCancelPackage {
+            get {
+                return ResourceManager.GetString("AccountCancelPackage", resourceCulture);
+            }
+        }
+
+        public static string GameOver {
+            get {
+                return ResourceManager.GetString("GameOver", resourceCulture);
+            }
+        }
         
         /// <summary>
         ///   Looks up a localized string similar to {0} to {1}.

+ 3 - 0
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Language/Lang.resx

@@ -690,6 +690,9 @@
   <data name="AccountCancelCatAlt" xml:space="preserve">
     <value>Kitty Fall cat</value>
   </data>
+  <data name="AccountSaveProfile" xml:space="preserve"><value>Save profile</value></data>
+  <data name="AccountCancelPackage" xml:space="preserve"><value>Cancel package</value></data>
+  <data name="GameOver" xml:space="preserve"><value>Game Over</value></data>
   <data name="BuyTurnSuccessMessage" xml:space="preserve">
     <value>You have successfully purchased {0} turns!</value>
   </data>

+ 4 - 1
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Language/Lang.vi.resx

@@ -690,6 +690,9 @@
   <data name="AccountCancelCatAlt" xml:space="preserve">
     <value>ကစ်တီ ဆောင်းဦးရာသီကြောင်</value>
   </data>
+  <data name="AccountSaveProfile" xml:space="preserve"><value>ပရိုဖိုင်ကို သိမ်းမည်</value></data>
+  <data name="AccountCancelPackage" xml:space="preserve"><value>ပက်ကေ့ဂျ်ကို ပယ်ဖျက်မည်</value></data>
+  <data name="GameOver" xml:space="preserve"><value>ဂိမ်းပြီးဆုံးပါပြီ</value></data>
   <data name="BuyTurnSuccessMessage" xml:space="preserve">
     <value>သင်သည် အလှည့် {0} ခုကို အောင်မြင်စွာ ဝယ်ယူပြီးပါပြီ။</value>
   </data>
@@ -810,4 +813,4 @@
   <data name="GuideHowToPlayIntro" xml:space="preserve">
     <value>ကစားနည်း- ဂိမ်းကိုဝင်ရောက်ပြီး ကစားရန်အောက်ပါအဆင့်များကို လိုက်နာပါ။</value>
   </data>
-</root>
+</root>

+ 1 - 1
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Views/Play/Index.cshtml

@@ -113,7 +113,7 @@
         <div class="game-over-card">
             <button class="game-over-close" type="button" data-game-over-close aria-label="Close">×</button>
             <img class="game-over-cat" src="~/kitty/assets/kitty-fall/cat.png" alt="">
-            <h2>Game Over</h2>
+            <h2>@Lang.GameOver</h2>
             <p>@Lang.Rewards</p>
             <div class="game-over-summary">
                 <div>

+ 4 - 4
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Views/Shared/_Layout.cshtml

@@ -79,7 +79,7 @@
                         <strong><span>@accountMsisdn</span><span data-profile-name-display>@accountFullName</span></strong>
                         <input name="fullName" maxlength="100" value="@accountFullName" placeholder="Full name" aria-label="Full name">
                         <p>@Lang.AccountDefaultDescription</p>
-                        <button type="submit" data-profile-save>Save profile</button>
+                        <button type="submit" data-profile-save>@Lang.AccountSaveProfile</button>
                         <em data-profile-message></em>
                     </div>
                 </form>
@@ -129,7 +129,7 @@
                                     class="account-cancel-button"
                                     data-cancel-package
                                     data-package-name="@packageNameRaw">
-                                Cancel package
+                                @Lang.AccountCancelPackage
                             </button>
                             <em class="account-cancel-message" data-cancel-package-message></em>
                         }
@@ -161,11 +161,11 @@
         <button class="cancel-package-dialog-backdrop" type="button" data-cancel-dialog-close aria-label="Close confirmation"></button>
         <section class="cancel-package-dialog-card" role="dialog" aria-modal="true" aria-labelledby="cancel-package-dialog-title">
             <div class="cancel-package-dialog-icon" aria-hidden="true">!</div>
-            <h2 id="cancel-package-dialog-title">Cancel package?</h2>
+            <h2 id="cancel-package-dialog-title">@Lang.AccountCancelPackage?</h2>
             <p>Your current package benefits will no longer be available. Are you sure you want to continue?</p>
             <div class="cancel-package-dialog-actions">
                 <button class="cancel-package-dialog-keep" type="button" data-cancel-dialog-close>Keep package</button>
-                <button class="cancel-package-dialog-confirm" type="button" data-cancel-dialog-confirm>Cancel package</button>
+                <button class="cancel-package-dialog-confirm" type="button" data-cancel-dialog-confirm>@Lang.AccountCancelPackage</button>
             </div>
         </section>
     </div>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/data.json


BIN
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/block1a-sheet0.webp


BIN
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/block1a-sheet1.webp


BIN
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/cats-sheet0.webp


BIN
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/cats-sheet1.webp


BIN
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/cats-sheet2.webp


BIN
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/cats-sheet3.webp


BIN
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/cats-sheet4.webp


BIN
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/sprite3-sheet0.webp


BIN
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/images/sprite3-sheet2.webp


+ 1 - 1
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/offline.json

@@ -1 +1 @@
-{"version":1786441923420,"fileList":["scripts/main.js","scripts/c3runtime.js","scripts/objRefTable.js","scripts/project/main.js","scripts/c3main.js","scripts/dispatchworker.js","scripts/jobworker.js","data.json","scripts/modernjscheck.js","scripts/supportcheck.js","scripts/offlineclient.js","icons/loading-logo.png","icons/icon-16.png","icons/icon-32.png","icons/icon-64.png","icons/icon-128.png","icons/icon-256.png","icons/icon-512.png","media/congratulations.webm","media/click.webm","media/Button03.webm","media/cute-cat-352656.webm","media/win2.webm","media/timeup_.webm","media/click_sound.webm","media/playground.webm","box2d.wasm","box2d.wasm.js","style.css","images/shared-0-sheet0.webp","images/shared-0-sheet1.webp","images/shared-0-sheet2.webp","images/shared-0-sheet3.webp","images/shared-0-sheet4.webp","images/shared-0-sheet5.webp","images/shared-0-sheet6.webp","images/block1a-sheet0.webp","images/block1a-sheet1.webp","images/cats-sheet0.webp","images/cats-sheet1.webp","images/cats-sheet2.webp","images/cats-sheet3.webp","images/cats-sheet4.webp","images/confettix-sheet0.webp","images/confettix-sheet1.webp","images/sprite3-sheet0.webp","images/sprite3-sheet1.webp","images/sprite3-sheet2.webp","images/scroll-sheet0.webp","images/btn_lvl-sheet0.webp","images/btn_lvl-sheet1.webp","scripts/register-sw.js"]}
+{"version":1786612393497,"fileList":["scripts/main.js","scripts/c3runtime.js","scripts/objRefTable.js","scripts/project/main.js","scripts/c3main.js","scripts/dispatchworker.js","scripts/jobworker.js","data.json","scripts/modernjscheck.js","scripts/supportcheck.js","scripts/offlineclient.js","icons/loading-logo.png","icons/icon-16.png","icons/icon-32.png","icons/icon-64.png","icons/icon-128.png","icons/icon-256.png","icons/icon-512.png","media/congratulations.webm","media/click.webm","media/Button03.webm","media/cute-cat-352656.webm","media/win2.webm","media/timeup_.webm","media/click_sound.webm","media/playground.webm","box2d.wasm.js","box2d.wasm","style.css","images/shared-0-sheet0.webp","images/shared-0-sheet1.webp","images/shared-0-sheet2.webp","images/shared-0-sheet3.webp","images/shared-0-sheet4.webp","images/shared-0-sheet5.webp","images/shared-0-sheet6.webp","images/block1a-sheet0.webp","images/block1a-sheet1.webp","images/cats-sheet0.webp","images/cats-sheet1.webp","images/cats-sheet2.webp","images/cats-sheet3.webp","images/cats-sheet4.webp","images/confettix-sheet0.webp","images/confettix-sheet1.webp","images/sprite3-sheet0.webp","images/sprite3-sheet1.webp","images/sprite3-sheet2.webp","images/scroll-sheet0.webp","images/btn_lvl-sheet0.webp","images/btn_lvl-sheet1.webp","scripts/register-sw.js"]}

+ 22 - 7
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/scripts/c3runtime.js

@@ -1527,14 +1527,10 @@ self.C3_ExpressionFuncs = [
 			const n0 = p._GetNode(0);
 			return () => n0.ExpInstVar_Family();
 		},
-		() => "catmove",
-		() => 0.3,
 		() => "for collision",
 		() => 0.2,
 		() => "Blocksunder",
 		() => -15,
-		() => "woodm",
-		() => "touch blocks",
 		p => {
 			const n0 = p._GetNode(0);
 			const n1 = p._GetNode(1);
@@ -1542,6 +1538,24 @@ self.C3_ExpressionFuncs = [
 			const n3 = p._GetNode(3);
 			return () => C3.distanceTo(n0.ExpObject(), n1.ExpObject(), n2.ExpObject(), n3.ExpObject());
 		},
+		p => {
+			const f0 = p._GetNode(0).GetBoundMethod();
+			return () => (300 * f0());
+		},
+		p => {
+			const n0 = p._GetNode(0);
+			const n1 = p._GetNode(1);
+			const f2 = p._GetNode(2).GetBoundMethod();
+			return () => (n0.ExpObject() + ((Math.cos(C3.toRadians(n1.ExpObject())) * 300) * f2()));
+		},
+		p => {
+			const n0 = p._GetNode(0);
+			const n1 = p._GetNode(1);
+			const f2 = p._GetNode(2).GetBoundMethod();
+			return () => (n0.ExpObject() + ((Math.sin(C3.toRadians(n1.ExpObject())) * 300) * f2()));
+		},
+		() => "woodm",
+		() => "touch blocks",
 		() => "movetovirtual",
 		() => 0.1,
 		p => {
@@ -1567,7 +1581,7 @@ self.C3_ExpressionFuncs = [
 			const v3 = p._GetNode(3).GetVar();
 			const f4 = p._GetNode(4).GetBoundMethod();
 			const v5 = p._GetNode(5).GetVar();
-			return () => C3.clamp((C3.distanceTo(n0.ExpObject("Center"), n1.ExpObject("Center"), (f2() - v3.GetValue()), (f4() - v5.GetValue())) * 2), 15, 150);
+			return () => C3.clamp((C3.distanceTo(n0.ExpObject("Center"), n1.ExpObject("Center"), (f2() - v3.GetValue()), (f4() - v5.GetValue())) * 2), 0, 300);
 		},
 		p => {
 			const f0 = p._GetNode(0).GetBoundMethod();
@@ -1588,7 +1602,7 @@ self.C3_ExpressionFuncs = [
 			const n2 = p._GetNode(2);
 			const f3 = p._GetNode(3).GetBoundMethod();
 			const v4 = p._GetNode(4).GetVar();
-			return () => C3.clamp((C3.distanceTo(n0.ExpObject("Center"), n1.ExpObject("Center"), n2.ExpObject("Center"), (f3() - v4.GetValue())) * 2), 15, 150);
+			return () => C3.clamp((C3.distanceTo(n0.ExpObject("Center"), n1.ExpObject("Center"), n2.ExpObject("Center"), (f3() - v4.GetValue())) * 2), 0, 300);
 		},
 		p => {
 			const n0 = p._GetNode(0);
@@ -1601,7 +1615,7 @@ self.C3_ExpressionFuncs = [
 			const f2 = p._GetNode(2).GetBoundMethod();
 			const v3 = p._GetNode(3).GetVar();
 			const n4 = p._GetNode(4);
-			return () => C3.clamp((C3.distanceTo(n0.ExpObject("Center"), n1.ExpObject("Center"), (f2() - v3.GetValue()), n4.ExpObject("Center")) * 2), 15, 150);
+			return () => C3.clamp((C3.distanceTo(n0.ExpObject("Center"), n1.ExpObject("Center"), (f2() - v3.GetValue()), n4.ExpObject("Center")) * 2), 0, 300);
 		},
 		p => {
 			const v0 = p._GetNode(0).GetVar();
@@ -1660,6 +1674,7 @@ self.C3_ExpressionFuncs = [
 		},
 		() => 25,
 		() => 51,
+		() => 0.3,
 		p => {
 			const v0 = p._GetNode(0).GetVar();
 			const v1 = p._GetNode(1).GetVar();

+ 13 - 5
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/scripts/objRefTable.js

@@ -55,16 +55,22 @@ self.C3_GetObjectRefTable = function () {
 		C3.Behaviors.Physics.Acts.SetEnabled,
 		C3.Plugins.Sprite.Cnds.IsOverlapping,
 		C3.Behaviors.Rotate.Acts.SetEnabled,
-		C3.Behaviors.Tween.Acts.TweenTwoProperties,
-		C3.Plugins.Sprite.Exps.X,
-		C3.Plugins.Sprite.Exps.Y,
-		C3.Behaviors.Tween.Cnds.OnTweensFinished,
+		C3.Plugins.Sprite.Acts.AddInstanceVar,
 		C3.Plugins.Sprite.Cnds.OnDestroyed,
 		C3.Plugins.System.Cnds.PickByComparison,
 		C3.Plugins.Sprite.Acts.Destroy,
 		C3.Plugins.Sprite.Acts.SubInstanceVar,
+		C3.Behaviors.Tween.Acts.TweenTwoProperties,
 		C3.Plugins.System.Acts.Wait,
 		C3.Plugins.Text.Cnds.CompareInstanceVar,
+		C3.Plugins.Sprite.Exps.X,
+		C3.Plugins.Sprite.Exps.Y,
+		C3.Plugins.System.Exps.dt,
+		C3.Plugins.Sprite.Acts.SetPos,
+		C3.Plugins.Sprite.Acts.SetTowardPosition,
+		C3.Plugins.Sprite.Acts.SetX,
+		C3.Plugins.Sprite.Exps.Angle,
+		C3.Plugins.Sprite.Acts.SetY,
 		C3.Plugins.Touch.Cnds.IsTouchingObject,
 		C3.Plugins.System.Cnds.PickByHighestLowestValue,
 		C3.Plugins.Touch.Cnds.OnTouchObject,
@@ -122,6 +128,7 @@ self.C3_JsPropNameTable = [
 	{ac: 0},
 	{dir: 0},
 	{number: 0},
+	{movingCats: 0},
 	{Block1a: 0},
 	{Touch: 0},
 	{BG: 0},
@@ -219,7 +226,8 @@ self.C3_JsPropNameTable = [
 	{InitGameSuccess: 0},
 	{InitUnLockSucess: 0},
 	{InitGameTypeSuccess: 0},
-	{cur_level: 0}
+	{cur_level: 0},
+	{provider: 0}
 ];
 
 self.InstanceType = {

+ 36 - 3
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/scripts/project/main.js

@@ -65,6 +65,10 @@ function LoadGameConfigFromUrl(runtime)
 		const gameType =
 			params.get("gameType");
 
+		const provider =
+			params.get("provider");
+
+
 
 		if (gameType)
 		{
@@ -75,6 +79,18 @@ function LoadGameConfigFromUrl(runtime)
 			runtime.globalVars.gameType = "Easy";
 		}
 
+		if (provider)
+		{
+			runtime.globalVars.provider = provider;
+		}
+		else
+		{
+			runtime.globalVars.provider = "MYTEL";
+		}
+
+
+
+
 
 		const maxLevel = parseInt(params.get("max_level"), 10);
 
@@ -100,7 +116,9 @@ function LoadGameConfigFromUrl(runtime)
 			"TotalTime:",
 			runtime.globalVars.totaltime,
 			"max_level:",
-			runtime.globalVars.unlocked_level
+			runtime.globalVars.unlocked_level,
+			"provider:",
+			runtime.globalVars.provider,
 		);
 
 	}
@@ -315,8 +333,23 @@ async function SaveLevelResult(runtime)
 		}
 		else if (runtime.globalVars.data > 0)
 		{
-			runtime.globalVars.gGiftValues = runtime.globalVars.data;
-			runtime.globalVars.gGiftText = "MB";
+			if(runtime.globalVars.provider="MYTEL")
+			{
+					runtime.globalVars.gGiftValues = runtime.globalVars.data;
+					runtime.globalVars.gGiftText = "MB";
+			} 
+			else if (runtime.globalVars.provider="NATCOM")
+			{
+					runtime.globalVars.gGiftValues = runtime.globalVars.data;
+					runtime.globalVars.gGiftText = "HTG";
+			}
+			else
+			{
+					runtime.globalVars.gGiftValues = runtime.globalVars.data;
+					runtime.globalVars.gGiftText = "MB";
+			}
+			
+			
 		}
 		else if (runtime.globalVars.score > 0)
 		{

BIN
Kitty_Fall/catpuzzle_aquang.zip


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott