成语修改

.vs/ChengYu/xs/UserPrefs.xml

 <Properties StartupConfiguration="{E7333CA6-8BB6-E75B-9512-FC74FC33D1A8}|">
-  <MonoDevelop.Ide.Workbench ActiveDocument="Assets/unity.webp/NativeWrapper/Dec/WebPPicture.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Assets/script/utils/AdUtils.cs">
     <Files>
       <File FileName="Assets/unity.webp/Experiment/Animation/WebPRendererWrapper.cs" Line="1" Column="1" />
-      <File FileName="Assets/script/answer/AnswerEvent.cs" Line="92" Column="45" />
+      <File FileName="Assets/script/answer/AnswerEvent.cs" Line="138" Column="9" />
       <File FileName="Assets/unity.webp/Experiment/Animation/WebP.cs" Line="44" Column="83" />
       <File FileName="Assets/unity.webp/NativeWrapper/Dec/WebPConfig.cs" Line="1" Column="1" />
       <File FileName="Assets/unity.webp/Texture2DExt.cs" Line="178" Column="34" />
@@ -10,23 +10,45 @@
       <File FileName="Assets/unity.webp/Info.cs" Line="1" Column="1" />
       <File FileName="Assets/unity.webp/Error.cs" Line="1" Column="1" />
       <File FileName="Assets/unity.webp/NativeWrapper/Dec/WebPPicture.cs" Line="1" Column="1" />
+      <File FileName="Assets/script/dialog/CongratulationsAcquireControl.cs" Line="103" Column="76" />
+      <File FileName="Assets/script/grid/Grid.cs" Line="260" Column="6" />
+      <File FileName="Assets/NetWork/HTTP/NetConfig.cs" Line="24" Column="42" />
+      <File FileName="Assets/script/DialogControl.cs" Line="44" Column="56" />
+      <File FileName="Assets/script/answer/entity/AnswerEntity.cs" Line="11" Column="1" />
+      <File FileName="Assets/script/module/PassLevelData.cs" Line="1" Column="14" />
+      <File FileName="Assets/script/dialog/PassLevelControl.cs" Line="188" Column="84" />
+      <File FileName="Assets/script/MainControl.cs" Line="397" Column="18" />
+      <File FileName="Assets/script/utils/AdUtils.cs" Line="19" Column="30" />
+      <File FileName="Assets/AD/AD_Manager/AdManager.cs" Line="1128" Column="17" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="ChengYu" expanded="True">
             <Node name="Assets" expanded="True">
+              <Node name="AD" expanded="True">
+                <Node name="AD_Manager" expanded="True" />
+              </Node>
+              <Node name="NetWork" expanded="True">
+                <Node name="HTTP" expanded="True" />
+              </Node>
               <Node name="script" expanded="True">
-                <Node name="answer" expanded="True" />
+                <Node name="answer" expanded="True">
+                  <Node name="entity" expanded="True" />
+                </Node>
+                <Node name="dialog" expanded="True" />
+                <Node name="grid" expanded="True" />
+                <Node name="module" expanded="True" />
+                <Node name="utils" expanded="True">
+                  <Node name="AdUtils.cs" selected="True" />
+                </Node>
               </Node>
               <Node name="unity.webp" expanded="True">
                 <Node name="Experiment" expanded="True">
                   <Node name="Animation" expanded="True" />
                 </Node>
                 <Node name="NativeWrapper" expanded="True">
-                  <Node name="Dec" expanded="True">
-                    <Node name="WebPPicture.cs" selected="True" />
-                  </Node>
+                  <Node name="Dec" expanded="True" />
                 </Node>
               </Node>
             </Node>

Assets/script/MainControl.cs

