Browse Source

new colors

Maxim Sokhatsky 11 years ago
parent
commit
0e9972f37b

+ 2 - 2
apps/web/priv/static/app/js/bootloader.js

@@ -171,9 +171,9 @@ function translateScene(e)
     $("#Center-Card-Selection").hide();
     $("#You-Discard-Shape").hide();
     
-    $("#Okey").hide();
+//    $("#Okey").hide();
     $("#Okey").on("click", sendSawOkey);
-    $("#Have-8-Tashes").hide();
+//    $("#Have-8-Tashes").hide();
 
 }
 

+ 8 - 3
apps/web/priv/static/app/js/okey/okey.js

@@ -125,7 +125,7 @@ function PostLoad()
                 var card = cards[cards.length-1];
                 scope.deck.$el.append(card.$el[0]);
                 card.$el.attr({ transform: "translate(16 -65)"});
-                if ("none" != $("#Okey")[0].style.display) card.dragHandler.enable();
+                card.dragHandler.enable();
                 card.on("dragstart", scope.deck.select)
                     .on("dragmove", scope.deck.track);
                 card.$el.doubletap(function(){ scope.apiProvider.actionTake(card) });
@@ -235,8 +235,13 @@ function PostLoad()
         var e = {detail: x.detail.json, raw: x.detail.bert};
         var player = dec(e.raw).value[0][3][0].value[0][1].value;
         var enabled = dec(e.raw).value[0][3][1].value[0][1].value;
-        if (enabled) $("#Okey").show(); else {
-            $("#Okey").hide();
+        if (enabled) {
+            // $("#Okey").show();
+            $("#Okey").find("rect").attr("fill","red");
+        } else {
+            // $("#Okey").hide();
+            $("#Okey").find("rect").attr("fill","#517ECE");
+            $("#Gabrielo-Discard-Shape").hide();
             var cards = scope.playersLeftHandsMap[scope.user].cards;
             if (cards.length) cards[cards.length-1].dragHandler.disable();
         }

+ 4 - 1
apps/web/priv/static/app/js/selector.js

@@ -8,7 +8,10 @@ var scope = {
     gameId: 1000001,
     CARD_SOURCE: "svg/Card.svg",
     CARD_SMALL_SOURCE: "svg/Card-Small.svg",
-    CARD_COLORS: [ "#CE290F", "#3B5998", "#48AF5E", "#F8E81C" ],
+     //                       BLUE // "#3B5998" // too saturated "#434C5F"
+//                            GREEN /// original "#48AF5E" // poisoned "#7ED321"
+//                            YELLOW // ori "#F8E81C"//
+    CARD_COLORS: [ "#CE290F", "#606A7E"  , "#7ED321" , "#FDC600"  ],
     MALE_SKINS: [ "Gabrielo", "Mustafa" ],
     FEMALE_SKINS: [ "Alina" ],
     paused: false,

+ 1 - 1
apps/web/priv/static/app/svg/Card.svg

@@ -1,4 +1,4 @@
 <rect fill="#FFFFFF" x="0" y="0" width="40" height="60" rx="8"></rect>
-<text dx="20" x="0" y="26" font-family="Exo 2" font-size="24" font-weight="normal" text-anchor="middle" fill="#48AF5E">1</text>
+<text dx="20" x="0" y="26" font-family="Exo 2" font-size="26" font-weight="normal" text-anchor="middle" fill="#48AF5E">1</text>
 <circle cx="20" cy="43" r="7" fill="#48AF5E"></circle>
 <rect class="overlay" fill-opacity="0.6" fill="#3B5998" x="0" y="0" width="40" height="60" rx="8" style="display:none;"></rect>

BIN
apps/web/priv/static/doc/Kakaranet-Scene.sketch/Data


+ 1 - 1
apps/web/priv/static/doc/Kakaranet-Scene.sketch/metadata

@@ -16,7 +16,7 @@
 		<string>ZapfDingbatsITC</string>
 	</array>
 	<key>length</key>
-	<integer>3019051</integer>
+	<integer>3019278</integer>
 	<key>version</key>
 	<integer>37</integer>
 </dict>