fix bugs

Assets/Prefabs/PopupRockPaperScissors.prefab

@@ -834,6 +834,7 @@ GameObject:
   - component: {fileID: 5573377113298381838}
   - component: {fileID: 5573377113298381839}
   - component: {fileID: 5573377113298381837}
+  - component: {fileID: 8766377150664877656}
   m_Layer: 5
   m_Name: Rock
   m_TagString: Untagged
@@ -939,6 +940,23 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &8766377150664877656
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5573377113298381841}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c48b628189305e649b63ee28987f282f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  previewClip: {fileID: 0}
+  enterAudio: 
+  clickAudio: SE_MENU_SELECT_01
+  exitAudio: 
+  audioType: 0
 --- !u!1 &5573377113519248206
 GameObject:
   m_ObjectHideFlags: 0
@@ -951,6 +969,7 @@ GameObject:
   - component: {fileID: 5573377113519248203}
   - component: {fileID: 5573377113519248204}
   - component: {fileID: 5573377113519248202}
+  - component: {fileID: 2654677456813357488}
   m_Layer: 5
   m_Name: Scissors
   m_TagString: Untagged
@@ -1056,6 +1075,23 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &2654677456813357488
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5573377113519248206}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c48b628189305e649b63ee28987f282f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  previewClip: {fileID: 0}
+  enterAudio: 
+  clickAudio: SE_MENU_SELECT_01
+  exitAudio: 
+  audioType: 0
 --- !u!1 &5573377113918574944
 GameObject:
   m_ObjectHideFlags: 0
@@ -1068,6 +1104,7 @@ GameObject:
   - component: {fileID: 5573377113918574877}
   - component: {fileID: 5573377113918574878}
   - component: {fileID: 5573377113918574876}
+  - component: {fileID: 4117181970961081989}
   m_Layer: 5
   m_Name: Paper
   m_TagString: Untagged
@@ -1173,3 +1210,20 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &4117181970961081989
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5573377113918574944}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c48b628189305e649b63ee28987f282f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  previewClip: {fileID: 0}
+  enterAudio: 
+  clickAudio: SE_MENU_SELECT_01
+  exitAudio: 
+  audioType: 0

Assets/Scripts/MDPro3/Duel/CardDescription.cs

@@ -320,7 +320,7 @@ namespace MDPro3
                         returnValue.sprite = TextureManager.container.attributeSpell;
                         returnValue.notOriginal = true;
                     }
-                    else if ((data.Type & (uint)CardType.Trap & origin.Type) > 0)
+                    else// if ((data.Type & (uint)CardType.Trap) > 0)
                     {
                         returnValue.sprite = TextureManager.container.attributeTrap;
                         returnValue.notOriginal = true;

Assets/Scripts/MDPro3/Duel/GameCard.cs

@@ -1068,7 +1068,8 @@ namespace MDPro3
                 //杻忷欸遢
                 if ((p.reason & (uint)CardReason.SPSUMMON) > 0
                     && (p.location & (uint)CardLocation.MonsterZone) > 0
-                    && (cacheP.location & (uint)CardLocation.MonsterZone) == 0)
+                    && (cacheP.location & (uint)CardLocation.MonsterZone) == 0
+                    && (p.location & (uint)CardLocation.Overlay) == 0)
                 {
                     bool summonEffect = true;
                     if (Program.I().ocgcore.condition == OcgCore.Condition.Duel
@@ -1104,7 +1105,8 @@ namespace MDPro3
                 //籵都欸遢
                 else if ((p.position & (uint)CardPosition.FaceUp) > 0
                     && (p.location & (uint)CardLocation.MonsterZone) > 0
-                    && (cacheP.location & (uint)CardLocation.Hand) > 0)
+                    && (cacheP.location & (uint)CardLocation.Hand) > 0
+                    && (p.location & (uint)CardLocation.Overlay) == 0)
                 {
                     bool cutin = MonsterCutin.HasCutin(data.Id);
                     if (cutin)

Assets/Scripts/MDPro3/Servants/OcgCore.cs

@@ -4371,6 +4371,30 @@ namespace MDPro3
                             cardsInSelection.Add(card);
                         }
                     }
