student 2 日 前
コミット
b07077a446

+ 8 - 2
KittyFallWs/KittyFallWs/src/com/vas/webservices/KittyFallWs.java

@@ -657,7 +657,10 @@ public class KittyFallWs extends WebserviceAbstract {
                 response.setErrorCode(PARAM_NOT_ENOUGH);
                 response.setContent("params is null");
             }
-
+            if (!Objects.equals(mode, "REAL")) {
+                response.setErrorCode(Common.ErrorCode.SUCCESS);
+                return response.getErrorCode();
+            }
             if (SUCCESS.equals(response.getErrorCode())) {
                 userInfo = authenticate(wsUser, wsPass, ip);
                 if (userInfo == null || userInfo.getWsUserId() <= 0) {
@@ -772,7 +775,10 @@ public class KittyFallWs extends WebserviceAbstract {
                 response.setErrorCode(PARAM_NOT_ENOUGH);
                 response.setContent("params is null");
             }
-
+            if (!Objects.equals(mode, "REAL")) {
+                response.setErrorCode(Common.ErrorCode.SUCCESS);
+                return response.getErrorCode();
+            }
             if (SUCCESS.equals(response.getErrorCode())) {
 
                 msisdn = formatMsisdn(msisdn);

+ 1 - 1
Kitty_Fall/Kitty_Fall/Kitty_Fall.Cms/Kitty_Fall.Cms.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>

+ 1 - 1
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Controllers/HomeController.cs

@@ -29,7 +29,7 @@ namespace Kitty_Fall.Website.Controllers
         public async Task<IActionResult> Index()
         {
             await LoadHomeDataAsync();
-            ViewBag.AutoOpenSubscriptionConfirm = Request.Query.ContainsKey("quickregister");
+            ViewBag.AutoRegisterSubscription = Request.Query.ContainsKey("quickregister");
             ViewBag.AutoOpenBuyTurn = Request.Query.ContainsKey("buyturn");
             return View();
         }

+ 2 - 2
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/Views/Home/Index.cshtml

@@ -14,7 +14,7 @@
     var packageTurnText = packageTurns <= 1 ? "Turn" : "Turns";
     var isSubscriber = Context.Session.IsSubscriber();
     var packageAction = isSubscriber ? "buy-turn" : "subscribe";
-    var autoOpenSubscriptionConfirm = (ViewBag.AutoOpenSubscriptionConfirm as bool?) == true && !isSubscriber;
+    var autoRegisterSubscription = (ViewBag.AutoRegisterSubscription as bool?) == true && !isSubscriber;
     // Luong het luot tu trang Play da chu dong yeu cau mo danh sach goi CHARGE.
     // Khong chan modal theo regInfos vi session subscription co the chua kip dong bo.
     var autoOpenBuyTurn = (ViewBag.AutoOpenBuyTurn as bool?) == true;
@@ -120,7 +120,7 @@
     </section>
 
     <div class="subscription-modal" data-subscription-modal
-         data-auto-open-subscription="@(autoOpenSubscriptionConfirm ? "true" : "false")"
+         data-auto-register-subscription="@(autoRegisterSubscription ? "true" : "false")"
          data-auto-open-buy-turn="@(autoOpenBuyTurn ? "true" : "false")" aria-hidden="true">
         <button class="subscription-backdrop" type="button" data-close-subscription aria-label="@Lang.ConfirmSubscription"></button>
         <section class="confirm-dialog-shell scale-floor modal-panel is-active" data-modal-panel="confirm" data-scale-floor="361" data-scale-height="540" role="dialog" aria-modal="true" aria-label="@Lang.ConfirmSubscription">

ファイルの差分が大きいため隠しています
+ 0 - 0
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/data.json


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


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

@@ -1 +1 @@
-{"version":1784799761185,"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":1785290924305,"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"]}

+ 17 - 1
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/catpuzzle/scripts/c3runtime.js

@@ -1517,7 +1517,7 @@ self.C3_ExpressionFuncs = [
 		},
 		p => {
 			const n0 = p._GetNode(0);
-			return () => n0.ExpObject(2);
+			return () => n0.ExpObject(1);
 		},
 		p => {
 			const n0 = p._GetNode(0);
@@ -1549,6 +1549,16 @@ self.C3_ExpressionFuncs = [
 			const n1 = p._GetNode(1);
 			return () => (f0() - n1.ExpObject("Center"));
 		},
+		p => {
+			const n0 = p._GetNode(0);
+			const n1 = p._GetNode(1);
+			const f2 = p._GetNode(2).GetBoundMethod();
+			const v3 = p._GetNode(3).GetVar();
+			const f4 = p._GetNode(4).GetBoundMethod();
+			const v5 = p._GetNode(5).GetVar();
+			return () => C3.distanceTo(n0.ExpObject("Center"), n1.ExpObject("Center"), (f2() - v3.GetValue()), (f4() - v5.GetValue()));
+		},
+		() => 5,
 		() => "both",
 		p => {
 			const n0 = p._GetNode(0);
@@ -1566,6 +1576,12 @@ self.C3_ExpressionFuncs = [
 		},
 		() => "Center",
 		() => "ver",
+		p => {
+			const f0 = p._GetNode(0).GetBoundMethod();
+			const v1 = p._GetNode(1).GetVar();
+			const n2 = p._GetNode(2);
+			return () => Math.abs(((f0() - v1.GetValue()) - n2.ExpObject("Center")));
+		},
 		p => {
 			const n0 = p._GetNode(0);
 			const n1 = p._GetNode(1);

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

@@ -58,11 +58,12 @@ self.C3_GetObjectRefTable = function () {
 		C3.Behaviors.Tween.Acts.TweenTwoProperties,
 		C3.Plugins.Sprite.Exps.X,
 		C3.Plugins.Sprite.Exps.Y,
-		C3.Plugins.Sprite.Acts.Destroy,
+		C3.Behaviors.Tween.Cnds.OnTweensFinished,
+		C3.Plugins.Sprite.Cnds.OnDestroyed,
 		C3.Plugins.System.Cnds.PickByComparison,
+		C3.Plugins.Sprite.Acts.Destroy,
 		C3.Plugins.Sprite.Acts.SubInstanceVar,
 		C3.Plugins.System.Acts.Wait,
-		C3.Plugins.Sprite.Cnds.OnDestroyed,
 		C3.Plugins.Text.Cnds.CompareInstanceVar,
 		C3.Plugins.Touch.Cnds.IsTouchingObject,
 		C3.Plugins.System.Cnds.PickByHighestLowestValue,
@@ -96,6 +97,7 @@ self.C3_GetObjectRefTable = function () {
 		C3.Plugins.Browser.Acts.ConsoleLog,
 		C3.Plugins.System.Acts.RestartLayout,
 		C3.Plugins.Sprite.Acts.SetScale,
+		C3.Plugins.Text.Exps.Text,
 		C3.Plugins.Touch.Cnds.OnTouchStart,
 		C3.Plugins.Audio.Acts.SetMasterVolume,
 		C3.Plugins.Audio.Cnds.IsTagPlaying,
@@ -146,6 +148,7 @@ self.C3_JsPropNameTable = [
 	{Cell: 0},
 	{uuid: 0},
 	{id: 0},
+	{moving: 0},
 	{Rotate: 0},
 	{Cats: 0},
 	{Textcountblock: 0},

+ 5 - 2
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/kitty/js/all.min.js

@@ -689,8 +689,11 @@ const initKittyFall = () => {
             button.addEventListener("click", openSubscriptionModal);
         });
 
-        if (subscriptionModal.dataset.autoOpenSubscription === "true") {
-            openSubscriptionModal();
+        if (subscriptionModal.dataset.autoRegisterSubscription === "true") {
+            const quickRegisterButton = subscriptionModal.querySelector(
+                '[data-modal-panel="confirm"] [data-confirm-subscription]'
+            );
+            confirmSubscription(null, quickRegisterButton);
         }
 
         if (subscriptionModal.dataset.autoOpenBuyTurn === "true") {

+ 5 - 2
Kitty_Fall/Kitty_Fall/Kitty_Fall.Website/wwwroot/kitty/js/input.js

@@ -689,8 +689,11 @@ const initKittyFall = () => {
             button.addEventListener("click", openSubscriptionModal);
         });
 
-        if (subscriptionModal.dataset.autoOpenSubscription === "true") {
-            openSubscriptionModal();
+        if (subscriptionModal.dataset.autoRegisterSubscription === "true") {
+            const quickRegisterButton = subscriptionModal.querySelector(
+                '[data-modal-panel="confirm"] [data-confirm-subscription]'
+            );
+            confirmSubscription(null, quickRegisterButton);
         }
 
         if (subscriptionModal.dataset.autoOpenBuyTurn === "true") {

BIN
Kitty_Fall/catpuzzle_aquang.zip


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません