Skip to content

金学艇 / xhx

Go to a project
Toggle navigation
Toggle navigation pinning
Commit d2bd6394 d2bd63943686ebf483894488767761ebf2fa19e4 by jinwawa
Options

0513

1 parent 50f2e36f
Expand all
Inline Side-by-side
Showing 37 changed files with 139 additions and 17 deletions
This diff could not be displayed because it is too large.
<?xml version="1.0" encoding="UTF-8"?>
<VSPerformanceSession Version="1.00">
<Options>
<Solution>xhx.sln</Solution>
<CollectionMethod>Sampling</CollectionMethod>
<AllocationMethod>None</AllocationMethod>
<AddReport>true</AddReport>
<ResourceBasedAnalysisSelected>true</ResourceBasedAnalysisSelected>
<UniqueReport>Timestamp</UniqueReport>
<SamplingMethod>Cycles</SamplingMethod>
<CycleCount>10000000</CycleCount>
<PageFaultCount>10</PageFaultCount>
<SysCallCount>10</SysCallCount>
<SamplingCounter Name="" ReloadValue="00000000000f4240" DisplayName="" />
<RelocateBinaries>false</RelocateBinaries>
<HardwareCounters EnableHWCounters="false" />
<EtwSettings />
<PdhSettings>
<PdhCountersEnabled>false</PdhCountersEnabled>
<PdhCountersRate>500</PdhCountersRate>
<PdhCounters>
<PdhCounter>\Memory\Pages/sec</PdhCounter>
<PdhCounter>\PhysicalDisk(_Total)\Avg. Disk Queue Length</PdhCounter>
<PdhCounter>\Processor(_Total)\% Processor Time</PdhCounter>
</PdhCounters>
</PdhSettings>
</Options>
<ExcludeSmallFuncs>true</ExcludeSmallFuncs>
<InteractionProfilingEnabled>false</InteractionProfilingEnabled>
<JScriptProfilingEnabled>false</JScriptProfilingEnabled>
<PreinstrumentEvent>
<InstrEventExclude>false</InstrEventExclude>
</PreinstrumentEvent>
<PostinstrumentEvent>
<InstrEventExclude>false</InstrEventExclude>
</PostinstrumentEvent>
<Binaries>
<Binary>
<Path>..\..\runtime\win32\GuandanAndroid.exe</Path>
<ArgumentTimestamp>01/01/0001 00:00:00</ArgumentTimestamp>
<Instrument>true</Instrument>
<Sample>true</Sample>
<ExternalWebsite>false</ExternalWebsite>
<InteractionProfilingEnabled>false</InteractionProfilingEnabled>
<IsLocalJavascript>false</IsLocalJavascript>
<IsWindowsStoreApp>false</IsWindowsStoreApp>
<IsWWA>false</IsWWA>
<LaunchProject>true</LaunchProject>
<OverrideProjectSettings>false</OverrideProjectSettings>
<LaunchMethod>Executable</LaunchMethod>
<ExecutablePath>..\..\runtime\win32\GuandanAndroid.exe</ExecutablePath>
<StartupDirectory>
</StartupDirectory>
<Arguments>
</Arguments>
<NetAppHost>IIS</NetAppHost>
<NetBrowser>InternetExplorer</NetBrowser>
<ExcludeSmallFuncs>true</ExcludeSmallFuncs>
<JScriptProfilingEnabled>false</JScriptProfilingEnabled>
<PreinstrumentEvent>
<InstrEventExclude>false</InstrEventExclude>
</PreinstrumentEvent>
<PostinstrumentEvent>
<InstrEventExclude>false</InstrEventExclude>
</PostinstrumentEvent>
</Binary>
</Binaries>
<Reports>
<Report>
<Path>GuandanAndroid190513.vspx</Path>
</Report>
</Reports>
<Launches>
<Binary>
<Path>..\..\runtime\win32\GuandanAndroid.exe</Path>
</Binary>
</Launches>
</VSPerformanceSession>
\ No newline at end of file
No preview for this file type
call xcopy %cd%\res D:\AndroidProject\XhxAndroid_ws\assets\res /E/I/Y
call cocos luacompile -s %cd%\src -d D:\AndroidProject\XhxAndroid_ws\assets\src -e -k tpdrawgdanjue -b tpdrawgd
call xcopy %cd%\src D:\AndroidProject\XhxAndroid_ws\assets\src /E/I/Y
xcopy %cd%\res D:\AndroidProject\XhxAndroid_ws\assets\res /E/I/Y
cocos luacompile -s %cd%\src -d D:\AndroidProject\XhxAndroid_ws\assets\src -e -k tpdrawgdanjue -b tpdrawgd
xcopy %cd%\src D:\AndroidProject\XhxAndroid_ws\assets\src /E/I/Y
......
This diff could not be displayed because it is too large.

