2.3 12_01

queuejw · Feb 21, 2024 · d0e4d02 · d0e4d02
1 parent a5a56b5
commit d0e4d02
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,7 +16,7 @@ android {
         minSdk 21
         targetSdk = 34
         versionCode 9
-        versionName '2.3_12'
+        versionName '2.3_12_01'
         multiDexEnabled false
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/ru/dimon6018/neko11/ui/activities/minigames/MLand.java b/app/src/main/java/ru/dimon6018/neko11/ui/activities/minigames/MLand.java
@@ -134,7 +134,7 @@ public Params(Resources res) {
     private ViewGroup mScoreFields;
     static final ArrayList<Player> mPlayers = new ArrayList<>();
     private final ArrayList<Obstacle> mObstaclesInPlay = new ArrayList<>();
-    private float t, dt;
+    private float t;
     private float mLastPipeTime; // in sec
     private int mCurrentPipeId; // basically, equivalent to the current score
     private int mWidth, mHeight;
@@ -442,10 +442,11 @@ public void reset() {
     public void start(boolean startPlaying) {
         L("start(startPlaying=%s)", startPlaying ? "true" : "false");
         if (startPlaying && mCountdown <= 0) {
+            new PrefState(getContext()).setMood(NekoMinigameM.Companion.getCat(), 5);
             showSplash();
             mSplash.findViewById(R.id.play_button).setEnabled(false);
             final View playImage = mSplash.findViewById(R.id.play_button_image);
-            final TextView playText = (TextView) mSplash.findViewById(R.id.play_button_text);
+            final TextView playText = mSplash.findViewById(R.id.play_button_text);
             playImage.animate().alpha(0f);
             playText.animate().alpha(1f);
             mCountdown = 3;
@@ -546,7 +547,7 @@ public static int pick(int[] l) {
     }
     private void step(long t_ms, long dt_ms) {
         t = t_ms / 1000f; // seconds
-        dt = dt_ms / 1000f;
+        float dt = dt_ms / 1000f;
         if (DEBUG) {
             t *= DEBUG_SPEED_MULTIPLIER;
             dt *= DEBUG_SPEED_MULTIPLIER;
@@ -934,7 +935,7 @@ public Player(Context context) {
                     0xFF9E9E9E,
             };
             color = sColors[(sNextColor++% sColors.length)];
-            if(mPlayers.size() == 1) {
+            if(mPlayers.size() >= 2) {
                 getBackground().setTint(color);
             }
             setOutlineProvider(new ViewOutlineProvider() {

diff --git a/app/src/main/java/ru/dimon6018/neko11/ui/activities/minigames/NekoMinigameM.kt b/app/src/main/java/ru/dimon6018/neko11/ui/activities/minigames/NekoMinigameM.kt
@@ -44,7 +44,7 @@ class NekoMinigameM : Activity() {
         val n = mLand!!.numPlayers
         val minus = findViewById<View>(R.id.player_minus_button)
         val plus = findViewById<View>(R.id.player_plus_button)
-        if (n == 1) {
+        if(n == 1) {
             minus.visibility = View.INVISIBLE
             plus.visibility = View.VISIBLE
             plus.requestFocus()

diff --git a/app/src/main/java/ru/dimon6018/neko11/ui/fragments/NekoLandFragment.kt b/app/src/main/java/ru/dimon6018/neko11/ui/fragments/NekoLandFragment.kt
@@ -185,7 +185,6 @@ class NekoLandFragment : Fragment(), PrefsListener {
         val touch: MaterialCardView?
         val skins: MaterialCardView?
         var catMood: Int = mPrefs!!.getMoodPref(cat)
-
         if (bottomsheet == null) {
             bottomsheet = BottomSheetDialog(context)
         }
@@ -213,7 +212,6 @@ class NekoLandFragment : Fragment(), PrefsListener {
         } catch (e: ClassCastException) {
             mood!!.text = getString(R.string.error)
             mPrefs!!.setMood(cat, 3)
-            mood.text = context.getString(R.string.mood, NekoApplication.getCatMood(context, cat))
         }
         catImage?.setImageDrawable(icon)
         if (coloredText!!) {