Keep local version of files
This commit is contained in:
@@ -24029,6 +24029,7 @@ MonoBehaviour:
|
|||||||
txtRewardRC: {fileID: 488058062}
|
txtRewardRC: {fileID: 488058062}
|
||||||
txtRewardCC: {fileID: 30708566}
|
txtRewardCC: {fileID: 30708566}
|
||||||
countdownTxt: {fileID: 2054440054}
|
countdownTxt: {fileID: 2054440054}
|
||||||
|
rewardCountUpDuration: 2
|
||||||
returnToMenuCountdown: 25
|
returnToMenuCountdown: 25
|
||||||
txtRcBalance: {fileID: 420458116}
|
txtRcBalance: {fileID: 420458116}
|
||||||
txtBetLimitWarning: {fileID: 1506964490}
|
txtBetLimitWarning: {fileID: 1506964490}
|
||||||
|
|||||||
@@ -32106,9 +32106,9 @@ RectTransform:
|
|||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1290413509}
|
m_Father: {fileID: 1290413509}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 1}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 1}
|
||||||
m_AnchoredPosition: {x: -4, y: 433}
|
m_AnchoredPosition: {x: -4, y: -661}
|
||||||
m_SizeDelta: {x: 80, y: 120}
|
m_SizeDelta: {x: 80, y: 120}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &2043562892
|
--- !u!114 &2043562892
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ public class GameOverCanvas : MonoBehaviour
|
|||||||
public TMP_Text countdownTxt;
|
public TMP_Text countdownTxt;
|
||||||
string returningToMenuText;
|
string returningToMenuText;
|
||||||
|
|
||||||
|
public float rewardCountUpDuration = 2f;
|
||||||
public float returnToMenuCountdown = 15f;
|
public float returnToMenuCountdown = 15f;
|
||||||
|
|
||||||
/// <summary>Each player needs at least 2.0 RC (20 coin units) to rematch.</summary>
|
/// <summary>Each player needs at least 2.0 RC (20 coin units) to rematch.</summary>
|
||||||
@@ -521,8 +522,8 @@ public class GameOverCanvas : MonoBehaviour
|
|||||||
float ccReward = GameTutorialManager.tutorialModeEnabled || !GameManager.LocalPlayerEarnedParticipationCc
|
float ccReward = GameTutorialManager.tutorialModeEnabled || !GameManager.LocalPlayerEarnedParticipationCc
|
||||||
? 0f
|
? 0f
|
||||||
: GameManager.ParticipationCcAmount;
|
: GameManager.ParticipationCcAmount;
|
||||||
StartCoroutine(CoroutineSetTextNumber(rcPrize, txtRewardRC, 10, "N1", "+", " RC"));
|
StartCoroutine(CoroutineSetTextNumber(rcPrize, txtRewardRC, "N1", "+", " RC"));
|
||||||
StartCoroutine(CoroutineSetTextNumber(ccReward, txtRewardCC, 100, "N0", "+", " CC"));
|
StartCoroutine(CoroutineSetTextNumber(ccReward, txtRewardCC, "N0", "+", " CC"));
|
||||||
|
|
||||||
txtBetRC.text = GameTutorialManager.tutorialModeEnabled
|
txtBetRC.text = GameTutorialManager.tutorialModeEnabled
|
||||||
? "0 RC"
|
? "0 RC"
|
||||||
@@ -542,10 +543,22 @@ public class GameOverCanvas : MonoBehaviour
|
|||||||
}
|
}
|
||||||
Coroutine countdownCoroutine;
|
Coroutine countdownCoroutine;
|
||||||
|
|
||||||
IEnumerator CoroutineSetTextNumber(float number, TMP_Text text, float speed = 100f, string formatting = "N0", string prefix = "", string suffix = ""){
|
IEnumerator CoroutineSetTextNumber(float number, TMP_Text text, string formatting = "N0", string prefix = "", string suffix = ""){
|
||||||
float t=0;
|
if (text == null)
|
||||||
while(t < number){
|
yield break;
|
||||||
t+=Time.deltaTime*speed;
|
|
||||||
|
float duration = rewardCountUpDuration;
|
||||||
|
if (number <= 0f || duration <= 0f)
|
||||||
|
{
|
||||||
|
text.text = prefix + number.ToString(formatting) + suffix;
|
||||||
|
yield break;
|
||||||
|
}
|
||||||
|
|
||||||
|
float elapsed = 0f;
|
||||||
|
while (elapsed < duration)
|
||||||
|
{
|
||||||
|
elapsed += Time.deltaTime;
|
||||||
|
float t = Mathf.Lerp(0f, number, Mathf.Clamp01(elapsed / duration));
|
||||||
text.text = prefix + t.ToString(formatting) + suffix;
|
text.text = prefix + t.ToString(formatting) + suffix;
|
||||||
yield return null;
|
yield return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,29 @@
|
|||||||
Logger initiated at 9/24/2026 7:04:31 AM
|
Logger initiated at 10/8/2026 12:25:24 AM
|
||||||
|
|
||||||
[9/24/2026 7:04:31 AM] Cupid settings updated
|
[10/8/2026 12:25:24 AM] Cupid settings updated
|
||||||
[9/24/2026 7:04:31 AM] Cupid settings updated
|
[10/8/2026 12:25:24 AM] Cupid settings updated
|
||||||
|
[10/8/2026 12:25:35 AM] Starting matchmake as warlock
|
||||||
|
[10/8/2026 12:25:37 AM] Got into a room
|
||||||
|
[10/8/2026 12:25:37 AM] {"ok":true,"entry_fee":21,"rc_prize":34,"for_red":{"Players":[{"Name":"warlock3","LastSeen":1791399336307,"UserId":6,"l10_wins":6,"l10_losses":3},{"Name":"warlock","LastSeen":1791399337205,"UserId":2,"l10_wins":4,"l10_losses":6}],"GameName":"soccar","Port":26738,"InitTime":1791399336307,"entry_fee":21,"match_id":689,"instance_started":true,"rc_prize":34,"your_team":"red"},"for_blue":{"Players":[{"Name":"warlock3","LastSeen":1791399336307,"UserId":6,"l10_wins":6,"l10_losses":3},{"Name":"warlock","LastSeen":1791399337205,"UserId":2,"l10_wins":4,"l10_losses":6}],"GameName":"soccar","Port":26738,"InitTime":1791399336307,"entry_fee":21,"match_id":689,"instance_started":true,"rc_prize":34,"your_team":"blue"}}
|
||||||
|
[10/8/2026 12:25:37 AM] Configured dedicated match reporting for match id 689 with secret 38516e39d3406225b7c3015a66e5d25c54e9b2024c0755212122bdcea3e3a328 and internal api base https://kkapi.playpoolstudios.com
|
||||||
|
[10/8/2026 12:25:37 AM] Setting cupid to load game scene
|
||||||
|
[10/8/2026 12:25:37 AM] Loading game scene
|
||||||
|
[10/8/2026 12:25:43 AM] Starting client at $kkapi.playpoolstudios.com:26738
|
||||||
|
[10/8/2026 12:25:43 AM] Client connected
|
||||||
|
[10/8/2026 12:25:43 AM] Dedicated join: team assigned Blue isServer=False matchId=689 secretEmpty=False redJoin=False blueJoin=False collected=False
|
||||||
|
[10/8/2026 12:25:58 AM] Selected team changed from Red to Blue
|
||||||
|
[10/8/2026 12:26:03 AM] Selected team changed from Blue to Red
|
||||||
|
[10/8/2026 12:26:03 AM] Score changed from 0 to 1
|
||||||
|
[10/8/2026 12:26:06 AM] Selected team changed from Red to Blue
|
||||||
|
[10/8/2026 12:26:12 AM] Selected team changed from Blue to Red
|
||||||
|
[10/8/2026 12:26:20 AM] Selected team changed from Red to Blue
|
||||||
|
[10/8/2026 12:26:24 AM] Selected team changed from Blue to Red
|
||||||
|
[10/8/2026 12:26:29 AM] Selected team changed from Red to Blue
|
||||||
|
[10/8/2026 12:26:32 AM] Selected team changed from Blue to Red
|
||||||
|
[10/8/2026 12:26:34 AM] Score changed from 1 to 2
|
||||||
|
[10/8/2026 12:26:37 AM] Selected team changed from Red to Blue
|
||||||
|
[10/8/2026 12:26:44 AM] Selected team changed from Blue to Red
|
||||||
|
[10/8/2026 12:26:47 AM] Score changed from 2 to 3
|
||||||
|
[10/8/2026 12:27:00 AM] Client disconnected
|
||||||
|
[10/8/2026 12:27:05 AM] Cupid settings updated
|
||||||
|
[10/8/2026 12:27:05 AM] Cupid settings updated
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.boxqkrtm.ide.cursor": "https://github.com/boxqkrtm/com.unity.ide.cursor.git",
|
"com.boxqkrtm.ide.cursor": "https://github.com/boxqkrtm/com.unity.ide.cursor.git",
|
||||||
"com.hwaet.projectcloner": "https://github.com/hwaet/UnityProjectCloner.git",
|
"com.hwaet.projectcloner": "https://github.com/hwaet/UnityProjectCloner.git",
|
||||||
|
"com.ivanmurzak.unity.mcp": "0.93.0",
|
||||||
"com.unity.addressables": "2.4.1",
|
"com.unity.addressables": "2.4.1",
|
||||||
"com.unity.collab-proxy": "2.11.3",
|
"com.unity.collab-proxy": "2.11.3",
|
||||||
"com.unity.feature.2d": "2.0.1",
|
"com.unity.feature.2d": "2.0.1",
|
||||||
@@ -11,6 +12,7 @@
|
|||||||
"com.unity.render-pipelines.universal": "17.0.4",
|
"com.unity.render-pipelines.universal": "17.0.4",
|
||||||
"com.unity.test-framework": "1.6.0",
|
"com.unity.test-framework": "1.6.0",
|
||||||
"com.unity.timeline": "1.8.9",
|
"com.unity.timeline": "1.8.9",
|
||||||
|
"com.unity.toolchain.linux-x86_64": "2.0.11",
|
||||||
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.11",
|
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.11",
|
||||||
"com.unity.ugui": "2.0.0",
|
"com.unity.ugui": "2.0.0",
|
||||||
"com.unity.modules.accessibility": "1.0.0",
|
"com.unity.modules.accessibility": "1.0.0",
|
||||||
@@ -44,8 +46,7 @@
|
|||||||
"com.unity.modules.video": "1.0.0",
|
"com.unity.modules.video": "1.0.0",
|
||||||
"com.unity.modules.vr": "1.0.0",
|
"com.unity.modules.vr": "1.0.0",
|
||||||
"com.unity.modules.wind": "1.0.0",
|
"com.unity.modules.wind": "1.0.0",
|
||||||
"com.unity.modules.xr": "1.0.0",
|
"com.unity.modules.xr": "1.0.0"
|
||||||
"com.ivanmurzak.unity.mcp": "0.93.0"
|
|
||||||
},
|
},
|
||||||
"scopedRegistries": [
|
"scopedRegistries": [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.test-framework": "1.1.9"
|
"com.unity.test-framework": "1.1.9"
|
||||||
},
|
},
|
||||||
"hash": "53e1baac3cde90c46934f82ee1d61802d2bd6651"
|
"hash": "fd8ff1fb700caf062eb5cce364c1d0a85f99ebe6"
|
||||||
},
|
},
|
||||||
"com.hwaet.projectcloner": {
|
"com.hwaet.projectcloner": {
|
||||||
"version": "https://github.com/hwaet/UnityProjectCloner.git",
|
"version": "https://github.com/hwaet/UnityProjectCloner.git",
|
||||||
@@ -348,6 +348,16 @@
|
|||||||
},
|
},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
|
"com.unity.toolchain.linux-x86_64": {
|
||||||
|
"version": "2.0.11",
|
||||||
|
"depth": 0,
|
||||||
|
"source": "registry",
|
||||||
|
"dependencies": {
|
||||||
|
"com.unity.sysroot": "2.0.10",
|
||||||
|
"com.unity.sysroot.linux-x86_64": "2.0.9"
|
||||||
|
},
|
||||||
|
"url": "https://packages.unity.com"
|
||||||
|
},
|
||||||
"com.unity.toolchain.win-x86_64-linux-x86_64": {
|
"com.unity.toolchain.win-x86_64-linux-x86_64": {
|
||||||
"version": "2.0.11",
|
"version": "2.0.11",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
|
|||||||
@@ -141,7 +141,7 @@ PlayerSettings:
|
|||||||
loadStoreDebugModeEnabled: 0
|
loadStoreDebugModeEnabled: 0
|
||||||
visionOSBundleVersion: 1.0
|
visionOSBundleVersion: 1.0
|
||||||
tvOSBundleVersion: 1.0
|
tvOSBundleVersion: 1.0
|
||||||
bundleVersion: 1.45
|
bundleVersion: 1.46
|
||||||
preloadedAssets:
|
preloadedAssets:
|
||||||
- {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3}
|
- {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3}
|
||||||
metroInputSource: 0
|
metroInputSource: 0
|
||||||
@@ -267,8 +267,8 @@ PlayerSettings:
|
|||||||
AndroidTargetArchitectures: 2
|
AndroidTargetArchitectures: 2
|
||||||
AndroidSplashScreenScale: 0
|
AndroidSplashScreenScale: 0
|
||||||
androidSplashScreen: {fileID: 0}
|
androidSplashScreen: {fileID: 0}
|
||||||
AndroidKeystoreName:
|
AndroidKeystoreName: /mnt/new-volume/KEYS/kk.keystore
|
||||||
AndroidKeyaliasName:
|
AndroidKeyaliasName: kickkings
|
||||||
AndroidEnableArmv9SecurityFeatures: 0
|
AndroidEnableArmv9SecurityFeatures: 0
|
||||||
AndroidEnableArm64MTE: 0
|
AndroidEnableArm64MTE: 0
|
||||||
AndroidBuildApkPerCpuArchitecture: 0
|
AndroidBuildApkPerCpuArchitecture: 0
|
||||||
@@ -280,7 +280,7 @@ PlayerSettings:
|
|||||||
AndroidEnableTango: 0
|
AndroidEnableTango: 0
|
||||||
androidEnableBanner: 1
|
androidEnableBanner: 1
|
||||||
androidUseLowAccuracyLocation: 0
|
androidUseLowAccuracyLocation: 0
|
||||||
androidUseCustomKeystore: 0
|
androidUseCustomKeystore: 1
|
||||||
m_AndroidBanners:
|
m_AndroidBanners:
|
||||||
- width: 320
|
- width: 320
|
||||||
height: 180
|
height: 180
|
||||||
|
|||||||
Reference in New Issue
Block a user