困难最新

.gitignore

@@ -101,3 +101,4 @@ assetbundleBak*
 /Logs
 
 /Local/ios
+/ProjectSettings/Packages

Assets/Content/Prefabs/UI/UIVoyage/UIVoyageRobbery.prefab

@@ -152,9 +152,9 @@ RectTransform:
   m_Father: {fileID: 213512089003709444}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 276, y: -90}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 288, y: 128}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5556922227951424922
@@ -1561,7 +1561,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &213512089003709444
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4214,7 +4214,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &9107271259175808878
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4612,9 +4612,9 @@ RectTransform:
   m_Father: {fileID: 213512089003709444}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 664, y: -90}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 288, y: 128}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1891850431618650992

Assets/Editor/Pack/PackRun.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -341,7 +341,7 @@ namespace Pack
             SavePackToolsSettings();
         }
 
-        [InitializeOnLoadMethod]
+        //[InitializeOnLoadMethod]
         private static void RegisterBuildPlayerHandler()
         {
             BuildPlayerWindow.RegisterBuildPlayerHandler(BuildPlayerHandler);

Assets/Editor/Pack/Platform/PackPlatformiOSBuild.cs

@@ -199,7 +199,7 @@ namespace Pack
                 plistDocument.root.SetString("NSUserTrackingUsageDescription", "获取设备信息用以精准推送您喜欢的内容");
             }
 
-         
+          //plistDocument.root.SetString("FacebookUrlSchemeSuffix", "3db62ef3789f3752a4a6d1b7ffc6f922");
             /* FacebookAppID:facebook 后台应用参数
              * FacebookUrlSchemeSuffix 应用参数后缀，后缀仅可使用字母字符。（可不设置，当多应用共用一个 appid 时需添加，可避免 FB 登录成功后返回到其他应用）
              * FacebookDisplayNam:facebook 后台配置的应用名称{游戏名称}； 
@@ -207,7 +207,7 @@ namespace Pack
              * LSApplicationQueriesSchemes:Facebook 相关白名单。*/
 
             plistDocument.root.SetString("FacebookAppID", "214372257886989");
-            //plistDocument.root.SetString("FacebookUrlSchemeSuffix", "3db62ef3789f3752a4a6d1b7ffc6f922");
+           
             plistDocument.root.SetString("FacebookDisplayNam", "初心者大冒險");
             plistDocument.root.SetString("FacebookClientToken", "eb90a0c5b6ab59dc16d63f2e78a34f39");
             PlistElementArray plArr = plistDocument.root.CreateArray("LSApplicationQueriesSchemes");

Assets/ExportedObj.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d0f7432d890b38849b3439c4c14a7451
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Lua/Logic/HardLevel/HardMissionDataMgr.lua

@@ -88,29 +88,31 @@ end
 
 function HardMissionDataMgr:GetShowGroup()
 	local retData = nil
-	LogError("------TaskGroupList-1-----"..Inspect(self.TaskGroupList))
-	table.sort(self.TaskGroupList,function (a,b)
-		--LogError("------a------"..Inspect(a))
-		--LogError("------b------"..Inspect(b))
-		if a == nil then
-			return false
-		elseif b == nil then
-			return true
-		end		
-		return a.groupID < b.groupID
-	end)
-
-	LogError("------TaskGroupList-2-----"..Inspect(self.TaskGroupList))
+	
+	local curmaxGetId = -1
+	local maxId = -1
+	local minId = 999999
 	for _, v in pairs(self.TaskGroupList) do
-		--LogError("------TaskGroupList------"..v.groupID)
-		if v and retData == nil then
-			retData = v
-		elseif v and retData:IsGetAllReward() and  not v:IsGetAllReward() and v.groupID > retData.groupID then
-			retData = v
-			break
+			
+		if v ~= nil and v:IsGetAllReward() and v.groupID > curmaxGetId then
+			curmaxGetId = v.groupID
+		end
+
+		if v ~= nil and v.groupID > maxId then
+			maxId = v.groupID
+		end
+
+		if v ~= nil and v.groupID < minId then
+			minId = v.groupID
 		end
 
 	end
+	--LogError("-------------curmaxGetId----------  "..curmaxGetId)
+	curmaxGetId = curmaxGetId + 1
+	curmaxGetId = curmaxGetId > maxId and maxId or curmaxGetId
+	curmaxGetId = curmaxGetId < minId and minId or curmaxGetId
+	retData = self.TaskGroupList[curmaxGetId]
+	--LogError("-------------GetShowGroup----------  "..curmaxGetId)
 	return retData
 end
 