+
+                    level = 0;
+                    foreach (var c in cardsInSelection)
+                        level += c.levelForSelect_1;
+                    if (level == ES_level)
+                        sendable = true;
+                    if (!sendable)
+                    {
+                        level = 0;
+                        foreach (var c in cardsInSelection)
+                            level += c.levelForSelect_2;
+                        if (level == ES_level)
+                            sendable = true;
+                    }
+                    if (sendable)
+                    {
+                        binaryMaster = new BinaryMaster();
+                        binaryMaster.writer.Write(cardsInSelection.Count);
+                        for (var i = 0; i < cardsInSelection.Count; i++)
+                            binaryMaster.writer.Write(i);
+                        SendReturn(binaryMaster.Get());
+                        break;
+                    }
+
                     allOnfield = true;
                     foreach (var c in cardsInSelection)
                         if ((c.p.location & (uint)CardLocation.Onfield) == 0 || (c.p.location & (uint)CardLocation.Overlay) > 0)
@@ -5326,11 +5350,11 @@ namespace MDPro3
                 hintText.text = fieldHint + ": " + 0 + "/" + fieldMax;
             else if(currentMessage == GameMessage.SelectSum)
             {
-                if(!ES_overFlow)
+                if (!ES_overFlow)
                     foreach (var place in places)
                         if (place.cardSelecting)
                             if (!place.cardSelected)
-                                if (CheckSelectableInSum(cardsInSelection, place.cookieCard, cardsMustBeSelected, ES_max))
+                                if (CheckSelectableInSum(cardsInSelection, place.cookieCard, cardsMustBeSelected, ES_max + cardsMustBeSelected.Count))
                                     place.CardInThisZoneSelectable();
                                 else
                                     place.CardInThisZoneUnselectable();
@@ -5371,7 +5395,7 @@ namespace MDPro3
                         foreach (var place in places)
                             if (place.cardSelecting)
                                 if (!place.cardSelected)
-                                    if (CheckSelectableInSum(cardsInSelection, place.cookieCard, selected, ES_max))
+                                    if (CheckSelectableInSum(cardsInSelection, place.cookieCard, selected, ES_max + cardsMustBeSelected.Count))
                                         place.CardInThisZoneSelectable();
                                     else
                                         place.CardInThisZoneUnselectable();

ProjectSettings/ProjectSettings.asset

@@ -134,8 +134,9 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.0.4
-  preloadedAssets: []
+  bundleVersion: 1.0.5
+  preloadedAssets:
+  - {fileID: 11400000, guid: 5fb02d2098f52054b89ce4a9f63ba9ee, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -161,11 +162,11 @@ PlayerSettings:
     Standalone: 0
     iPhone: 0
     tvOS: 0
-  overrideDefaultApplicationIdentifier: 1
+  overrideDefaultApplicationIdentifier: 0
   AndroidBundleVersionCode: 1
-  AndroidMinSdkVersion: 19
+  AndroidMinSdkVersion: 23
   AndroidTargetSdkVersion: 0
-  AndroidPreferredInstallLocation: 1
+  AndroidPreferredInstallLocation: 0
   aotOptions: 
   stripEngineCode: 0
   iPhoneStrippingLevel: 0
@@ -249,8 +250,8 @@ PlayerSettings:
   AndroidTargetDevices: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
-  AndroidKeystoreName: 
-  AndroidKeyaliasName: 
+  AndroidKeystoreName: D:/Program/Unity/Key/user.keystore
+  AndroidKeyaliasName: sherrychaos
   AndroidBuildApkPerCpuArchitecture: 0
   AndroidTVCompatibility: 0
   AndroidIsGame: 1
@@ -529,7 +530,7 @@ PlayerSettings:
     m_APIs: 0b000000
     m_Automatic: 1
   - m_BuildTarget: WindowsStandaloneSupport
-    m_APIs: 0b000000020000001200000015000000
+    m_APIs: 0200000012000000150000000b000000
     m_Automatic: 0
   m_BuildTargetVRSettings:
   - m_BuildTarget: Standalone