翻页，优化

Assets/Content/Config/LanguagePackage_cn.csv

@@ -6358,8 +6358,8 @@ BtnSelect,選擇
 SelectGodBless,選擇傳説之力
 Stage,關卡
 BtnRecharge,前往儲值
-DscRecharge01,已儲值{0}$
-DscRecharge02,已儲值{0}$，再充<b> <color=#00ab65>{1}</color> </b>$可領大獎
+DscRecharge01,已儲值{0}$，可領<b> <color=#00ab65>{1}</color> </b>大獎
+DscRecharge02,已儲值{0}$，再充<b> <color=#00ab65>{1}</color> </b>$可領<b> <color=#00ab65>{2}</color> </b>大獎
 BtnFirstRecharge,超值首儲
 BtnLimitedGift,限時禮包
 BtnActivityTower,試煉盛典

Assets/Content/Prefabs/UI/UIActivity/UIActivityDailyRecharge.prefab

@@ -369,6 +369,100 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 292b1fccc951443488773257c3033cf9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &845397924470829514
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6314109658549432115}
+  - component: {fileID: 3963074278794345979}
+  - component: {fileID: 8663328629596070270}
+  - component: {fileID: 5217373797015998657}
+  m_Layer: 5
+  m_Name: OverText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6314109658549432115
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 845397924470829514}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3955072146915523790}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -1}
+  m_SizeDelta: {x: -60, y: 72}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3963074278794345979
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 845397924470829514}
+  m_CullTransparentMesh: 0
+--- !u!114 &8663328629596070270
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 845397924470829514}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: BtnHaveReceive
+--- !u!114 &5217373797015998657
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 845397924470829514}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.027100407, g: 0.8207547, b: 0.40819433, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 90ed5292e87d8a64aac7038df97ece85, type: 3}
+    m_FontSize: 44
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 4
+    m_MaxSize: 44
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5DF2\u5B8C\u6210"
 --- !u!1 &1001946385422512328
 GameObject:
   m_ObjectHideFlags: 0
@@ -4151,6 +4245,106 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6376910035682312049
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3955072146915523790}
+  - component: {fileID: 829309263428122199}
+  - component: {fileID: 4050877883962295997}
+  - component: {fileID: 1150565633706413758}
+  m_Layer: 5
+  m_Name: Seal
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3955072146915523790
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6376910035682312049}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6314109658549432115}
+  m_Father: {fileID: 3533647386176578522}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 100}
+  m_SizeDelta: {x: 300, y: 128}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &829309263428122199
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6376910035682312049}
+  m_CullTransparentMesh: 0
+--- !u!114 &4050877883962295997
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6376910035682312049}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.027100407, g: 0.8207547, b: 0.40819433, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 49337d31e2ed32043b09c1f4aa82f1c9, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1150565633706413758
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6376910035682312049}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: sealBtn
+  keys:
+  - UnityEngine.RectTransform
+  - UnityEngine.CanvasRenderer
+  - UnityEngine.UI.Image
+  - UINode
+  values: 00000000
+  depObjs:
+  - {fileID: 0}
+  activeType: 0
 --- !u!1 &6385109207125029317
 GameObject:
   m_ObjectHideFlags: 0
@@ -5004,6 +5198,7 @@ RectTransform:
   - {fileID: 6443920947717540957}
   - {fileID: 1407029554313248871}
   - {fileID: 8041353691939079949}
+  - {fileID: 3955072146915523790}
   m_Father: {fileID: 4899073710409116595}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Lua/Core/PlatformPack.lua

