覆盖

src/base/baseview.lua

@@ -102,7 +102,7 @@ function BaseView:open(...)
 			if self.layout_name == nil and self.is_use_csb == true then
 				if self.is_full_screen == true then 
 					if self.background_path == nil then
-						-- self.background_path = PathTool.getPlistImgForDownLoad("bigbg","bigbg_2", true)
+						-- self.background_path = PathTool.getPlistImgForDownLoad("bigbg","big bg_2", true)
 					else
 						table.insert(self.res_list, {path = self.background_path, type = ResourcesType.single})
 					end

src/channel/__orig__/gm_cmd_all.lua

@@ -104,11 +104,6 @@ function GmCmd:add_gm_button(layer)
         self.open_button:setVisible(self.gmisshow)
         local login_data = LoginController:getInstance():getModel():getLoginData()
         self.changegmstatus = function()
-            if PLATFORM_NAME == "sk_demo" then
-            else
-                return
-            end
-
             self.gmisshow = not self.gmisshow
             self.open_button:setVisible(self.gmisshow)
         end
@@ -399,7 +394,9 @@ function GmCmd:init_button()
 end
 
 function GmCmd:testPerfer()
-    sdkPerfer_prize()
+    self.changegmstatus()
+    RechargeTest()
+    -- sdkPerfer_prize()
 end
 -- ==============================--
 -- desc:记录当前总的节点数量,看异常
@@ -571,18 +568,18 @@ function GmCmd:checkInEmulator()
 end
 
 function GmCmd:wx_share_url()
-    local fileName = cc.FileUtils:getInstance():getWritablePath() .. "CaptureScreenTest.png"
-    cc.utils:captureScreen(function(succeed)
-        doRemoveFromParent(wx_image)
-        wx_image = createImage(self.root_wnd, fileName, 100, 100)
-        wx_image:setScale(0.2)
-        if succeed then
-            wx_scene = ((wx_scene or 0) + 1) % 2
-            wxShareUrl("title", "content", "http://tech.qq.com/zt2012/tmtdecode/252.htm", fileName, wx_scene)
-        else
-            message("=====aaaaa")
-        end
-    end, fileName)
+    -- local fileName = cc.FileUtils:getInstance():getWritablePath() .. "CaptureScreenTest.png"
+    -- cc.utils:captureScreen(function(succeed)
+    --     doRemoveFromParent(wx_image)
+    --     wx_image = createImage(self.root_wnd, fileName, 100, 100)
+    --     wx_image:setScale(0.2)
+    --     if succeed then
+    --         wx_scene = ((wx_scene or 0) + 1) % 2
+    --         wxShareUrl("title", "content", "http://tech.qq.com/zt2012/tmtdecode/252.htm", fileName, wx_scene)
+    --     else
+    --         message("=====aaaaa")
+    --     end
+    -- end, fileName)
 end
 
 -- 打印当前计时器
@@ -596,12 +593,12 @@ end
 
 -- 加qq群
 function GmCmd:join_qq()
-    QQ_GROUP_LIST = QQ_GROUP_LIST or {{
-        ios = "mqqapi://card/show_pslcard?src_type=internal&version=1&uin=431023033&key=6d9cdcb70ec56076639ca6faa535bafb4896680d47d4627e612e535944c94320&card_type=group&source=external",
-        android = "mqqopensdkapi://bizAgent/qm/qr?url=http%3A%2F%2Fqm.qq.com%2Fcgi-bin%2Fqm%2Fqr%3Ffrom%3Dapp%26p%3Dandroid%26k%3D" ..
-            "ItSajVspkR0fkSBeoH9dNr7qYFpMeOoG"
-    }}
-    joinQQGroup()
+    -- QQ_GROUP_LIST = QQ_GROUP_LIST or {{
+    --     ios = "mqqapi://card/show_pslcard?src_type=internal&version=1&uin=431023033&key=6d9cdcb70ec56076639ca6faa535bafb4896680d47d4627e612e535944c94320&card_type=group&source=external",
+    --     android = "mqqopensdkapi://bizAgent/qm/qr?url=http%3A%2F%2Fqm.qq.com%2Fcgi-bin%2Fqm%2Fqr%3Ffrom%3Dapp%26p%3Dandroid%26k%3D" ..
+    --         "ItSajVspkR0fkSBeoH9dNr7qYFpMeOoG"
+    -- }}
+    -- joinQQGroup()
 end
 
 function GmCmd:reloadluafile()
@@ -625,7 +622,6 @@ end
 
 function GmCmd:dumpCachedTextureInfo()
     print(cc.Director:getInstance():getTextureCache():dumpCachedTextureInfo())
-
     print(string.format("\n当前lua内存为 ====> %smb", math.floor(collectgarbage("count") / 1024)))
 end
 
@@ -1363,8 +1359,6 @@ end
 cl_recharge_test = false
 ------------------------------------
 -- 充值测试
--- @param panel_id 当前面板的ID
--- @param reward_id 奖励的ID
 ------------------------------------
 function RechargeTest()
     if cl_recharge_test then return end