21.2 KB | W: | H:

10.5 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

10.4 KB | W: | H:

4.75 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

6.87 KB | W: | H:

4.72 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.06 KB | W: | H:

2.21 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
......@@ -90,7 +90,8 @@ function MainScene:onCreate(params)
self.nodes[2] = {self.btn_role};
self:updateSelectedState(self.btn_task);
--self:updateSelectedState(self.btn_task);
self:updateSelectedState(self.btn_ylc); --修改光标为游乐场
local function onNodeEventHandler(event)
if event == "enter" then
......
......@@ -65,8 +65,11 @@ function FriendView:init()
if self.uid ~= UserModel.user_info.uid then
local game_score = self.user_home.game_score;
self.btn_back:getChildByName("txt"):setString("回家");
self.btn_back:getChildByName("selected"):getChildByName("txt"):setString("回家");
--self.btn_back:getChildByName("txt"):setString("回家");
--self.btn_back:getChildByName("selected"):getChildByName("txt"):setString("回家");
self.btn_back:loadTextureNormal("res/ui/friend/bg_friend_back.png");
self.btn_back:loadTexturePressed("res/ui/dress/bg_friend_back.png");
self.btn_back:getChildByName("selected"):setSpriteFrame(cc.Sprite:create("res/ui/friend/bg_friend_back.png"):getSpriteFrame());
table.sort(game_score,function (aa,bb)
return aa.val1 > bb.val1;
......@@ -322,10 +325,14 @@ function FriendView:onItemOver(ref,event)
local children = self.scrollView:getChildren();
for i,v in ipairs(children) do
local btn_del = v:getChildByName("btn_del");
local title_tip=v:getChildByName("tip");
if btn_del then
btn_del:setVisible(false);
table.removebyvalue(self.nodes[#self.nodes],btn_del);
end
if title_tip then
title_tip:setVisible(false);
end
if v == item then
v:setLocalZOrder(1);
else
......@@ -334,6 +341,7 @@ function FriendView:onItemOver(ref,event)
end
local btn_del = item:getChildByName("btn_del");
local title_tip=item:getChildByName("tip");
btn_del.uid = ref.uid;
if btn_del then
btn_del:setVisible(true);
......@@ -345,6 +353,9 @@ function FriendView:onItemOver(ref,event)
self:updatePage();
end
end
if title_tip then
title_tip:setVisible(true);
end
end
function FriendView:onFriendItemOut()
......@@ -355,6 +366,10 @@ function FriendView:onFriendItemOut()
btn_del:setVisible(false);
table.removebyvalue(self.nodes[#self.nodes],btn_del);
end
local title_tip=v:getChildByName("tip");
if title_tip then
title_tip:setVisible(false);
end
end
end
......
......@@ -19,4 +19,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
EndGlobal
......
......@@ -19,24 +19,24 @@
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
<AbstractNodeData Name="bg_login" ActionTag="1058243631" Tag="24" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="617.0000" RightMargin="617.0000" TopMargin="337.0000" BottomMargin="337.0000" ctype="SpriteObjectData">
<AbstractNodeData Name="bg_login" ActionTag="1058243631" Tag="24" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
<Size X="1280.0000" Y="720.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="640.0000" Y="360.0000" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5000" Y="0.5000" />
<PreSize X="0.0359" Y="0.0639" />
<PreSize X="1.0000" Y="1.0000" />
<FileData Type="Normal" Path="bg/bg_loading.jpg" Plist="" />
<BlendFunc Src="770" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="panel" ActionTag="-1040660810" Tag="20" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="1280.0000" Y="720.0000" />
<Children>
<AbstractNodeData Name="btn_login_yk" ActionTag="1043641405" Tag="84" IconVisible="False" LeftMargin="290.5952" RightMargin="668.4048" TopMargin="430.3244" BottomMargin="163.6756" TouchEnable="True" FontSize="26" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="291" Scale9Height="104" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
<AbstractNodeData Name="btn_login_yk" ActionTag="1043641405" Tag="84" IconVisible="False" LeftMargin="290.5955" RightMargin="668.4045" TopMargin="565.3218" BottomMargin="28.6782" TouchEnable="True" FontSize="26" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="291" Scale9Height="104" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
<Size X="321.0000" Y="126.0000" />
<Children>
<AbstractNodeData Name="selected" ActionTag="-1190160652" Tag="983" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
<AbstractNodeData Name="selected" Visible="False" ActionTag="-1190160652" Tag="983" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
<Size X="321.0000" Y="126.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="160.5000" Y="63.0000" />
......@@ -49,10 +49,10 @@
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="451.0952" Y="226.6756" />
<Position X="451.0955" Y="91.6782" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.3524" Y="0.3148" />
<PrePosition X="0.3524" Y="0.1273" />
<PreSize X="0.2508" Y="0.1750" />
<FontResource Type="Normal" Path="ui/font/yuanti.ttf" Plist="" />
<TextColor A="255" R="96" G="41" B="0" />
......@@ -62,7 +62,7 @@
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<AbstractNodeData Name="btn_login_wx" ActionTag="512061869" Tag="28" IconVisible="False" LeftMargin="679.2761" RightMargin="279.7239" TopMargin="430.3235" BottomMargin="163.6765" TouchEnable="True" FontSize="26" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="291" Scale9Height="104" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
<AbstractNodeData Name="btn_login_wx" ActionTag="512061869" Tag="28" IconVisible="False" LeftMargin="680.3325" RightMargin="278.6675" TopMargin="565.1310" BottomMargin="28.8690" TouchEnable="True" FontSize="26" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="291" Scale9Height="104" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
<Size X="321.0000" Y="126.0000" />
<Children>
<AbstractNodeData Name="selected" Visible="False" ActionTag="1750464100" Tag="984" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
......@@ -78,10 +78,10 @@
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="839.7761" Y="226.6765" />
<Position X="840.8325" Y="91.8690" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.6561" Y="0.3148" />
<PrePosition X="0.6569" Y="0.1276" />
<PreSize X="0.2508" Y="0.1750" />
<FontResource Type="Normal" Path="ui/font/yuanti.ttf" Plist="" />
<TextColor A="255" R="96" G="41" B="0" />
......
......@@ -2,6 +2,9 @@
<Properties>
<Item Key="GuidesList">
<Value ctype="GuidesData">
<HorizontalList>
<Guides Direction="Horizontal" Position="154.8665" />
</HorizontalList>
<VerticalList>
<Guides Position="639.5614" />
</VerticalList>
......
<UserData Version="3.10.0.0">
<Properties>
<Item Key="GuidesList">
<Value ctype="GuidesData" />
<Value ctype="GuidesData">
<VerticalList>
<Guides Position="80.4615" />
</VerticalList>
</Value>
</Item>
</Properties>
</UserData>
\ No newline at end of file
......
<UserData Version="3.10.0.0">
<Properties>
<Item Key="GuidesList">
<Value ctype="GuidesData" />
<Value ctype="GuidesData">
<VerticalList>
<Guides Position="1073.0090" />
</VerticalList>
</Value>
</Item>
</Properties>
</UserData>
\ No newline at end of file
......

21.2 KB | W: | H:

10.5 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

10.4 KB | W: | H:

4.75 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.06 KB | W: | H:

2.21 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
......@@ -669,9 +669,13 @@
</Folder>
<Folder Name="friend">
<Image Name="bg_friend.png" />
<Image Name="bg_friend_add.png" />
<Image Name="bg_friend_back.png" />
<Image Name="bg_friend_exit.png" />
<Image Name="bg_friend_item.png" />
<Image Name="bg_friend_item_s.png" />
<Image Name="bg_friend_lv.png" />
<Image Name="bg_friend_tip_title.png" />
<Image Name="btn_add_1.png" />
<Image Name="btn_add_2.png" />
<Image Name="btn_back_1.png" />
......
......@@ -28,5 +28,15 @@
<LastRunType Value="Windows" />
</Value>
</Item>
<Item Key="TabsParamsKey">
<Value ctype="TabsInfo">
<OpenedDocuments>
<FilePathData Path="ui/friend/FriendLayer.csd" />
<FilePathData Path="ui/friend/FriendItemLayer.csd" />
<FilePathData Path="ui/MainScene.csd" />
</OpenedDocuments>
<ActiveDocument Path="ui/MainScene.csd" />
</Value>
</Item>
</Properties>
</UserData>
\ No newline at end of file
......