@@ -1,9 +1,9 @@
 local PlatformPack = {
-	URL_KEY = 'http://165.154.29.92:81//',
-	SERVERLIST_URL = 'http://165.154.29.92:81//serverlist',
-	NOTIFY_URL = 'http://cxzcdn.hkhappygame.com/res/NoticeNew/',
-	SPECIAL_INFO_URL = 'http://165.154.29.92:81//channel',
-	CUSTOMER_SERVICE_INFO_URL = 'http://165.154.29.92:81//vipService',
+	URL_KEY = 'http://110.40.223.119:81//',
+	SERVERLIST_URL = 'http://110.40.223.119:81//serverlist',
+	NOTIFY_URL = 'http://cxzcdn.hkhappygame.com/res/TestServerNotice/',
+	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/UI/UIActivity/UIActivityDailyRechargeView.lua

@@ -37,8 +37,8 @@ end
 function UIActivityDailyRechargeView:Init()
 	self:InitGrid()
 	self:Refresh()
-	self.lastBtn:SetActive(false)
-	self.nextBtn:SetActive(false)
+	--self.lastBtn:SetActive(false)
+	--self.nextBtn:SetActive(false)
 end
 
 function UIActivityDailyRechargeView:OnPageInEnd()
@@ -77,13 +77,13 @@ function UIActivityDailyRechargeView:Refresh()
 		local count = dailyTiredCount >= displayCfgData.RechargeAmount and displayCfgData.RechargeAmount or needChargeCount
 		self.text1.text.text = count
 		if dailyTiredCount >= displayCfgData.RechargeAmount then
-			self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge01", {dailyTiredCount})
+			self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge01", {dailyTiredCount,displayCfgData.RechargeAmount})
 		else
-			self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge02", {dailyTiredCount, count})
+			self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge02", {dailyTiredCount, count,displayCfgData.RechargeAmount})
 		end
 		self:RefreshReward(displayCfgData)
 	else
-		self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge01", {dailyTiredCount})
+		self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge01", {dailyTiredCount,displayCfgData.RechargeAmount})
 	end
 
 	self.btnConfirm:SetActive(displayCfgData == nil)
@@ -209,18 +209,24 @@ function UIActivityDailyRechargeView:ShowRewards(id)
 	self.text3.text.text = dailyTiredCount
 
 	if displayCfgData then
+		self.controller.curShowID = displayCfgData.Index
 		local needChargeCount = displayCfgData.RechargeAmount - dailyTiredCount
 		local count = dailyTiredCount >= displayCfgData.RechargeAmount and displayCfgData.RechargeAmount or needChargeCount
 		self.text1.text.text = count
 		if dailyTiredCount >= displayCfgData.RechargeAmount then
-			self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge01", {dailyTiredCount})
+			self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge01", {dailyTiredCount,displayCfgData.RechargeAmount})
 		else
-			self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge02", {dailyTiredCount, count})
+			self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge02", {dailyTiredCount, count,displayCfgData.RechargeAmount})
 		end
 		self:RefreshReward(displayCfgData)
 	else
-		self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge01", {dailyTiredCount})
+		self.bottomDsc.uILocalizeScript:SetContentAndValues("DscRecharge01", {dailyTiredCount,displayCfgData.RechargeAmount})
 	end
+
+	self.btnConfirm:SetActive(displayCfgData == nil)
+	self.btnReceive:SetActive(displayCfgData and rewardState <= displayCfgData.Index and dailyTiredCount >= displayCfgData.RechargeAmount)
+	self.btnRecharge:SetActive(displayCfgData and rewardState <= displayCfgData.Index and dailyTiredCount < displayCfgData.RechargeAmount)
+	self.sealBtn:SetActive(displayCfgData and rewardState > displayCfgData.Index )
 end
 
 

Assets/Lua/UI/UIActivity/UIActivityDailyRechargeView_Generate.lua

@@ -67,6 +67,7 @@
 ---@field private btnRecharge UIActivityDailyRecharge__Generate_btnRecharge
 ---@field private btnConfirm UIActivityDailyRecharge__Generate_btnConfirm
 ---@field private btnReceive UIActivityDailyRecharge__Generate_btnReceive
+---@field private sealBtn UnityEngine.GameObject
 ---@field private nextBtn UIActivityDailyRecharge__Generate_nextBtn
 ---@field private lastBtn UIActivityDailyRecharge__Generate_lastBtn
 ---@field private backBtn UIActivityDailyRecharge__Generate_backBtn
@@ -104,6 +105,7 @@ function UIActivityDailyRechargeView:InitGenerate(Root, data)
 	self:InitGenerate__13(Root,data)
 	self:InitGenerate__14(Root,data)
 	self:InitGenerate__15(Root,data)
+	self:InitGenerate__16(Root,data)
 
 
 end
@@ -279,6 +281,18 @@ end
 
 ---@private
 function UIActivityDailyRechargeView:InitGenerate__13(Root, data)
+--[[
+	UIAnimator/Window/Bottom/BtnBox/Seal
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bottom/BtnBox/Seal").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.sealBtn = tmp
+end
+
+---@private
+function UIActivityDailyRechargeView:InitGenerate__14(Root, data)
 --[[
 	UIAnimator/Window/Bottom/ChangeBtn/NextBtn
 --]]
@@ -292,7 +306,7 @@ function UIActivityDailyRechargeView:InitGenerate__13(Root, data)
 end
 
 ---@private
-function UIActivityDailyRechargeView:InitGenerate__14(Root, data)
+function UIActivityDailyRechargeView:InitGenerate__15(Root, data)
 --[[
 	UIAnimator/Window/Bottom/ChangeBtn/LastBtn
 --]]
@@ -306,7 +320,7 @@ function UIActivityDailyRechargeView:InitGenerate__14(Root, data)
 end
 
 ---@private
-function UIActivityDailyRechargeView:InitGenerate__15(Root, data)
+function UIActivityDailyRechargeView:InitGenerate__16(Root, data)
 --[[
 	UIAnimator/Window/BtnBack
 --]]
@@ -371,6 +385,10 @@ function UIActivityDailyRechargeView:GenerateDestroy()
 		tolua.setpeer(self.btnReceive, nil)
 	end
 	self.btnReceive = nil
+	if tolua.getpeer(self.sealBtn) ~= nil then
+		tolua.setpeer(self.sealBtn, nil)
+	end
+	self.sealBtn = nil
 	if tolua.getpeer(self.nextBtn) ~= nil then
 		tolua.setpeer(self.nextBtn, nil)
 	end

ProjectSettings/ProjectSettings.asset

@@ -846,7 +846,7 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE
+    Android: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE;GAME_DEBUG
     Standalone: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
     iPhone: USE_LUA;VUPLEX_CCU