加入Image

Assets/Csharp/Driver.cs

@@ -51,7 +51,6 @@ void Start()
 
     void Awake ()
     {
-        print("Awake=======");
         Application.targetFrameRate = targetFrameRate;
     }
 
@@ -67,7 +66,7 @@ void Update()
 
     void FixedUpdate()
     {
-        fixedTickFunc.Call(Time.realtimeSinceStartup);
+        // fixedTickFunc.Call();
     }
 
     public void Close() {

Assets/Editor/Custom/CustomSettings.cs

@@ -213,7 +213,7 @@ public static class CustomSettings
 
         //自定义类
         _GT(typeof(ByteArray)),
-        _GT(typeof(FileUtils)),
+        // _GT(typeof(FileUtils)),
         _GT(typeof(TouchTrigger)),
         _GT(typeof(LinkImageText)),
         _GT(typeof(UIScrollContent)),

Assets/Lua/ImportClient.lua

@@ -28,11 +28,15 @@ require "utils/Clone"
 require "datas/TriggerInfo"
 require "datas/TriggerType"
 
+require "datas/common/ShaderType"
+require "datas/common/SpriteSheetInfo"
+require "datas/common/SpriteSheetList"
+
 require "datas/template/BaseTemplateList"
-require "datas/template/SkillTemplateList"
 require "datas/template/TestTemplateList"
 
 require "managers/LoaderManager"
+require "managers/PathManager"
 require "managers/PoolManager"
 require "managers/TriggerManager"
 

Assets/Lua/Main.lua

@@ -1,3 +1,4 @@
+
 globalData = nil;
 globalConst = nil;
 globalManager = nil;

Assets/Lua/StartController.lua

@@ -15,7 +15,7 @@ function StartController:loadTemplate()
 	print("开始加载模板数据");
 	globalManager.loaderManager:loadBytes("ky203.txt",self.templateLoadComplete,self);
 end
-function StartController:templateLoadComplete(loaderItem,asset,bytes)
+function StartController:templateLoadComplete(abName,assetName,bytes)
 	if bytes ~= nil then
 		print("template load complete");
 		self.mubanTime = os.clock();
@@ -27,41 +27,39 @@ function StartController:templateParseComplete()
 	print("template parse complete");
 	print("ooooooooooooooooooooo解析模板表耗时：",os.clock() - self.mubanTime);
 	self._templateComplete = true;
-	self:loadUIPrefabs();
+	self:loadShaders();
 end
 
-function StartController:loadUIPrefabs()
-	globalManager.loaderManager:loadAsset("uiprefabs.u",self.loadUIPrefabsComplete,self);
+function StartController:loadShaders()
+	globalManager.loaderManager:loadAsset("shader.u",nil,self.loadShadersComplete,self);
 end
 
-function StartController:loadUIPrefabsComplete(abName,assetName,abcontent)
-	globalData.uiPrefabs = parseABContent(abcontent);
-	-- for k,v in pairs(globalData.uiPrefabs) do
-	-- 	print("uiPrefabs:",k);
-	-- end
-	globalManager.loaderManager:loadAsset("font.u",self.loadFontComplete,self);
+function StartController:loadShadersComplete(abName,assetName,abContent)
+	globalConst.shaderType:init(abContent);
+	self:loadUIPrefabs();
 end
 
-function StartController:loadFontComplete(abName,assetName,abcontent)
-	globalData.defaultFont = abcontent:LoadAsset("yhFont.ttf");
-
-	self:startGame();
+function StartController:loadUIPrefabs()
+	globalManager.loaderManager:loadAsset("uiprefabs.u",nil,self.loadUIPrefabsComplete,self);
+end
+
+function StartController:loadUIPrefabsComplete(abName,assetName,abContent)
+	globalData.uiPrefabs = parseABContent(abContent);
+	globalManager.loaderManager:loadAsset("font.u","yhFont.ttf",self.loadFontComplete,self);
 end
 
-function StartController:loadComplete(abName,assetName,abcontent)
+function StartController:loadFontComplete(abName,assetName,abContent)
+	globalData.defaultFont = abContent:LoadAsset(assetName);
 
-	-- print(typeof(globalData.defaultFont));
-	local destList = parseABContent(abcontent);
-	--  = destList["Asterix-Blink.ttf"];
-	-- abcontent:LoadAsset("Text.prefab");
 	self:startGame();
 end
 
 function StartController:startGame()
 	print("startGame");
 
 	local image = globalManager.kCreator:createImage();	
-	image:setPath("bg.jpg");
+	-- image:loadFromSpriteSheet("callpanel.u","callHeroImg1");
+	image:loadOutPic("callpanel-choukabg.png.u","callPanel-choukabg");
 	image:setPosition(globalManager.uiManager.PANEL_WIDTH/2,-globalManager.uiManager.PANEL_HEIGHT/2);
 	-- image:addTouchCallBack(self.btnClickHandler,self);
 	image:setParent(globalManager.uiManager.mainTransform);
@@ -71,15 +69,15 @@ function StartController:startGame()
 	label:setString("你是&#6$602$2$<color=#fb5657>没下划线点击</color>$81$0$0$0#&哈&#6$602$3$<color=#fb5657>下划线点击</color>$91$0$0$0#&吗");
 	label:setParent(globalManager.uiManager.mainTransform);
 
-	local scrollView = globalManager.kCreator:createScrollView("scrollView");
-	image:addNode(scrollView);
-	scrollView:setGap(5,5);
-	scrollView:setCallBacks(self.createItemCb,self.getItemIdCb,self.getItemLenCb,self);
-	scrollView:setFormat(1,100,100);
+	-- local scrollView = globalManager.kCreator:createScrollView("scrollView");
+	-- image:addNode(scrollView);
+	-- scrollView:setGap(5,5);
+	-- scrollView:setCallBacks(self.createItemCb,self.getItemIdCb,self.getItemLenCb,self);
+	-- scrollView:setFormat(1,100,100);
 end
 
 function StartController:createItemCb(index)
-	print("createItemCb",index);
+	-- print("createItemCb",index);
 	return globalManager.kCreator:createImage();
 end
 

Assets/Lua/common/AssetLoader.lua

@@ -4,8 +4,11 @@ function AssetLoader:ctor(abName)
 	self.text = nil;
 	self.bytes = nil;
 	self.texture = nil;
+
+	self.count = 0;
 	--ab里面的内容
 	self.abContent = nil;
+
 	--0:assetbundle,1:text,2:bytes,3:texture
 	self.loadType = 0;
 
@@ -57,6 +60,7 @@ function AssetLoader:setLoadType(loadType)
 	self.loadType = loadType;
 end
 
+
 function AssetLoader:addCB(callback,target,assetName)
 	local index = self:hasCB(callback,target);
 	if(index == -1)then
@@ -71,6 +75,7 @@ function AssetLoader:addCB(callback,target,assetName)
 		print("重复添加加载回调");
 	end
 end
+
 function AssetLoader:removeCB(callback,target)
 	local index = self:hasCB(callback,target);
 	if(index > -1)then
@@ -102,7 +107,13 @@ end
 
 function AssetLoader:doCallBack(qd)
 	if self.loadType == 0 then
-		qd.callback(qd.target,self.abName,qd.params,self.abContent);
+		local assetName = qd.params;
+		if assetName ~= nil then
+			local asset =  self.abContent:LoadAsset(assetName);
+			qd.callback(qd.target,self.abName,qd.params,self.abContent,asset);
+		else
+			qd.callback(qd.target,self.abName,qd.params,self.abContent);
+		end
 	elseif self.loadType == 1 then
 		qd.callback(qd.target,self.abName,qd.params,self.text);
 	elseif self.loadType == 2 then
@@ -113,6 +124,10 @@ function AssetLoader:doCallBack(qd)
 
 end
 
+function AssetLoader:isCanRemove()
+	return #self._cbs <= 0;
+end
+
 function AssetLoader:dispose()
 	self._cbs = nil;
 	self.text = nil;

Assets/Lua/datas/GlobalConst.lua

@@ -3,6 +3,7 @@ GobalConst = class("GobalConst");
 function GobalConst:ctor()
 	self.layerConst = nil;
 	self.colorConst = nil;
+	self.shaderType = nil;
 	self.triggerType = nil;
 
 	self.testTemplateList = nil;
@@ -14,6 +15,7 @@ function GobalConst:init()
 	self.layerConst = LayerConst:new();
 	self.colorConst = ColorConst:new();
 	self.triggerType = TriggerType:new();
+	self.shaderType = ShaderType:new();
 
 	self.testTemplateList = TestTemplateList:new();
 end

Assets/Lua/datas/common/ShaderType.lua

@@ -0,0 +1,27 @@
+ShaderType = class("ShaderType");
+
+function ShaderType:ctor()
+	self.shaders = {};
+end
+
+function ShaderType:init(abContent)
+	local s = abContent:LoadAllAssets(typeof(UnityEngine.Shader));
+	local len = s.Length - 1;
+	local tmps = nil;
+	local tmpName = nil;
+	for i = 0,len,1 do
+		local tmps = string.split(s[i].name,"/");
+		if #tmps > 0 then
+			tmpName = tmps[#tmps];
+			self.shaders[tmpName] = s[i];
+			print("shader名称 == ",i,s[i].name,tmpName);
+		end
+	end
+
+	-- PSD2UGUI
+	self.Default_Gray = self.shaders["Default_Gray"];-- 置灰shader
+	self.PSD2UGUI_SPLIT_ALPHA = self.shaders["PSD2UGUI ICON SPLIT ALPHA"];
+	self.PSD2UGUI_SPLIT_ALPHA_GREY = self.shaders["PSD2UGUI ICON SPLIT ALPHA GREY"];
+	self.UiObj = self.shaders["UiObj"];
+	self.UiObj_Mask = self.shaders["UiObj_Mask"];
+end

Assets/Lua/datas/common/SpriteSheetInfo.lua

@@ -0,0 +1,42 @@
+SpriteSheetInfo = class("SpriteSheetInfo");
+
+function SpriteSheetInfo:ctor(sheetName)
+	self.sheetName = sheetName;
+	self.material = nil;
+	self.sprites = {};
+	self.count = 0;
+end
+
+function SpriteSheetInfo:init(abContent)
+	local m = abContent:LoadAllAssets(typeof(UnityEngine.Material));
+	if(m ~= nil)then
+		self.material = m[0];
+	end
+	local s = abContent:LoadAllAssets(typeof(UnityEngine.Sprite));
+	local Len = s.Length - 1;
+	for i = 0,Len,1 do
+		self.sprites[s[i].name] = s[i];
+	end
+end
+
+function SpriteSheetInfo:getSprite(name)
+	return self.sprites[name];
+end
+
+function SpriteSheetInfo:addCount()
+	self.count = self.count + 1;
+end
+
+function SpriteSheetInfo:reduceCount()
+	self.count = self.count - 1;
+end
+
+function SpriteSheetInfo:isCanDestory()
+	return self.count <= 0;
+end
+
+function SpriteSheetInfo:dispose()
+	self.sprites = nil;
+	self.material = nil;
+	globalManager.loaderManager:destroyAB(self.sheetName);
+end