@@ -396,19 +396,23 @@ public class MainControl : MonoBehaviour
 	{
 		AdUtils.PlayRewardAd("reward_all", new Action<AdEntity>((adEntity) =>
 		{
+			Debug.unityLogger.Log("passlevel", " receivePassLevelreceivePassLevel" + adEntity.codeId);
 			if (null != adEntity)
 			{
 				EventUtils.OnEvent("reward_levelsPacket", "激励视频_过关红包");
 				EventUtils.OnEvent("reward_all", "激励视频_过关红包");
 				Dictionary<string, object> parameters = new Dictionary<string, object>();
 				parameters.Add("adCode", adEntity.codeId);
-				parameters.Add("uuid", mHomeData.redPacks[0].uuid);
+				parameters.Add("uuid", mHomeData.redPacks[0].uuid);  
 				HttpTool.Instance._Get(NetConfig.URL_PICTURE_PASSRED, parameters,
 					  new Action<PassLevelData.Receive>((result) =>
 					  {
+						  Debug.unityLogger.Log("passlevel", " result.cash + " + result.cash + "");
 						  GameObject.Find("dialog").GetComponent<DialogControl>().showCongratulationsAcquire(result.cash + "", Math.Round(((decimal)result.balance / 10000), 2) + "", 1, false);//奖励弹窗
 						  GameObject.Find("main").GetComponent<MainControl>().getHomeInfo(true, false);
-					  }), new Action<string, string>((code, mes) => { }));
+					  }), new Action<string, string>((code, mes) => {
+
+					  }));
 			}
 		}));
 	}
@@ -426,6 +430,8 @@ public class MainControl : MonoBehaviour
 				EventUtils.OnEvent("reward_all", "激励视频_在线红包");
 				Dictionary<string, object> parameters = new Dictionary<string, object>();
 				parameters.Add("adCode", adEntity.codeId);
+
+				Debug.unityLogger.Log("passlevel", "   receiveOnlineRedPacketReward");
 				HttpTool.Instance._Get(NetConfig.URL_ONLINE_RED, parameters,
 					new Action<OnlineRedPacketData>((result) =>
 					{
@@ -686,4 +692,25 @@ public class MainControl : MonoBehaviour
 			image.texture = DownloadHandlerTexture.GetContent(www);//获取并创建Texture
 		}
 	}
+
+
+	/// <summary>
+    /// 获取过关红包
+    /// </summary>
+    /// <param name="order"></param>
+	public void getPassLevelReward(string order)
+	{
+		Dictionary<string, object> parameters = new Dictionary<string, object>();
+		parameters.Add("secretOrder", order);
+		HttpTool.Instance._Get(NetConfig.URL_PICTURE_PASS, parameters,
+			  new Action<PassLevelData>((result) => {
+
+				  Debug.unityLogger.Log("answerEvent", "获取奖励" + result.uuid);
+				  GameObject.Find("dialog").GetComponent<DialogControl>().showPassLevel(1, 1, true, true);//看视频的过关红包
+				  GameObject.Find("music").GetComponent<MusicControl>().playPicturePuzzleFinishAudio();
+              }), new Action<string, string>((code, mes) => {
+				  Debug.unityLogger.Log("answerEvent", "获取奖励" + code + "   " + mes);
+			  }));
+	}
+
 }

Assets/script/answer/AnswerEvent.cs

@@ -59,9 +59,8 @@ public class AnswerEvent : MonoBehaviour
                    m_btn_answer_tv_one.text = result.answerList[0];
                    m_btn_answer_tv_two.text = result.answerList[1];
                }
