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.
1 <?xml version="1.0" encoding="UTF-8"?>
2 <VSPerformanceSession Version="1.00">
3 <Options>
4 <Solution>xhx.sln</Solution>
5 <CollectionMethod>Sampling</CollectionMethod>
6 <AllocationMethod>None</AllocationMethod>
7 <AddReport>true</AddReport>
8 <ResourceBasedAnalysisSelected>true</ResourceBasedAnalysisSelected>
9 <UniqueReport>Timestamp</UniqueReport>
10 <SamplingMethod>Cycles</SamplingMethod>
11 <CycleCount>10000000</CycleCount>
12 <PageFaultCount>10</PageFaultCount>
13 <SysCallCount>10</SysCallCount>
14 <SamplingCounter Name="" ReloadValue="00000000000f4240" DisplayName="" />
15 <RelocateBinaries>false</RelocateBinaries>
16 <HardwareCounters EnableHWCounters="false" />
17 <EtwSettings />
18 <PdhSettings>
19 <PdhCountersEnabled>false</PdhCountersEnabled>
20 <PdhCountersRate>500</PdhCountersRate>
21 <PdhCounters>
22 <PdhCounter>\Memory\Pages/sec</PdhCounter>
23 <PdhCounter>\PhysicalDisk(_Total)\Avg. Disk Queue Length</PdhCounter>
24 <PdhCounter>\Processor(_Total)\% Processor Time</PdhCounter>
25 </PdhCounters>
26 </PdhSettings>
27 </Options>
28 <ExcludeSmallFuncs>true</ExcludeSmallFuncs>
29 <InteractionProfilingEnabled>false</InteractionProfilingEnabled>
30 <JScriptProfilingEnabled>false</JScriptProfilingEnabled>
31 <PreinstrumentEvent>
32 <InstrEventExclude>false</InstrEventExclude>
33 </PreinstrumentEvent>
34 <PostinstrumentEvent>
35 <InstrEventExclude>false</InstrEventExclude>
36 </PostinstrumentEvent>
37 <Binaries>
38 <Binary>
39 <Path>..\..\runtime\win32\GuandanAndroid.exe</Path>
40 <ArgumentTimestamp>01/01/0001 00:00:00</ArgumentTimestamp>
41 <Instrument>true</Instrument>
42 <Sample>true</Sample>
43 <ExternalWebsite>false</ExternalWebsite>
44 <InteractionProfilingEnabled>false</InteractionProfilingEnabled>
45 <IsLocalJavascript>false</IsLocalJavascript>
46 <IsWindowsStoreApp>false</IsWindowsStoreApp>
47 <IsWWA>false</IsWWA>
48 <LaunchProject>true</LaunchProject>
49 <OverrideProjectSettings>false</OverrideProjectSettings>
50 <LaunchMethod>Executable</LaunchMethod>
51 <ExecutablePath>..\..\runtime\win32\GuandanAndroid.exe</ExecutablePath>
52 <StartupDirectory>
53 </StartupDirectory>
54 <Arguments>
55 </Arguments>
56 <NetAppHost>IIS</NetAppHost>
57 <NetBrowser>InternetExplorer</NetBrowser>
58 <ExcludeSmallFuncs>true</ExcludeSmallFuncs>
59 <JScriptProfilingEnabled>false</JScriptProfilingEnabled>
60 <PreinstrumentEvent>
61 <InstrEventExclude>false</InstrEventExclude>
62 </PreinstrumentEvent>
63 <PostinstrumentEvent>
64 <InstrEventExclude>false</InstrEventExclude>
65 </PostinstrumentEvent>
66 </Binary>
67 </Binaries>
68 <Reports>
69 <Report>
70 <Path>GuandanAndroid190513.vspx</Path>
71 </Report>
72 </Reports>
73 <Launches>
74 <Binary>
75 <Path>..\..\runtime\win32\GuandanAndroid.exe</Path>
76 </Binary>
77 </Launches>
78 </VSPerformanceSession>
...\ No newline at end of file ...\ No newline at end of file
No preview for this file type
1 call xcopy %cd%\res D:\AndroidProject\XhxAndroid_ws\assets\res /E/I/Y 1 xcopy %cd%\res D:\AndroidProject\XhxAndroid_ws\assets\res /E/I/Y
2 call cocos luacompile -s %cd%\src -d D:\AndroidProject\XhxAndroid_ws\assets\src -e -k tpdrawgdanjue -b tpdrawgd 2 cocos luacompile -s %cd%\src -d D:\AndroidProject\XhxAndroid_ws\assets\src -e -k tpdrawgdanjue -b tpdrawgd
3 call xcopy %cd%\src D:\AndroidProject\XhxAndroid_ws\assets\src /E/I/Y 3 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) ...@@ -90,7 +90,8 @@ function MainScene:onCreate(params)
90 90
91 self.nodes[2] = {self.btn_role}; 91 self.nodes[2] = {self.btn_role};
92 92
93 self:updateSelectedState(self.btn_task); 93 --self:updateSelectedState(self.btn_task);
94 self:updateSelectedState(self.btn_ylc); --修改光标为游乐场
94 95
95 local function onNodeEventHandler(event) 96 local function onNodeEventHandler(event)
96 if event == "enter" then 97 if event == "enter" then
......
...@@ -65,8 +65,11 @@ function FriendView:init() ...@@ -65,8 +65,11 @@ function FriendView:init()
65 if self.uid ~= UserModel.user_info.uid then 65 if self.uid ~= UserModel.user_info.uid then
66 local game_score = self.user_home.game_score; 66 local game_score = self.user_home.game_score;
67 67
68 self.btn_back:getChildByName("txt"):setString("回家"); 68 --self.btn_back:getChildByName("txt"):setString("回家");
69 self.btn_back:getChildByName("selected"):getChildByName("txt"):setString("回家"); 69 --self.btn_back:getChildByName("selected"):getChildByName("txt"):setString("回家");
70 self.btn_back:loadTextureNormal("res/ui/friend/bg_friend_back.png");
71 self.btn_back:loadTexturePressed("res/ui/dress/bg_friend_back.png");
72 self.btn_back:getChildByName("selected"):setSpriteFrame(cc.Sprite:create("res/ui/friend/bg_friend_back.png"):getSpriteFrame());
70 73
71 table.sort(game_score,function (aa,bb) 74 table.sort(game_score,function (aa,bb)
72 return aa.val1 > bb.val1; 75 return aa.val1 > bb.val1;
...@@ -322,10 +325,14 @@ function FriendView:onItemOver(ref,event) ...@@ -322,10 +325,14 @@ function FriendView:onItemOver(ref,event)
322 local children = self.scrollView:getChildren(); 325 local children = self.scrollView:getChildren();
323 for i,v in ipairs(children) do 326 for i,v in ipairs(children) do
324 local btn_del = v:getChildByName("btn_del"); 327 local btn_del = v:getChildByName("btn_del");
328 local title_tip=v:getChildByName("tip");
325 if btn_del then 329 if btn_del then
326 btn_del:setVisible(false); 330 btn_del:setVisible(false);
327 table.removebyvalue(self.nodes[#self.nodes],btn_del); 331 table.removebyvalue(self.nodes[#self.nodes],btn_del);
328 end 332 end
333 if title_tip then
334 title_tip:setVisible(false);
335 end
329 if v == item then 336 if v == item then
330 v:setLocalZOrder(1); 337 v:setLocalZOrder(1);
331 else 338 else
...@@ -334,6 +341,7 @@ function FriendView:onItemOver(ref,event) ...@@ -334,6 +341,7 @@ function FriendView:onItemOver(ref,event)
334 end 341 end
335 342
336 local btn_del = item:getChildByName("btn_del"); 343 local btn_del = item:getChildByName("btn_del");
344 local title_tip=item:getChildByName("tip");
337 btn_del.uid = ref.uid; 345 btn_del.uid = ref.uid;
338 if btn_del then 346 if btn_del then
339 btn_del:setVisible(true); 347 btn_del:setVisible(true);
...@@ -345,6 +353,9 @@ function FriendView:onItemOver(ref,event) ...@@ -345,6 +353,9 @@ function FriendView:onItemOver(ref,event)
345 self:updatePage(); 353 self:updatePage();
346 end 354 end
347 end 355 end
356 if title_tip then
357 title_tip:setVisible(true);
358 end
348 end 359 end
349 360
350 function FriendView:onFriendItemOut() 361 function FriendView:onFriendItemOut()
...@@ -355,6 +366,10 @@ function FriendView:onFriendItemOut() ...@@ -355,6 +366,10 @@ function FriendView:onFriendItemOut()
355 btn_del:setVisible(false); 366 btn_del:setVisible(false);
356 table.removebyvalue(self.nodes[#self.nodes],btn_del); 367 table.removebyvalue(self.nodes[#self.nodes],btn_del);
357 end 368 end
369 local title_tip=v:getChildByName("tip");
370 if title_tip then
371 title_tip:setVisible(false);
372 end
358 end 373 end
359 end 374 end
360 375
......
...@@ -19,4 +19,7 @@ Global ...@@ -19,4 +19,7 @@ Global
19 GlobalSection(SolutionProperties) = preSolution 19 GlobalSection(SolutionProperties) = preSolution
20 HideSolutionNode = FALSE 20 HideSolutionNode = FALSE
21 EndGlobalSection 21 EndGlobalSection
22 GlobalSection(Performance) = preSolution
23 HasPerformanceSessions = true
24 EndGlobalSection
22 EndGlobal 25 EndGlobal
......
...@@ -19,24 +19,24 @@ ...@@ -19,24 +19,24 @@
19 <EndColor A="255" R="255" G="255" B="255" /> 19 <EndColor A="255" R="255" G="255" B="255" />
20 <ColorVector ScaleY="1.0000" /> 20 <ColorVector ScaleY="1.0000" />
21 </AbstractNodeData> 21 </AbstractNodeData>
22 <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"> 22 <AbstractNodeData Name="bg_login" ActionTag="1058243631" Tag="24" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
23 <Size X="1280.0000" Y="720.0000" /> 23 <Size X="1280.0000" Y="720.0000" />
24 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 24 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
25 <Position X="640.0000" Y="360.0000" /> 25 <Position X="640.0000" Y="360.0000" />
26 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 26 <Scale ScaleX="1.0000" ScaleY="1.0000" />
27 <CColor A="255" R="255" G="255" B="255" /> 27 <CColor A="255" R="255" G="255" B="255" />
28 <PrePosition X="0.5000" Y="0.5000" /> 28 <PrePosition X="0.5000" Y="0.5000" />
29 <PreSize X="0.0359" Y="0.0639" /> 29 <PreSize X="1.0000" Y="1.0000" />
30 <FileData Type="Normal" Path="bg/bg_loading.jpg" Plist="" /> 30 <FileData Type="Normal" Path="bg/bg_loading.jpg" Plist="" />
31 <BlendFunc Src="770" Dst="771" /> 31 <BlendFunc Src="770" Dst="771" />
32 </AbstractNodeData> 32 </AbstractNodeData>
33 <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"> 33 <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">
34 <Size X="1280.0000" Y="720.0000" /> 34 <Size X="1280.0000" Y="720.0000" />
35 <Children> 35 <Children>
36 <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"> 36 <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">
37 <Size X="321.0000" Y="126.0000" /> 37 <Size X="321.0000" Y="126.0000" />
38 <Children> 38 <Children>
39 <AbstractNodeData Name="selected" ActionTag="-1190160652" Tag="983" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData"> 39 <AbstractNodeData Name="selected" Visible="False" ActionTag="-1190160652" Tag="983" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
40 <Size X="321.0000" Y="126.0000" /> 40 <Size X="321.0000" Y="126.0000" />
41 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 41 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
42 <Position X="160.5000" Y="63.0000" /> 42 <Position X="160.5000" Y="63.0000" />
...@@ -49,10 +49,10 @@ ...@@ -49,10 +49,10 @@
49 </AbstractNodeData> 49 </AbstractNodeData>
50 </Children> 50 </Children>
51 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 51 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
52 <Position X="451.0952" Y="226.6756" /> 52 <Position X="451.0955" Y="91.6782" />
53 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 53 <Scale ScaleX="1.0000" ScaleY="1.0000" />
54 <CColor A="255" R="255" G="255" B="255" /> 54 <CColor A="255" R="255" G="255" B="255" />
55 <PrePosition X="0.3524" Y="0.3148" /> 55 <PrePosition X="0.3524" Y="0.1273" />
56 <PreSize X="0.2508" Y="0.1750" /> 56 <PreSize X="0.2508" Y="0.1750" />
57 <FontResource Type="Normal" Path="ui/font/yuanti.ttf" Plist="" /> 57 <FontResource Type="Normal" Path="ui/font/yuanti.ttf" Plist="" />
58 <TextColor A="255" R="96" G="41" B="0" /> 58 <TextColor A="255" R="96" G="41" B="0" />
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
62 <OutlineColor A="255" R="255" G="0" B="0" /> 62 <OutlineColor A="255" R="255" G="0" B="0" />
63 <ShadowColor A="255" R="110" G="110" B="110" /> 63 <ShadowColor A="255" R="110" G="110" B="110" />
64 </AbstractNodeData> 64 </AbstractNodeData>
65 <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"> 65 <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">
66 <Size X="321.0000" Y="126.0000" /> 66 <Size X="321.0000" Y="126.0000" />
67 <Children> 67 <Children>
68 <AbstractNodeData Name="selected" Visible="False" ActionTag="1750464100" Tag="984" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData"> 68 <AbstractNodeData Name="selected" Visible="False" ActionTag="1750464100" Tag="984" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
...@@ -78,10 +78,10 @@ ...@@ -78,10 +78,10 @@
78 </AbstractNodeData> 78 </AbstractNodeData>
79 </Children> 79 </Children>
80 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 80 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
81 <Position X="839.7761" Y="226.6765" /> 81 <Position X="840.8325" Y="91.8690" />
82 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 82 <Scale ScaleX="1.0000" ScaleY="1.0000" />
83 <CColor A="255" R="255" G="255" B="255" /> 83 <CColor A="255" R="255" G="255" B="255" />
84 <PrePosition X="0.6561" Y="0.3148" /> 84 <PrePosition X="0.6569" Y="0.1276" />
85 <PreSize X="0.2508" Y="0.1750" /> 85 <PreSize X="0.2508" Y="0.1750" />
86 <FontResource Type="Normal" Path="ui/font/yuanti.ttf" Plist="" /> 86 <FontResource Type="Normal" Path="ui/font/yuanti.ttf" Plist="" />
87 <TextColor A="255" R="96" G="41" B="0" /> 87 <TextColor A="255" R="96" G="41" B="0" />
......
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
2 <Properties> 2 <Properties>
3 <Item Key="GuidesList"> 3 <Item Key="GuidesList">
4 <Value ctype="GuidesData"> 4 <Value ctype="GuidesData">
5 <HorizontalList>
6 <Guides Direction="Horizontal" Position="154.8665" />
7 </HorizontalList>
5 <VerticalList> 8 <VerticalList>
6 <Guides Position="639.5614" /> 9 <Guides Position="639.5614" />
7 </VerticalList> 10 </VerticalList>
......
1 <UserData Version="3.10.0.0"> 1 <UserData Version="3.10.0.0">
2 <Properties> 2 <Properties>
3 <Item Key="GuidesList"> 3 <Item Key="GuidesList">
4 <Value ctype="GuidesData" /> 4 <Value ctype="GuidesData">
5 <VerticalList>
6 <Guides Position="80.4615" />
7 </VerticalList>
8 </Value>
5 </Item> 9 </Item>
6 </Properties> 10 </Properties>
7 </UserData> 11 </UserData>
...\ No newline at end of file ...\ No newline at end of file
......
1 <UserData Version="3.10.0.0"> 1 <UserData Version="3.10.0.0">
2 <Properties> 2 <Properties>
3 <Item Key="GuidesList"> 3 <Item Key="GuidesList">
4 <Value ctype="GuidesData" /> 4 <Value ctype="GuidesData">
5 <VerticalList>
6 <Guides Position="1073.0090" />
7 </VerticalList>
8 </Value>
5 </Item> 9 </Item>
6 </Properties> 10 </Properties>
7 </UserData> 11 </UserData>
...\ No newline at end of file ...\ 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 @@ ...@@ -669,9 +669,13 @@
669 </Folder> 669 </Folder>
670 <Folder Name="friend"> 670 <Folder Name="friend">
671 <Image Name="bg_friend.png" /> 671 <Image Name="bg_friend.png" />
672 <Image Name="bg_friend_add.png" />
673 <Image Name="bg_friend_back.png" />
674 <Image Name="bg_friend_exit.png" />
672 <Image Name="bg_friend_item.png" /> 675 <Image Name="bg_friend_item.png" />
673 <Image Name="bg_friend_item_s.png" /> 676 <Image Name="bg_friend_item_s.png" />
674 <Image Name="bg_friend_lv.png" /> 677 <Image Name="bg_friend_lv.png" />
678 <Image Name="bg_friend_tip_title.png" />
675 <Image Name="btn_add_1.png" /> 679 <Image Name="btn_add_1.png" />
676 <Image Name="btn_add_2.png" /> 680 <Image Name="btn_add_2.png" />
677 <Image Name="btn_back_1.png" /> 681 <Image Name="btn_back_1.png" />
......
...@@ -28,5 +28,15 @@ ...@@ -28,5 +28,15 @@
28 <LastRunType Value="Windows" /> 28 <LastRunType Value="Windows" />
29 </Value> 29 </Value>
30 </Item> 30 </Item>
31 <Item Key="TabsParamsKey">
32 <Value ctype="TabsInfo">
33 <OpenedDocuments>
34 <FilePathData Path="ui/friend/FriendLayer.csd" />
35 <FilePathData Path="ui/friend/FriendItemLayer.csd" />
36 <FilePathData Path="ui/MainScene.csd" />
37 </OpenedDocuments>
38 <ActiveDocument Path="ui/MainScene.csd" />
39 </Value>
40 </Item>
31 </Properties> 41 </Properties>
32 </UserData> 42 </UserData>
...\ No newline at end of file ...\ No newline at end of file
......