@@ -1410,4 +1404,34 @@ function onChargeTest(bid, index, money)
 
         GlobalEvent:getInstance():Fire(ActionEvent.newActionChargeSuccess, bid, index)
     end)
+end
+
+------------重写设置图片的方法以获取图片资源路径
+local __loadTexture             = ccui.ImageView.loadTexture
+local __setTexture              = cc.Sprite.setTexture
+local __setSpriteFrame          = cc.Sprite.setSpriteFrame
+local __initWithFile            = ccui.Scale9Sprite.initWithFile
+local __initWithSpriteFrameName = ccui.Scale9Sprite.initWithSpriteFrameName
+
+local __setRes = function(func, context, res_path, ...)
+    func(context, res_path, ...)
+    context.res_path = res_path or ""
+end
+
+ccui.ImageView.loadTexture = function(this, res_path, ...)
+    __setRes(__loadTexture, this, res_path, ...)
+end
+
+cc.Sprite.setTexture = function(this, res_path, ...)
+    __setRes(__setTexture, this, res_path, ...)
+end
+cc.Sprite.setSpriteFrame = function(this, res_path, ...)
+    __setRes(__setSpriteFrame, this, res_path, ...)
+end
+
+ccui.Scale9Sprite.initWithFile = function(this, res_path, ...)
+    __setRes(__initWithFile, this, res_path, ...)
+end
+ccui.Scale9Sprite.initWithSpriteFrameName = function(this, res_path, ...)
+    __setRes(__initWithSpriteFrameName, this, res_path, ...)
 end

src/channel/zero_1/config/day_goals_new_data.lua