Assets/Lua/Logic/HardLevel/TaskGroup.lua

@@ -48,7 +48,7 @@ end
 function TaskGroup:IsGetAllReward()
     if self.groupTask == nil then
         LogError("***************** groupTask 為 NULL ！！！*****************")
-        return self.getCount >= self.total
+        return self.total ~= 0 and  self.getCount >= self.total
     end
    
     return self.getCount >= self.total and self.groupTask._got == 2

Assets/Lua/UI/UITask/UIDiffTaskView.lua

@@ -76,7 +76,7 @@ function UIDiffTaskView:SetItems()
 	local datalist = {}--{1,2,3,}
 	if curgroup ~= nil and curgroup.groupTask ~= nil then
 		--LogError("--------curgroup  有值---")
-		datalist =  self:GetTaskList(curgroup.taskList)
+		
 		self:SetGroupReward(curgroup.rewardCfg.GroupReward)
 		local got = curgroup.groupTask._got
 		self.btnGoto:SetActive(got == 0)
@@ -89,6 +89,10 @@ function UIDiffTaskView:SetItems()
 		self.sealBtn:SetActive(false)
 		self.btnGoto:SetActive(false)
 	end
+	if curgroup ~= nil and curgroup.taskList then
+		datalist =  self:GetTaskList(curgroup.taskList)
+	end
+
 	--datalist =  self:GetTaskList(curgroup.taskList)
 	LogError("--------datalist---"..Inspect(datalist))
 

Assets/Lua/UI/UIVoyage/UIVoyageRobberyView.lua

@@ -36,7 +36,7 @@ function UIVoyageRobberyView:Init()
 	self.controller:InitData()
 	self:RefreshView()
 	self:RefreshRobNum()
-	self.box:SetActive(false)
+	self.box:SetActive(true)
 	
 end
 
@@ -48,7 +48,7 @@ function UIVoyageRobberyView:AddUIEventListener()
 	self.uiBase:AddButtonUniqueEventListener(self.AnyBtn.button,self, self.OnClickCloseBtn)
 	self.uiBase:AddButtonUniqueEventListener(self.btnClose.button, self, self.OnClickCloseBtn)
 	self.uiBase:AddButtonUniqueEventListener(self.btnCancle.button, self, self.OnClickCloseBtn)
-	--self.uiBase:AddButtonUniqueEventListener(self.btnChallenge.button, self, self.OnClickChallengeBtn)
+	self.uiBase:AddButtonUniqueEventListener(self.btnChallenge.button, self, self.OnClickChallengeBtn)
 end
 
 function UIVoyageRobberyView:OnHide()
@@ -57,7 +57,7 @@ end
 
 function UIVoyageRobberyView:OnShow(data)
 	self.controller:SetData(data)
-	self.box:SetActive(false)
+	self.box:SetActive(true)
 end
 
 function UIVoyageRobberyView:OnClose()

Assets/Lua/UI/UIVoyage/UIVoyageView.lua

@@ -40,7 +40,7 @@ function UIVoyageView:Init()
 		self.airShipTimer:Start()
 	end
 	ManagerContainer.LuaUIMgr:ClosePage(Enum.UIPageName.UIDojoExit)
-	self.btnLog:SetActive(false)
+	self.btnLog:SetActive(true)
 end
 
 function UIVoyageView:RemoveEventListener()

Assets/Plugins/QuickSDK/QKGame.cs

