彩蛋 bug

Assets/Lua/Core/PlatformPack.lua

@@ -1,10 +1,9 @@
 local PlatformPack = {
-	URL_KEY = 'http://165.154.215.99:81//',
-	SERVERLIST_URL = 'http://165.154.215.99:81//serverlist',
-	NOTIFY_URL = 'http://165.154.215.99:88/res/NoticeNew/',
-	SPECIAL_INFO_URL = 'http://165.154.215.99:81//channel',
-	CUSTOMER_SERVICE_INFO_URL = 'http://165.154.215.99:81//vipService',
-	SpecialFuncShield = true,
+	URL_KEY = 'http://110.40.223.119:81//',
+	SERVERLIST_URL = 'http://110.40.223.119:81//serverlist',
+	NOTIFY_URL = 'http://110.40.223.119:88/res/NoticeNew/',
+	SPECIAL_INFO_URL = 'http://110.40.223.119:81//channel',
+	CUSTOMER_SERVICE_INFO_URL = 'http://110.40.223.119:81//vipService',
 }
 
 return PlatformPack

Assets/Lua/Logic/LuckyEggDataMgr.lua

@@ -13,6 +13,7 @@ function LuckyEggDataMgr:ctor()
     self.luckyMsgList = nil
     --- 红点等本地缓存的数据
     self.cacheLuckyEggData = nil
+    self.curActID = nil
 end
 
 function LuckyEggDataMgr:Clear()

Assets/Lua/Managers/CfgMgr.lua

@@ -1606,7 +1606,16 @@ function CfgMgr:GetLuckyEggCfgByType(type)
         end
     end
 end
-
+function CfgMgr:GetLuckyEggCfgByTypeAndActid(type,actID)
+    if self.LuckyEggCfg == nil then
+        return
+    end
+    for k,v in pairs(self.LuckyEggCfg) do
+        if v.Type == type and v.ActivitiesId == actID then
+            return v
+        end
+    end
+end
 
 function CfgMgr:GetAllVipCfg()
     if Constant.OpenPay then

Assets/Lua/UI/UILuckyEgg/UILuckyEggCtr.lua

@@ -41,6 +41,7 @@ end
 function UILuckyEggCtr:InitData()
 	local cfgs = {}
 	local cfgSource = ManagerContainer.CfgMgr:GetLuckyEggCfg()
+	ManagerContainer.DataMgr.LuckyEggDataMgr.curActID = self.data.actId
 	--LogError("--------------------self.data.actId-- "..Inspect(self.data.actId))
 	for id, cfg in pairs(cfgSource) do
 		--LogError("----------------------"..Inspect(cfg))
@@ -156,7 +157,7 @@ end
 function UILuckyEggCtr:HasNeedShowItem()
 	local luckyData = ManagerContainer.DataMgr.LuckyEggDataMgr:GetLuckyEggData()
 	if luckyData then
-		local luckyCfgData = ManagerContainer.CfgMgr:GetLuckyEggCfgByType(luckyData.luckyType)
+		local luckyCfgData = ManagerContainer.CfgMgr:GetLuckyEggCfgByTypeAndActid(luckyData.luckyType,self.data.actId)
 		if luckyCfgData and luckyCfgData.ShowItemType and #luckyCfgData.ShowItemType > 0 then
 			if luckyData.rewards then
 				for i = 1, #luckyData.rewards do

Assets/Lua/UI/UILuckyEgg/UILuckyEggResultCtr.lua

@@ -25,9 +25,10 @@ end
 
 function UILuckyEggResultCtr:InitData()
 	local LuckyEggData = ManagerContainer.DataMgr.LuckyEggDataMgr:GetLuckyEggData()
+	local curActid = ManagerContainer.DataMgr.LuckyEggDataMgr.curActID
 	local cfgData, LuckyEggNum, rewards, extraReward, extraRewards, lastPercent, percent
 	if LuckyEggData then
-		cfgData = ManagerContainer.CfgMgr:GetLuckyEggCfgByType(LuckyEggData.luckyType)
+		cfgData = ManagerContainer.CfgMgr:GetLuckyEggCfgByTypeAndActid(LuckyEggData.luckyType,curActid)
 		LuckyEggNum = LuckyEggData.luckyNum
 		rewards = LuckyEggData.rewards
 		extraRewards = LuckyEggData.extraRewards

Build/BuildDependenceResource/CurPackEnv.ini

@@ -1 +1 @@
-{"m_ChannelUniqueId":"22002010","m_BuildClassName":"Pack.PackPlatformiOS"}
+{"m_ChannelUniqueId":"12002022","m_BuildClassName":"Pack.PackPlatformAndroid"}

ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: WentingTec
-  productName: "\u0420\u044B\u0446\u0430\u0440\u0441\u043A\u0430\u044F \u043B\u0435\u0433\u0435\u043D\u0434\u0430"
+  productName: "\u0420\u0430\u0433\u043D\u0430\u0440\u0451\u043A \u041E\u043D\u043B\u0430\u0439\u043D"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}
@@ -138,7 +138,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.1.0
+  bundleVersion: 1.0.0.6
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -159,7 +159,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.xjroapp.ru
+    Android: com.xjro.rutest
     WebGL: com.wt.no.sdk.test
     iPhone: com.qscq.joy
   buildNumber:
@@ -167,7 +167,7 @@ PlayerSettings:
     iPhone: 0.1.0.0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
-  AndroidBundleVersionCode: 1000000
+  AndroidBundleVersionCode: 1000006
   AndroidMinSdkVersion: 23
   AndroidTargetSdkVersion: 36
   AndroidPreferredInstallLocation: 1
@@ -846,10 +846,10 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU
+    Android: USE_LUA;VUPLEX_CCU;FPS_DISABLE;GAME_DEBUG
     Standalone: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
-    iPhone: USE_LUA;VUPLEX_CCU;FPS_DISABLE
+    iPhone: USE_LUA;VUPLEX_CCU
   additionalCompilerArguments: {}
   platformArchitecture:
     iPhone: 1