-
-               m_answer_number.text = "第" + result.questionNo + "关";
-               m_answer_right_number.text = "已答对" + result.correctNumber + "题";
+               m_answer_number.text = "第<color=#FF1523>" + result.questionNo+ "</color>关";
+               m_answer_right_number.text = "已答对<color=#FF1523>" + result.correctNumber + "</color>题";
                StartCoroutine(loadImg(result.imgURL));
            }), new Action<string, string>((code, mes) => {
 
@@ -104,6 +103,7 @@ public class AnswerEvent : MonoBehaviour
              Debug.unityLogger.Log("AnswerEvent","回答题目："+ result.correct);
              if (result.correct)
              {
+                 Debug.unityLogger.Log("AnswerEvent", "回答题目：  qqwsw");
                  answerRight(position,result);
              }
              else
@@ -133,19 +133,20 @@ public class AnswerEvent : MonoBehaviour
         {
             m_btn_answer_two.GetComponent<Image>().sprite = btnBgSpriteArray[2];
         }
-
-
-        GameObject.Find("gird").GetComponent<Grid>().getPassLevelReward(result.secretOrder);
-        getQueastion();
-        //StartCoroutine(nextQuestion());
-    }
-
+        Debug.unityLogger.Log("AnswerEvent", "回答题目：  qqwsdsaw" + result.secretOrder);
+        GameObject.Find("main").GetComponent<MainControl>().getPassLevelReward(result.secretOrder);//TODO 有问题
+        Debug.unityLogger.Log("AnswerEvent", "回答题目：  qqwsdafdsfdsadsaw");
+        StartCoroutine(nextQueastion());
        
-    private IEnumerator nextQuestion()
-    {
-        yield return new WaitForSeconds(1f);
+        Debug.unityLogger.Log("AnswerEvent", "回答题目：  ccccc");
+    }
+    private IEnumerator nextQueastion() {
+        yield return new WaitForSeconds(2f);
         getQueastion();
     }
+
+
+
     /// <summary>
     /// 回答错误
     /// </summary>
@@ -170,6 +171,9 @@ public class AnswerEvent : MonoBehaviour
     public void recover()
     {
         isAnswer = false;
+        m_btn_answer_one.GetComponent<Image>().sprite = btnBgSpriteArray[0];
+        m_btn_answer_two.GetComponent<Image>().sprite = btnBgSpriteArray[0];
+
     }
 
 

Assets/script/dialog/PassLevelControl.cs

@@ -167,8 +167,10 @@ public class PassLevelControl : MonoBehaviour
      */
 	public void buttonClick()
     {
+        Debug.unityLogger.Log("passlevel","11111111");
         closeCount = 0;
         GameObject.Find("dialog").GetComponent<DialogControl>().closePassLevel();
+        Debug.unityLogger.Log("passlevel", "222222222");
         if (buttonType == 0)//领取
         {
             GameObject.Find("grid").GetComponent<Grid>().receivePassLevel(false, false);
@@ -180,6 +182,7 @@ public class PassLevelControl : MonoBehaviour
                     GameObject.Find("dialog").GetComponent<DialogControl>().receiveTaskReward(1);
                     break;
                 case 1:
+                    Debug.unityLogger.Log("passlevel", "3333333333");
                     if (isHomeReceivePassLevel)
                     {
                         GameObject.Find("main").GetComponent<MainControl>().receivePassLevel();

Assets/script/grid/Grid.cs

@@ -258,11 +258,12 @@ public class Grid : MonoBehaviour
      */
     public void getPassLevelReward(string order)
     {
+
         Dictionary<string, object> parameters = new Dictionary<string, object>();
         parameters.Add("secretOrder", order);
-        HttpTool.Instance._Get(NetConfig.URL_PICTURE_PASS, null,
+        HttpTool.Instance._Get(NetConfig.URL_PICTURE_PASS, parameters,
               new Action<PassLevelData>((result) => {
-                  passLevelImage.gameObject.SetActive(false);
+                  //passLevelImage.gameObject.SetActive(false);
                   this.uuid = result.uuid;
                   if (passAge == 1)
                   {
@@ -275,7 +276,7 @@ public class Grid : MonoBehaviour
                   GameObject.Find("music").GetComponent<MusicControl>().playPicturePuzzleFinishAudio();
                   isClickItem = true;
               }), new Action<string, string>((code, mes) => {
-                  passLevelImage.gameObject.SetActive(false);
+                  //passLevelImage.gameObject.SetActive(false);
                   isClickItem = true;
               }));
     }

Assets/script/utils/AdUtils.cs

@@ -13,13 +13,13 @@ public class AdUtils
 
     public static void PlayRewardAd(string actionName, Action<AdEntity> callback)
     {
-#if UNITY_EDITOR
-        AdEntity adEntity = new AdEntity();
-        //adEntity.codeId = "945962399";
-        callback(adEntity);
-#else
+//#if UNITY_EDITOR
+//        AdEntity adEntity = new AdEntity();
+//        //adEntity.codeId = "945962399";
+//        callback(adEntity);
+//#else
               AdManager.Instance.PlayCacheRewardVideoAd("video", actionName, new RewardAdListener(actionName, callback));
-#endif
+//#endif
 
     }
 

Library/PlayerDataCache/Android/Data/boot.config

@@ -3,4 +3,4 @@ vr-enabled=0
 hdr-display-enabled=0
 androidStartInFullscreen=1
 androidRenderOutsideSafeArea=1
-buildDate=637539077913389540
+buildDate=637539177961666000

Library/PlayerDataCache/Android/ScriptsOnlyCache.yaml

@@ -1100,4 +1100,4 @@ ScriptsOnlyBuild:
   - Assets/Scenes/premiss.unity
   - Assets/Game/Splash/Splash.unity
   - Assets/Scenes/game.unity
-  playerPath: /Users/erwin/unityproject/ChengYu/ccc
+  playerPath: /Users/erwin/unityproject/ccc

Library/StateCache/Hierarchy/be6567-mainStage.json

-{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-46488,-46468,-46256,-46158,-46152,-45912,-45892,-45680,-45582,-45576,-45092,-45072,-44860,-44762,-44756,-44518,-44498,-44286,-44188,-44182,-43952,-43932,-43930,-43836,-43832,-43396,-43376,-43164,-43066,-43060,-41378,-41358,-41146,-41048,-41042,-40030,-40010,-39798,-39700,-39694,-38068,-38048,-37836,-37738,-37732,-36448,-36428,-36216,-36118,-36112,-31668,-31648,-31436,-31342,-31338,-31288,-31190,-31184,-30528,-30508,-30506,-30412,-30408,-30356,-30336,-30124,-30026,-30020,-28640,-28620,-28408,-28310,-28304,-28074,-28054,-27842,-27744,-27738,-27070,-27050,-26838,-26740,-26734,-25616,-25500,-25480,-24892,-24888,-24882,-24236,-24048,-24028,-23816,-23718,-23712,-23494,-23474,-23262,-23164,-23158,-22942,-22922,-22710,-22612,-22606,-21422,-19676,-19660,-18848,-16162,-15358,-14530,-14376,-10610,-8942,-8922,-8710,-8612,-8606,-8380,-8360,-8148,-8050,-8044,-7820,-7800,-7588,-7490,-7484,-6806,-6756,-6736,-6450,-6356,-6352,-6276,-6262,-6248,-6188,-6168,-6166,-6072,-5938,-5918,-5916,-5822,-5462,-5400,-5380,-5094,-5090,-4894,-4734,-4714,-4712,-4708,-4614,-4504,-4484,-4482,-4478,-4384,-4296,-4276,-4064,-4058,-3960,-2656,-2636,-2420,-2410,-2308,-1272,-12,17056,28034,29078,29100,29586,106738,107226,107694,107762,108648,140104,145464,147026,151376,151862,152930,153348,169816,169874,169888,170906,171428,214888,214946,263304,264322,281112,281126,281402,282186,283132,298548,298606,299638,299680,300270,309052,309342,310076,310118,310602,310708,311064,326608],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
+{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-57674,-57654,-57442,-57344,-57338,-57124,-57104,-56892,-56794,-56788,-56558,-56538,-56326,-56228,-56222,-55984,-55964,-55752,-55654,-55648,-54792,-54772,-54560,-54462,-54456,-54236,-54216,-54004,-53906,-53900,-53664,-53644,-53432,-53334,-53328,-52724,-52704,-52492,-52394,-52388,-52172,-52152,-51940,-51842,-51836,-51600,-51580,-51368,-51270,-51264,-51020,-51000,-50788,-50690,-50684,-50468,-50448,-50236,-50138,-50132,-49910,-49890,-49678,-49580,-49574,-48764,-48744,-48532,-48434,-48428,-48212,-48192,-47980,-47882,-47876,-47052,-47032,-46820,-46722,-46716,-46488,-46468,-46256,-46158,-46152,-45912,-45892,-45680,-45582,-45576,-45092,-45072,-44860,-44762,-44756,-44518,-44498,-44286,-44188,-44182,-43952,-43932,-43930,-43836,-43832,-43396,-43376,-43164,-43066,-43060,-41378,-41358,-41146,-41048,-41042,-40030,-40010,-39798,-39700,-39694,-38068,-38048,-37836,-37738,-37732,-36448,-36428,-36216,-36118,-36112,-31668,-31648,-31436,-31342,-31338,-31288,-31190,-31184,-30528,-30508,-30506,-30412,-30408,-30356,-30336,-30124,-30026,-30020,-28640,-28620,-28408,-28310,-28304,-28074,-28054,-27842,-27744,-27738,-27070,-27050,-26838,-26740,-26734,-25616,-25500,-25480,-24892,-24888,-24882,-24236,-24048,-24028,-23816,-23718,-23712,-23494,-23474,-23262,-23164,-23158,-22942,-22922,-22710,-22612,-22606,-21422,-19676,-19660,-18848,-16162,-15358,-14530,-14376,-10610,-8942,-8922,-8710,-8612,-8606,-8380,-8360,-8148,-8050,-8044,-7820,-7800,-7588,-7490,-7484,-6806,-6756,-6736,-6450,-6356,-6352,-6276,-6262,-6248,-6188,-6168,-6166,-6072,-5938,-5918,-5916,-5822,-5462,-5400,-5380,-5094,-5090,-4894,-4734,-4714,-4712,-4708,-4614,-4504,-4484,-4482,-4478,-4384,-4296,-4276,-4064,-4058,-3960,-2656,-2636,-2420,-2410,-2308,-1272,-12,17056,28034,29078,29100,29586,106738,107226,107694,107762,108648,140104,145464,147026,151376,151862,152930,153348,169816,169874,169888,170906,171428,214888,214946,263304,264322,281112,281126,281402,282186,283132,298548,298606,299638,299680,300270,309052,309342,310076,310118,310602,310708,311064,326608,377750,378874,379466,393940,393998,395022,395550,447350,447838,447896,448920,449448],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file

Library/StateCache/SceneView/b24938-mainStage.json

-{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":false,"showMaterialUpdate":false,"showSkybox":false,"showFlares":false,"showImageEffects":false,"showParticleSystems":false},"in2DMode":false,"pivot":{"x":0.0,"y":0.0,"z":-10.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":10.0,"orthographic":false}
\ No newline at end of file
+{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":false,"showMaterialUpdate":false,"showSkybox":false,"showFlares":false,"showImageEffects":false,"showParticleSystems":false},"in2DMode":false,"pivot":{"x":0.0,"y":0.0,"z":-10.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":-44.1953125,"orthographic":false}
\ No newline at end of file

Temp/StagingArea/UnityManifest.xml

@@ -30,7 +30,7 @@
     <meta-data android:name="unity.splash-mode" android:value="0" />
     <meta-data android:name="unity.splash-enable" android:value="True" />
     <meta-data android:name="notch.config" android:value="portrait|landscape" />
-    <meta-data android:name="unity.build-id" android:value="2cffe676-09ae-41a6-b647-7a6c50418bdf" />
+    <meta-data android:name="unity.build-id" android:value="d2673555-2cb2-496a-b4d5-3438529f341f" />
   </application>
   <uses-feature android:glEsVersion="0x00030000" />
   <uses-feature android:name="android.hardware.vulkan.version" android:required="false" />

Temp/StagingArea/assets/bin/Data/boot.config

@@ -3,4 +3,4 @@ vr-enabled=0
 hdr-display-enabled=0
 androidStartInFullscreen=1
 androidRenderOutsideSafeArea=1
-buildDate=637539077913389540
+buildDate=637539177961666000