@@ -27,15 +27,15 @@ public class QKGame {
 
     public Dictionary<string, ProductInfo> ProductInfos = new Dictionary<string, ProductInfo>()
     {
-        { "0.99",new ProductInfo(){ ID = "product_ticket_0.99_ro",Name = "商品1"} },
-        { "1.99",new ProductInfo(){ ID = "product_ticket_1.99_ro",Name = "商品2"} },
-        { "2.99",new ProductInfo(){ ID = "product_ticket_2.99_ro",Name = "商品3"} },
-        { "4.99",new ProductInfo(){ ID = "product_ticket_4.99_ro",Name = "商品4"} },
-        { "9.99",new ProductInfo(){ ID = "product_ticket_9.99_ro",Name = "商品5"} },
-        { "14.99",new ProductInfo(){ ID = "product_ticket_14.99_ro",Name = "商品6"} },
-        { "19.99",new ProductInfo(){ ID = "product_ticket_19.99_ro",Name = "商品7"} },
-        { "49.99",new ProductInfo(){ ID = "product_ticket_49.99_ro",Name = "商品8"} },
-        { "99.99",new ProductInfo(){ ID = "product_ticket_99.99_ro",Name = "商品9"} },
+        { "0.99",new ProductInfo(){ ID = "intention0.99",Name = "0.99禮包"} },
+        { "1.99",new ProductInfo(){ ID = "intention1.99",Name = "1.99禮包"} },
+        { "2.99",new ProductInfo(){ ID = "intention2.99",Name = "2.99禮包"} },
+        { "4.99",new ProductInfo(){ ID = "intention4.99",Name = "4.99禮包"} },
+        { "9.99",new ProductInfo(){ ID = "intention9.99",Name = "9.99禮包"} },
+        { "14.99",new ProductInfo(){ ID = "intention14.99",Name = "14.99禮包"} },
+        { "19.99",new ProductInfo(){ ID = "intention19.99",Name = "19.99禮包"} },
+        { "49.99",new ProductInfo(){ ID = "intention49.99",Name = "49.99禮包"} },
+        { "99.99",new ProductInfo(){ ID = "intention99.99",Name = "99.99禮包"} },
     };
 
     [DllImport("__Internal")]

Assets/Src/Core/DownLoad/GameDatabase.cs

@@ -17,7 +17,7 @@ using UnityEngine;
 
     public abstract class GameData<T> : GameData where T : GameData
     {
-
+        
         protected static Dictionary<int, T> configDatas = new Dictionary<int, T>();
         protected static string[] fields;
         protected static string[] types;

Packages/packages-lock.json

@@ -78,9 +78,9 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
+        "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.director": "1.0.0",
         "com.unity.modules.animation": "1.0.0",
-        "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.particlesystem": "1.0.0"
       },
       "url": "https://packages.unity.com"

ProjectSettings/ProjectSettings.asset

@@ -883,7 +883,7 @@ PlayerSettings:
   assemblyVersionValidation: 1
   gcWBarrierValidation: 0
   apiCompatibilityLevelPerPlatform:
-    Android: 3
+    Android: 6
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
   metroPackageName: Template_3D

ProjectSettings/QualitySettings.asset

@@ -232,4 +232,5 @@ QualitySettings:
     Android: 0
     Server: 0
     Standalone: 0
+    WebGL: 0
     iPhone: 0

UserSettings/Layouts/default-2021.dwlt

@@ -14,8 +14,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 15
-    y: 69
+    x: 28
+    y: 40
     width: 546
     height: 887
   m_ShowMode: 0
@@ -97,7 +97,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 221}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 14
+  controlID: 74
 --- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -193,7 +193,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 43
+  controlID: 70
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -218,7 +218,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 76
+  controlID: 51
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -243,7 +243,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 112
+  controlID: 52
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -289,8 +289,8 @@ MonoBehaviour:
     y: 0
     width: 654
     height: 456
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 17}
@@ -342,8 +342,8 @@ MonoBehaviour:
     y: 0
     width: 309
     height: 853
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 20}
@@ -370,8 +370,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 15
-    y: 69
+    x: 28
+    y: 40
     width: 546
     height: 866
   m_ViewDataDictionary: {fileID: 0}