@@ -33,7 +33,7 @@ Config.DayGoalsNewData.data_make_lev_list = {
 		[5] = {period=2, lev=5, exp=270, reward={{37002,1},{37001,5}}, title_name="冒险日记达到5级"},
 		[6] = {period=2, lev=6, exp=330, reward={{3,2000},{37001,5}}, title_name="冒险日记达到6级"},
 		[7] = {period=2, lev=7, exp=390, reward={{14001,1},{37001,5}}, title_name="冒险日记达到7级"},
-		[8] = {period=2, lev=8, exp=450, reward={{24909,50},{37001,5}}, title_name="冒险日记达到8级"},
+		[8] = {period=2, lev=8, exp=450, reward={{24908,50},{37001,5}}, title_name="冒险日记达到8级"},
 	},
 	[3] = {
 		[1] = {period=3, lev=1, exp=50, reward={{10403,1},{10450,200}}, title_name="解锁普通魔盒（积攒50个希望印记）"},
@@ -52,7 +52,7 @@ Config.DayGoalsNewData.data_make_lev_list = {
 		[5] = {period=5, lev=5, exp=270, reward={{37002,1},{72001,10}}, title_name="冒险日记达到5级"},
 		[6] = {period=5, lev=6, exp=330, reward={{3,2000},{72001,10}}, title_name="冒险日记达到6级"},
 		[7] = {period=5, lev=7, exp=390, reward={{14001,1},{72001,10}}, title_name="冒险日记达到7级"},
-		[8] = {period=5, lev=8, exp=450, reward={{24904,50},{72001,10}}, title_name="冒险日记达到8级"},
+		[8] = {period=5, lev=8, exp=450, reward={{24903,50},{72001,10}}, title_name="冒险日记达到8级"},
 	},
 	[6] = {
 		[1] = {period=6, lev=1, exp=50, reward={{10403,1},{10450,200}}, title_name="解锁普通魔盒（积攒50个希望印记）"},
@@ -71,7 +71,7 @@ Config.DayGoalsNewData.data_make_lev_list = {
 		[5] = {period=8, lev=5, exp=270, reward={{37002,1},{37001,5}}, title_name="冒险日记达到5级"},
 		[6] = {period=8, lev=6, exp=330, reward={{3,2000},{37001,5}}, title_name="冒险日记达到6级"},
 		[7] = {period=8, lev=7, exp=390, reward={{14001,1},{37001,5}}, title_name="冒险日记达到7级"},
-		[8] = {period=8, lev=8, exp=450, reward={{26907,50},{37001,5}}, title_name="冒险日记达到8级"},
+		[8] = {period=8, lev=8, exp=450, reward={{26905,50},{37001,5}}, title_name="冒险日记达到8级"},
 	},
 	[9] = {
 		[1] = {period=9, lev=1, exp=50, reward={{10403,1},{10450,200}}, title_name="解锁普通魔盒（积攒50个希望印记）"},
@@ -80,7 +80,7 @@ Config.DayGoalsNewData.data_make_lev_list = {
 		[4] = {period=9, lev=4, exp=200, reward={{38091,1},{10450,200}}, title_name="解锁豪华魔盒（积攒200个希望印记）"},
 		[5] = {period=9, lev=5, exp=250, reward={{3,2000},{10450,200}}, title_name="解锁月亮魔盒（积攒250个希望印记）"},
 		[6] = {period=9, lev=6, exp=300, reward={{14001,1},{10450,200}}, title_name="解锁彩虹魔盒（积攒300个希望印记）"},
-		[7] = {period=9, lev=7, exp=350, reward={{24903,50},{10450,200}}, title_name="解锁希望魔盒（积攒350个希望印记）"},
+		[7] = {period=9, lev=7, exp=350, reward={{24905,50},{10450,200}}, title_name="解锁希望魔盒（积攒350个希望印记）"},
 	},
 	[10] = {
 		[1] = {period=10, lev=1, exp=0, reward={{10403,1},{72001,10}}, title_name="冒险日记达到1级"},
@@ -90,7 +90,7 @@ Config.DayGoalsNewData.data_make_lev_list = {
 		[5] = {period=10, lev=5, exp=270, reward={{37002,1},{72001,10}}, title_name="冒险日记达到5级"},
 		[6] = {period=10, lev=6, exp=330, reward={{3,2000},{72001,10}}, title_name="冒险日记达到6级"},
 		[7] = {period=10, lev=7, exp=390, reward={{14001,1},{72001,10}}, title_name="冒险日记达到7级"},
-		[8] = {period=10, lev=8, exp=450, reward={{25903,50},{72001,10}}, title_name="冒险日记达到8级"},
+		[8] = {period=10, lev=8, exp=450, reward={{25905,50},{72001,10}}, title_name="冒险日记达到8级"},
 	},
 	[11] = {
 		[1] = {period=11, lev=1, exp=50, reward={{10403,1},{10450,200}}, title_name="解锁普通魔盒（积攒50个希望印记）"},
@@ -99,7 +99,7 @@ Config.DayGoalsNewData.data_make_lev_list = {
 		[4] = {period=11, lev=4, exp=200, reward={{38091,1},{10450,200}}, title_name="解锁豪华魔盒（积攒200个希望印记）"},
 		[5] = {period=11, lev=5, exp=250, reward={{3,2000},{10450,200}}, title_name="解锁月亮魔盒（积攒250个希望印记）"},
 		[6] = {period=11, lev=6, exp=300, reward={{14001,1},{10450,200}}, title_name="解锁彩虹魔盒（积攒300个希望印记）"},
-		[7] = {period=11, lev=7, exp=350, reward={{26903,50},{10450,200}}, title_name="解锁希望魔盒（积攒350个希望印记）"},
+		[7] = {period=11, lev=7, exp=350, reward={{26904,50},{10450,200}}, title_name="解锁希望魔盒（积攒350个希望印记）"},
 	},
 	[12] = {
 		[1] = {period=12, lev=1, exp=0, reward={{10403,1},{72001,10}}, title_name="冒险日记达到1级"},
@@ -109,7 +109,7 @@ Config.DayGoalsNewData.data_make_lev_list = {
 		[5] = {period=12, lev=5, exp=270, reward={{37002,1},{72001,10}}, title_name="冒险日记达到5级"},
 		[6] = {period=12, lev=6, exp=330, reward={{3,2000},{72001,10}}, title_name="冒险日记达到6级"},
 		[7] = {period=12, lev=7, exp=390, reward={{14001,1},{72001,10}}, title_name="冒险日记达到7级"},
-		[8] = {period=12, lev=8, exp=450, reward={{24909,50},{72001,10}}, title_name="冒险日记达到8级"},
+		[8] = {period=12, lev=8, exp=450, reward={{24907,50},{72001,10}}, title_name="冒险日记达到8级"},
 	},
 	[13] = {
 		[1] = {period=13, lev=1, exp=50, reward={{10403,1},{10450,200}}, title_name="解锁普通魔盒（积攒50个希望印记）"},
@@ -118,7 +118,7 @@ Config.DayGoalsNewData.data_make_lev_list = {
 		[4] = {period=13, lev=4, exp=200, reward={{38091,1},{10450,200}}, title_name="解锁豪华魔盒（积攒200个希望印记）"},
 		[5] = {period=13, lev=5, exp=250, reward={{3,2000},{10450,200}}, title_name="解锁月亮魔盒（积攒250个希望印记）"},
 		[6] = {period=13, lev=6, exp=300, reward={{14001,1},{10450,200}}, title_name="解锁彩虹魔盒（积攒300个希望印记）"},
-		[7] = {period=13, lev=7, exp=350, reward={{24909,50},{10450,200}}, title_name="解锁希望魔盒（积攒350个希望印记）"},
+		[7] = {period=13, lev=7, exp=350, reward={{24908,50},{10450,200}}, title_name="解锁希望魔盒（积攒350个希望印记）"},
 	},
 }
 -- -------------------make_lev_list_end---------------------

src/channel/zero_1/config/recruit_high_data.lua

@@ -56,20 +56,20 @@ end
 Config.RecruitHighData.data_seerpalace_award_length = 4
 Config.RecruitHighData.data_seerpalace_award = {
 	[1000] = {
-		[5] = {id=1000, star=5, items={{24901,50,0.45},{24902,50,1.50},{24903,50,0.45},{24904,50,1.50},{24905,50,2.03},{24909,50,0.45}}, desc="5星英雄（英雄掉落概率15%）"},
-		[4] = {id=1000, star=4, items={{24800,30,17},{24801,30,17}}, desc="4星英雄（英雄掉落概率85%）"},
+		[5] = {id=1000, star=5, items={{24900,50,1.50},{24901,50,0.45},{24902,50,1.50},{24903,50,0.45},{24904,50,1.50},{24905,50,2.03},{24906,50,2.03},{24907,50,2.10},{24908,50,2.10},{24909,50,0.45},{24910,50,0.45},{24911,50,0.45}}, desc="5星英雄（英雄掉落概率15%）"},
+		[4] = {id=1000, star=4, items={{24800,30,17},{24801,30,17},{24802,30,17},{24803,30,17},{24804,30,17}}, desc="4星英雄（英雄掉落概率85%）"},
 	},
 	[2000] = {
-		[5] = {id=2000, star=5, items={{25900,50,1.80},{25901,50,1.50},{25902,50,3},{25903,50,0.75},{25906,50,0.38},{25910,50,0.38}}, desc="5星英雄（英雄掉落概率15%）"},
-		[4] = {id=2000, star=4, items={{25801,30,17},{25802,30,17}}, desc="4星英雄（英雄掉落概率85%）"},
+		[5] = {id=2000, star=5, items={{25900,50,1.80},{25901,50,1.50},{25902,50,3},{25903,50,0.75},{25904,50,2.70},{25905,50,3},{25906,50,0.38},{25907,50,0.38},{25908,50,0.38},{25909,50,0.38},{25910,50,0.38},{25911,50,0.38}}, desc="5星英雄（英雄掉落概率15%）"},
+		[4] = {id=2000, star=4, items={{25800,30,17},{25801,30,17},{25802,30,17},{25803,30,17},{25804,30,17}}, desc="4星英雄（英雄掉落概率85%）"},
 	},
 	[3000] = {
-		[5] = {id=3000, star=5, items={{26900,50,2.10},{26901,50,1.05},{26902,50,2.40},{26903,50,2.25},{26907,50,0.45}}, desc="5星英雄（英雄掉落概率15%）"},
-		[4] = {id=3000, star=4, items={{26802,30,17},{26803,30,17}}, desc="4星英雄（英雄掉落概率85%）"},
+		[5] = {id=3000, star=5, items={{26900,50,2.10},{26901,50,1.05},{26902,50,2.40},{26903,50,2.25},{26904,50,2.40},{26905,50,2.10},{26906,50,0.45},{26907,50,0.45},{26908,50,0.45},{26909,50,0.45},{26910,50,0.45},{26911,50,0.45}}, desc="5星英雄（英雄掉落概率15%）"},
+		[4] = {id=3000, star=4, items={{26800,30,17},{26801,30,17},{26802,30,17},{26803,30,17},{26804,30,17}}, desc="4星英雄（英雄掉落概率85%）"},
 	},
 	[4000] = {
-		[5] = {id=4000, star=5, items={{29405,15,3.75},{29505,15,3.75},{27900,50,0.94},{27901,50,0.11},{27903,50,0.56},{27904,50,0.94},{27905,50,0.56},{27906,50,0.11},{27909,50,0.11},{28900,50,0.94},{28901,50,0.09},{28902,50,0.66},{28903,50,0.09},{28904,50,0.66},{28906,50,0.09},{28909,50,0.09}}, desc="5星英雄（英雄掉落概率7.5%，碎片掉落概率7.5%）"},
-		[4] = {id=4000, star=4, items={{29404,15,20},{29504,15,20},{27800,30,5.63},{27801,30,5.63},{28800,30,5.63},{28801,30,5.63},{28802,30,5.63}}, desc="4星英雄（英雄掉落概率45%，碎片掉落概率40%）"},
+		[5] = {id=4000, star=5, items={{29405,15,3.75},{29505,15,3.75},{27900,50,0.94},{27901,50,0.11},{27902,50,0.19},{27903,50,0.56},{27904,50,0.94},{27905,50,0.56},{27906,50,0.11},{27907,50,0.11},{27908,50,0.11},{27909,50,0.11},{28900,50,0.94},{28901,50,0.09},{28902,50,0.66},{28903,50,0.09},{28904,50,0.66},{28905,50,0.94},{28906,50,0.09},{28907,50,0.09},{28908,50,0.09},{28909,50,0.09}}, desc="5星英雄（英雄掉落概率7.5%，碎片掉落概率7.5%）"},
+		[4] = {id=4000, star=4, items={{29404,15,20},{29504,15,20},{27800,30,5.63},{27801,30,5.63},{27802,30,5.63},{27803,30,5.63},{28800,30,5.63},{28801,30,5.63},{28802,30,5.63},{28803,30,5.63}}, desc="4星英雄（英雄掉落概率45%，碎片掉落概率40%）"},
 	},
 }
 -- -------------------seerpalace_award_end---------------------

src/common/common_function.lua

@@ -288,7 +288,6 @@ function createImage(parent, res, x, y, anchorPoint, usePlist, zorder, is_Scale9
         else
             image:loadTexture(res,LOADTEXT_TYPE)
         end
-        image:setName(res)
     end
     if anchorPoint == nil then
         image:setAnchorPoint(cc.p(0.5, 0.5))
@@ -324,7 +323,6 @@ function createScale9Sprite(res, x, y, type, parent)
     local sprite = ccui.Scale9Sprite:create()
     if res ~= nil then
         loadScale9SpriteTexture(sprite, res, type)
-        sprite:setName(res)
     end
 
     if x ~= nil and y ~= nil then
@@ -357,7 +355,6 @@ function createSprite(res, x, y, container, anchorPoint, type, zorder)
     local sprite = cc.Sprite:create()
     if res ~= nil and res ~= "" then
         loadSpriteTexture(sprite, res, type)
-        sprite:setName(res)
     end
     sprite:setPosition(cc.p(x, y))
     if not tolua.isnull(container) then

src/common/debug_ui_helper.lua

@@ -24,7 +24,7 @@ function DebugUIHelper:initUI()
     self.root = ccui.Layout:create()
     ViewManager:addToLayerByTag(self.root, ViewMgrTag.DEBUG_TAG, 100)
     self.root:setContentSize(cc.size(SCREEN_WIDTH + 200, SCREEN_HEIGHT + 200))
-    local size = cc.size(320, 510)
+    local size = cc.size(320, 540)
     self.container = ccui.Layout:create()
     self.root:addChild(self.container, 20)
     self.container:setBackGroundColor(cc.c3b(255,255,255))
@@ -259,30 +259,14 @@ function DebugUIHelper:initUI()
     label:setAnchorPoint(1, 0)
     self.container:addChild(label)
     label:setPosition(x-2, y)
-    self.color_r = ccui.EditBox:create(cc.size(50, 30), ccui.Scale9Sprite:create())
-    self.color_r:setAnchorPoint(0, 0)
-    self.color_r:setFontSize(15)
-    self.container:addChild(self.color_r)
-    self.color_r:setPosition(x + 5, y-5)
-    self.color_r:setFontColor(cc.c3b(0,0,255))
-    self.color_g = ccui.EditBox:create(cc.size(50, 30), ccui.Scale9Sprite:create())
-    self.color_g:setAnchorPoint(0, 0)
-    self.container:addChild(self.color_g)
-    self.color_g:setPosition(x + 55, y-5)
-    self.color_g:setFontSize(15)
-    self.color_g:setFontColor(cc.c3b(0,0,255))
-    self.color_b = ccui.EditBox:create(cc.size(50, 30), ccui.Scale9Sprite:create())
-    self.color_b:setAnchorPoint(0, 0)
-    self.container:addChild(self.color_b)
-    self.color_b:setPosition(x + 105, y-5)
-    self.color_b:setFontSize(15)
-    self.color_b:setFontColor(cc.c3b(0,0,255))
-    self.color_a = ccui.EditBox:create(cc.size(50, 30), ccui.Scale9Sprite:create())
-    self.color_a:setAnchorPoint(0, 0)
-    self.container:addChild(self.color_a)
-    self.color_a:setPosition(x + 155, y-5)
-    self.color_a:setFontSize(15)
-    self.color_a:setFontColor(cc.c3b(0,0,255))
+    ----新的十六进制颜色
+    self.color_hex = ccui.EditBox:create(cc.size(100, 30), ccui.Scale9Sprite:create())
+    self.color_hex:setAnchorPoint(0, 0)
+    self.color_hex:setFontSize(22)
+    self.container:addChild(self.color_hex)
+    self.color_hex:setPosition(x + 5, y-5)
+    self.color_hex:setFontColor(cc.c3b(0, 0, 255))
+    self.color_hex:setFontName("Arial Bold")
 
     y = y - dy
     label = cc.Label:createWithTTF("字体大小(Y):", DEFAULT_FONT, fontsize)
@@ -308,6 +292,20 @@ function DebugUIHelper:initUI()
     self.csb_name:setPosition(x + 5, y-5)
     self.csb_name:setFontColor(cc.c3b(0,0,255))
 
+    ------------------------
+    y = y - dy
+    label = cc.Label:createWithTTF("资源文件:", DEFAULT_FONT, fontsize)
+    label:setTextColor(cc.c4b(0,0,0,255))
+    label:setAnchorPoint(1, 0)
+    self.container:addChild(label)
+    label:setPosition(x-2, y)
+    self.res_path = ccui.EditBox:create(cc.size(300, 30), ccui.Scale9Sprite:create())
+    self.res_path:setAnchorPoint(0, 0)
+    self.container:addChild(self.res_path)
+    self.res_path:setPosition(x + 5, y-5)
+    self.res_path:setFontColor(cc.c3b(0,0,255))
+    --------------
+
     self.layer = ccui.ScrollView:create()
     self.container:addChild(self.layer)
     self.layer:setContentSize(145,300)
@@ -419,34 +417,18 @@ function DebugUIHelper:registerEvents()
             self:updateObjBorder()
         end
     end)
-    local function updateColor(r, g, b, a)
-        local c = self:getObjColor()
-        if c and c.a then
-            self.obj[c.set](self.obj, cc.c4b(r or c.r, g or c.g, b or c.b, a or c.a))
-        elseif c then
-            self.obj[c.set](self.obj, cc.c3b(r or c.r, g or c.g, b or c.b))
-        end
-    end
-    self.color_r:registerScriptEditBoxHandler(function(eventType, sender)
-        if editBoxChange(eventType, sender) then
-            updateColor(tonumber(sender:getText()))
-        end
-    end)
-    self.color_g:registerScriptEditBoxHandler(function(eventType, sender)
-        if editBoxChange(eventType, sender) then
-            updateColor(nil, tonumber(sender:getText()))
-        end
-    end)
-    self.color_b:registerScriptEditBoxHandler(function(eventType, sender)
-        if editBoxChange(eventType, sender) then
-            updateColor(nil, nil, tonumber(sender:getText()))
-        end
-    end)
-    self.color_a:registerScriptEditBoxHandler(function(eventType, sender)
+
+    self.color_hex:registerScriptEditBoxHandler(function(eventType, sender)
         if editBoxChange(eventType, sender) then
-            updateColor(nil, nil, nil, tonumber(sender:getText()))
+            -- updateColor(tonumber(sender:getText()))
+            local _color = self:hexToRgb(sender:getText())
+            local c = self:getObjColor()
+            self.obj[c.set](self.obj, _color)
+            self.color_hex:setFontColor(_color)
         end
     end)
+
+
     local function updateFontSize(fontsize)
         local font = self:getObjFont()
         if font then
@@ -564,19 +546,21 @@ function DebugUIHelper:updateInfo()
     self.world_y:setString(math.ceil(pos.y))
     self.ui_x:setText(math.ceil(self.obj:getPositionX()))
     self.ui_y:setText(math.ceil(self.obj:getPositionY()))
-    self.color_r:setText("")
-    self.color_g:setText("")
-    self.color_b:setText("")
-    self.color_a:setText("")
+
+    self.color_hex:setText("")
     self.fontsize:setText("")
     self.csb_name:setText("")
+    self.res_path:setText(self.obj.res_path or "")
+
+
+    
     local color = self:getObjColor()
     if color then
-        self.color_r:setText(color.r)
-        self.color_g:setText(color.g)
-        self.color_b:setText(color.b)
-        self.color_a:setText(color.a or 255)
+        self.color_hex:setFontColor(color)
+        self.color_hex:setText(self:rgbToHex(color))
     end
+
+
     local font = self:getObjFont()
     if font then
         self.fontsize:setText(font.size)
@@ -623,6 +607,28 @@ function DebugUIHelper:getObjFont()
     return font
 end
 
+function DebugUIHelper:rgbToHex(color)
+    -- 将每个颜色分量转换为16进制字符串，并确保长度为两位
+    local hexR = string.format("%02x", color.r)
+    local hexG = string.format("%02x", color.g)
+    local hexB = string.format("%02x", color.b)
+
+    -- 组合三个十六进制字符串，并加上前缀#
+    return "#" .. hexR .. hexG .. hexB
+end
+function DebugUIHelper:hexToRgb(hex)
+    -- 移除字符串开头的#
+    hex = hex:gsub("#", "")
+
+    -- 将十六进制字符串转换为整数
+    local r = tonumber(hex:sub(1, 2), 16)
+    local g = tonumber(hex:sub(3, 4), 16)
+    local b = tonumber(hex:sub(5, 6), 16)
+
+    -- 返回RGB颜色
+    return cc.c3b(r, g, b)
+end
+
 function DebugUIHelper:getObjColor()
     local obj = self.obj
     local c = nil

src/game/backpack/view/backpack_window.lua

@@ -19,7 +19,6 @@ function BackPackWindow:__init(sub_type)
     self.cur_index = nil
     self.res_list = {
         { path = PathTool.getPlistImgForDownLoad("backpack","backpack"), type = ResourcesType.plist },
-        { path = PathTool.getPlistImgForDownLoad("bigbg","bigbg_2",true), type = ResourcesType.single },
         { path = PathTool.getPlistImgForDownLoad("bigbg","pattern/pattern_3"), type = ResourcesType.single},
     }
     self.item_render_list   = {}                    -- 当前待创建的物品数据

src/game/chat/view/chat_window.lua

@@ -125,7 +125,7 @@ function ChatWindow:initView()
     -- 大的背景
     local background = createImage(self.back_bg, nil, 0, 0, cc.p(0, 0))
     if not self.background_load then self.background_load = loadImageTextureFromCDN(background, PathTool.getTargetRes("bigbg", "bigbg_voyage_01"), ResourcesType.single, self.background_load) end
-    background:setContentSize(self.width)
+    background:setContentSize(self.size)
 
     -- 小背景
     -- self.bg1 = createScale9Sprite(PathTool.getResFrame("common","common_1003"),0,0,LOADTEXT_TYPE_PLIST,self.back_bg)

src/game/guild/view/guild_main_window.lua

@@ -25,14 +25,14 @@ function GuildMainWindow:__init()
 	self.role_vo = RoleController:getInstance():getRoleVo()
 	self.res_list = {
 		{path = PathTool.getPlistImgForDownLoad("guild", "guild"), type = ResourcesType.plist},
-        { path = PathTool.getPlistImgForDownLoad("bigbg","bigbg_2",true), type = ResourcesType.single },
 	}
 end
 
 function GuildMainWindow:open_callback()
     self.background = self.root_wnd:getChildByName("background")
     if self.background ~= nil then
-        self.background:loadTexture(PathTool.getPlistImgForDownLoad("bigbg","bigbg_2",true), LOADTEXT_TYPE)
+        -- self.background:loadTexture(PathTool.getPlistImgForDownLoad("bigbg","big bg_2",true), LOADTEXT_TYPE)
+        self.background:loadTexture(nil)
         self.background:setScale(display.getMaxScale())
     end
 

src/game/guild/view/guild_new_main_window2.pack.lua

@@ -33,7 +33,6 @@ function GuildNewMainWindow2:__init()
 	self.role_vo = RoleController:getInstance():getRoleVo()
 	self.res_list = {
 		{path = PathTool.getPlistImgForDownLoad("guild", "guild"), type = ResourcesType.plist},
-        { path = PathTool.getPlistImgForDownLoad("bigbg","bigbg_2",true), type = ResourcesType.single },
 	}
 
     self.role_vo = RoleController:getInstance():getRoleVo()
@@ -46,7 +45,7 @@ function GuildNewMainWindow2:open_callback()
 
     self.background = self.root_wnd:getChildByName("background")
     if self.background ~= nil then
-        self.background:loadTexture(PathTool.getPlistImgForDownLoad("bigbg","bigbg_2",true), LOADTEXT_TYPE)
+
         self.background:setContentSize(SCREEN_WIDTH,SCREEN_HEIGHT)
         self.background:setPositionX(0)
     end

src/game/guildsecretarea/view/guildsecretarea_main_window.lua

@@ -359,7 +359,7 @@ function GuildsecretareaMainWindow:onClickRankBtn(  )
     local setting = {}
     setting.rank_type = RankConstant.RankType.guild_secretarea
     setting.title_name = TI18N("排行榜")
-    setting.background_path = PathTool.getPlistImgForDownLoad("bigbg","bigbg_2",true)
+    setting.background_path = "-"
     setting.boss_id = self.boss_config.id
     -- setting.show_tips = TI18N("奖励将在活动结束后通过邮件发放")
     RankController:getInstance():openSingleRankMainWindow(true, setting)

src/game/guildwar/view/guildwar_position_item.lua

@@ -105,7 +105,7 @@ function GuildwarPositionItem:setData( data, position_type )
         if self.update_self_event == nil then
             self.update_self_event = self.data:Bind(GuildwarEvent.UpdateGuildWarPositionDataEvent, function()
                 if not self.refreshPosition then
-                    if data.UnBind then
+                    if data.UnBind and self.update_self_event ~= nil then
                         data:UnBind(self.update_self_event)
                     end
                     self.update_self_event = nil

src/game/guildwar/view/guildwar_rank_window.lua

@@ -345,7 +345,7 @@ function GuildWarRankWindow:showEmptyIcon(bool)
 end
 
 function GuildWarRankWindow:close_callback(  )
-    if self.update_data_event then
+    if self.update_data_event ~= nil then
         GlobalEvent:getInstance():UnBind(self.update_data_event)
         self.update_data_event = nil
     end

src/game/mall/view/mall_action_window.lua

@@ -35,7 +35,7 @@ end
 function MallActionWindow:open_callback()
     self.background = self.root_wnd:getChildByName("background")
     if self.background ~= nil then
-        self.background:loadTexture(PathTool.getPlistImgForDownLoad("bigbg","bigbg_2",true), LOADTEXT_TYPE)
+        -- self.background:loadTexture(PathTool.getPlistImgForDownLoad("bigbg","bi gbg_2",true), LOADTEXT_TYPE)
         self.background:setScale(display.getMaxScale())
     end
     

src/game/mall/view/mall_window_2 copy.lua

@@ -90,7 +90,7 @@ end
 function MallWindow2:open_callback()
 	self.background = self.root_wnd:getChildByName("background")
     if self.background ~= nil then
-        self.background:loadTexture(PathTool.getPlistImgForDownLoad("bigbg","bigbg_2",true), LOADTEXT_TYPE)
+        -- self.background:loadTexture(PathTool.getPlistImgForDownLoad("bigbg","bigb g_2",true), LOADTEXT_TYPE)
         self.background:setScale(display.getMaxScale())
     end
     

src/game/mall/view/mall_window_tmp.lua

@@ -25,7 +25,6 @@ end
 function MallWindowTmp:open_callback()
 	-- self.background = self.root_wnd:getChildByName("background")
     -- if self.background ~= nil then
-    --     self.background:loadTexture(PathTool.getPlistImgForDownLoad("bigbg","bigbg_2",true), LOADTEXT_TYPE)
     -- end
     
     self.mainContainer = self.root_wnd:getChildByName("main_container")

src/game/rank/view/single_rank_main_window.lua

@@ -15,7 +15,7 @@ function SingleRankMainWindow:__init(title_name, background_path, rank_type)
     self.view_tag = ViewMgrTag.DIALOGUE_TAG -- 不显示后面的内容
     self.is_full_screen = true
 
-    self.my_default_layout_name = "common/common_single_rank_window"
+    self.my_default_layout_name = "endlesstrail/endlesstrail_rank_window"
 
     self.title_str = title_name or TI18N("排行榜")
     self.rank_type = rank_type or RankConstant.RankType.sandybeach_boss_fight

src/game/rank/view/single_rank_panel.lua

@@ -68,7 +68,7 @@ function SingleRankPanel:ctor()
     
     self.role_head = PlayerHead.new(PlayerHead.type.circle)
     self.role_head:setHeadLayerScale(0.95)
-    self.role_head:setPosition(150, 65)
+    self.role_head:setPosition(150, 55)
     self.role_head:setLev(99)
     my_container:addChild(self.role_head)
 

src/main.lua

@@ -0,0 +1,84 @@
+-- 注意 文件(main/config)不能热更
+
+CHANNEL_ID = 'zero_1'
+
+cc.FileUtils:getInstance():setPopupNotify(false)
+cc.FileUtils:getInstance():setSearchPaths({})
+cc.FileUtils:getInstance():addSearchPath("src")
+cc.FileUtils:getInstance():addSearchPath("res_" .. CHANNEL_ID)
+if cc.Application:getInstance():getTargetPlatform() == 0 then
+    cc.FileUtils:getInstance():addSearchPath("../../src")
+    cc.FileUtils:getInstance():addSearchPath("../../res_" .. CHANNEL_ID)
+end
+require "config_init"
+
+--------------------------------------------------------------------
+require("channel.__com__.config_demo")
+
+GAME_NAME = '画西游'
+CHANNEL_NAME = CHANNEL_CFG.ZERO_1 .. "_pc" -- 渠道名
+URL_LUA_CONFIG = string.format('http://back.cqheitan.com/config/%s_config.lua', CHANNEL_NAME)
+--------------------------------------------------------------------
+
+
+-- 此处使用LuaPanda断点调试
+require("LuaPanda").start("127.0.0.1", 8818)
+---------------------------------------------
+
+local viewsize = cc.Director:getInstance():getWinSize()
+-- 固定高度
+SCREEN_HEIGHT = 720
+SCREEN_WIDTH = viewsize.width / (viewsize.height / SCREEN_HEIGHT)
+
+CC_DESIGN_RESOLUTION.width = SCREEN_WIDTH
+CC_DESIGN_RESOLUTION.height = SCREEN_HEIGHT
+
+require "cocos.init"
+
+local main_lua = cc.FileUtils:getInstance():fullPathForFilename("src/main.lua")
+ROOT_DIR = string.gsub(main_lua, "src/main.lua", "")
+
+-- 关于手机高低配,需要参与的地方有几个..第一个是baserole 这里是模型展示部分 第二个是 battlerole 这里是战斗,第三个是battlehookrole 这里是挂机单位
+-- 然后还有skill_act.addSpine 这里是战斗预加载,最后就是centercity.quequeCreateEffect 场景特效加载
+-- 通用创建 createSpineByName  和  createEffectSpine
+
+function main()
+    collectgarbage("collect")
+    collectgarbage("setpause", 100)
+    collectgarbage("setstepmul", 5000)
+
+    -- 优先设置加载路径
+    cc.FileUtils:getInstance():setSearchPaths({})
+    if IS_TEST_STATUS == true then
+        cc.FileUtils:getInstance():addSearchPath("res_verifyios")
+    end
+
+    cc.FileUtils:getInstance():addSearchPath(cc.FileUtils:getInstance():getWritablePath() .. "assets/res_" .. CHANNEL_ID)
+    cc.FileUtils:getInstance():addSearchPath(cc.FileUtils:getInstance():getWritablePath() .. "assets/src")
+    cc.FileUtils:getInstance():addSearchPath(cc.FileUtils:getInstance():getWritablePath() .. "unzip/res_" .. CHANNEL_ID)
+    cc.FileUtils:getInstance():addSearchPath(cc.FileUtils:getInstance():getWritablePath() .. "unzip/src")
+    cc.FileUtils:getInstance():addSearchPath("src/code_config", true)
+    cc.FileUtils:getInstance():addSearchPath("res_" .. CHANNEL_ID)
+    cc.FileUtils:getInstance():addSearchPath("src")
+    if cc.Application:getInstance():getTargetPlatform() == cc.PLATFORM_OS_WINDOWS then
+        cc.FileUtils:getInstance():addSearchPath("../../src/code_config", true)
+        cc.FileUtils:getInstance():addSearchPath("../../src")
+        cc.FileUtils:getInstance():addSearchPath("../../res_" .. CHANNEL_ID)
+    end
+
+    -- 先设置一下全局速度
+    cc.Director:getInstance():getScheduler():setTimeScale(1)
+    -- 获取版本信息,做更新判断
+    require("sdk_function")
+    local file_update = require("channel.__com__.file_update"):create()
+    FileUpdate_Instance = file_update
+    file_update:ver_load_start()
+end
+
+local base = {}
+for k, v in pairs(_G) do
+    base[k] = true
+end
+_G["base"] = base
+
+main()