@@ -478,7 +478,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: caecc8ffd4ecc8ffe2ecc8ff86edc8ff12f2c8ff54f2c8ff5af2c8ff70f2c8ff78f2c8ff92f2c8ff9cf2c8ffacf2c8ff3e51c9ff4251c9ff1252c9ff0454c9ffa854c9ffac54c9ffc054c9ff3e55c9ffe45fccffde66ccffea66ccffee66ccfff666ccff9a67ccffb467ccffc067ccffce67ccff0c06cdff2c06cdff3006cdff0007cdffe608cdfff208cdff9609cdff9a09cdffae09cdff340acdff2426cdff3026cdff3426cdff3c26cdffe026cdfffa26cdff0627cdff1427cdff70c5cdff74c5cdff44c6cdff2ac8cdff36c8cdffdac8cdffdec8cdfff2c8cdff78c9cdffcc2acfffba31cfffc631cfffca31cfffd231cfff7632cfff9032cfff9c32cfffaa32cfffa091cfffbc91cfffd291cfff7a92cfff3294cfffc296cfff3a9ecfff08d1cfff0cd1cfffdcd1cfffc2d3cfffced3cfff72d4cfff76d4cfff8ad4cfff10d5cfff4e67d1ff5a67d1ff5e67d1ff6667d1ff0a68d1ff2468d1ff3068d1ff3e68d1ffce23d2ffee23d2fff223d2ffc224d2ffa826d2ffb426d2ff5827d2ff5c27d2ff7027d2fff627d2ff8a44d2ff9644d2ff9a44d2ffa244d2ff4645d2ff6045d2ff6c45d2ff7a45d2fffe5cd2fff075d2ff9a7dd2ffb47dd2ffc07dd2ffce7dd2ffa650d3ffaa50d3ff7a51d3ff6053d3ff6c53d3ff1054d3ff1454d3ff2854d3ffae54d3ff9223eaff3c33eaff5633eaff6033eaff6e33eaffd210ebffd810ebff0011ebff0611ebffc011ebfff411ebff3e12ebff4812ebffd81aebfffc1aebffc286efff6c96efff8696efff9096efff9e96efff4cc2f1ff62c2f1ff6ec2f1ff74c2f1ffd2c2f1ffe6c2f1fff2c2f1fff6c2f1ff00c3f1ff10c3f1ff6208f2ff600cf2ff6a0cf2ff740cf2ff7c0df2ff886ff3ff8e6ff3ffb66ff3ffbc6ff3ff7670f3ffaa70f3ffec70f3fff470f3fffe70f3ff8e79f3ffb279f3ff767bf3ff208bf3ff3a8bf3ff448bf3ff548bf3ffa219f7ffae19f7ffb219f7ffba19f7ff5e1af7ff781af7ff841af7ff921af7ffcad6f7ffd6d6f7ffdad6f7ffe2d6f7ff86d7f7ffa0d7f7ffacd7f7ffbad7f7fffa78fbff0679fbff0a79fbff1279fbffb679fbffd079fbffdc79fbffea79fbffe0f4fcffecf4fcfff0f4fcfff8f4fcff9cf5fcffb6f5fcffc2f5fcffd0f5fcffda5cfdffdc62fdff9826feffa826feffe833fefff433fefff833feff0034feffa434feffbe34feffca34feffd834feff9818ffffe418ffff0019ffff5419ffff1a1affff8e1cffffb41cffff381dffffe4fafffff4ffffff7e5e0000
+      m_ExpandedIDs: e4faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -795,9 +795,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.7368742, y: 1.4435947, z: 402.99802}
+    m_Target: {x: -1.1197286, y: 0.13107213, z: 390.35522}
     speed: 2
-    m_Value: {x: -0.7368742, y: 1.4435947, z: 402.99802}
+    m_Value: {x: -1.1197286, y: 0.13107213, z: 390.35522}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -848,9 +848,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 2.2110763
+    m_Target: 7.591902
     speed: 2
-    m_Value: 2.2110763
+    m_Value: 7.591902
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -916,23 +916,23 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Src/GameLogic
+    - Assets/Content/Prefabs/UI/UILanuch
     m_Globs: []
     m_OriginalText: 
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
-  m_StartGridSize: 64
+  m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Src/GameLogic
-  m_LastFoldersGridSize: -1
+  - Assets/Content/Prefabs/UI/UILanuch
+  m_LastFoldersGridSize: 16
   m_LastProjectPath: E:\Project\Unity\bt_client_2022_S
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 3900}
-    m_SelectedIDs: d2120b00
-    m_LastClickedID: 725714
-    m_ExpandedIDs: 00000000b65e0000b85e0000ba5e0000bc5e0000be5e0000c05e0000c25e0000c45e0000c65e0000c85e0000ca5e0000cc5e0000ce5e0000d05e0000fae5080000ca9a3b
+    scrollPos: {x: 0, y: 748}
+    m_SelectedIDs: 1c510100
+    m_LastClickedID: 86300
+    m_ExpandedIDs: 00000000bc5e0000be5e0000c05e0000c25e0000c45e0000c65e0000c85e0000ca5e0000cc5e0000ce5e0000d05e0000d25e0000d45e0000d65e0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -960,7 +960,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000b65e0000b85e0000ba5e0000bc5e0000be5e0000c05e0000c25e0000c45e0000c65e0000c85e0000ca5e0000cc5e0000ce5e0000d05e0000
+    m_ExpandedIDs: 00000000bc5e0000be5e0000c05e0000c25e0000c45e0000c65e0000c85e0000ca5e0000cc5e0000ce5e0000d05e0000d25e0000d45e0000d65e0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1004,7 +1004,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 12}
+      m_ClientGUIView: {fileID: 13}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -1013,7 +1013,7 @@ MonoBehaviour:
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
     m_ScrollPosition: {x: 0, y: 0}
-    m_GridSize: 64
+    m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 207
 --- !u!114 &19