Skip to content

M
mycard
Commit 19072876 authored by 神楽坂玲奈's avatar 神楽坂玲奈
Browse files
Options

show/hide chat

parent d8285372
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 230 additions and 92 deletions
app/apps.json
View file @ 19072876
......@@ -17,6 +17,7 @@
"languages": ["ja-JP"],
"mods": [
{
"id":"lang_zh_cn",
"override_main": "th135c.exe",
"type": "language",
"languages": ["zh-CN"],
......@@ -36,7 +37,7 @@
"protocol": "udp",
"port": 10800
},
"summary": "",
"summary": "诶嘿★~",
"download": {
"url": "http://test2.my-card.in/downloads/maotama/th123_1.10a.7z",
"size": 250272482,
......@@ -46,6 +47,7 @@
"languages": ["ja-JP"],
"mods": [
{
"id": "lang_zh_cn",
"type": "language",
"languages": ["zh-CN"],
"override_main": "th123_beta.exe",
......@@ -81,6 +83,7 @@
"languages": ["ja-JP"],
"mods": [
{
"id": "lang_zh_cn",
"type": "language",
"languages": ["zh-CN"],
"download": {
......
app/candy/candy.fix.js
View file @ 19072876
......@@ -143,29 +143,6 @@
}
})(Candy.View.Pane, jQuery);
(function (self, $) {
//修正同一个用户不同resource对话
self.Message = function(event, args) {
if (args.message.type === "subject") {
if (!Candy.View.Pane.Chat.rooms[args.roomJid]) {
Candy.View.Pane.Room.init(args.roomJid, args.message.name);
Candy.View.Pane.Room.show(args.roomJid);
}
Candy.View.Pane.Room.setSubject(args.roomJid, args.message.body);
} else if (args.message.type === "info") {
Candy.View.Pane.Chat.infoMessage(args.roomJid, args.message.body);
} else {
// Initialize room if it's a message for a new private user chat
if (args.message.type === "chat" && !Candy.View.Pane.Chat.rooms[args.roomJid]) {
args.roomJid = Strophe.getBareJidFromJid(args.roomJid);
Candy.View.Pane.PrivateRoom.open(args.roomJid, args.message.name, false, args.message.isNoConferenceRoomJid);
}
Candy.View.Pane.Message.show(args.roomJid, args.message.name, args.message.body, args.timestamp);
}
};
})(Candy.View.Observer, jQuery);
(function (self, Strophe, $) {
//将candy:core.chat.connection的触发提前，用于在获取vcard之前获取roster
self.Strophe.Connect = function(status) {
......
app/css/app.css
View file @ 19072876
......@@ -6,26 +6,68 @@ body,
#right_top_wrapper {
height: 100%;
}
#right_top_wrapper {
#candy {
height: 0;
width: 100%;
border: none;
display: block;
}
.show_candy #wrapper {
padding-bottom: 207px;
}
#candy {
.show_candy #candy {
margin-top: -207px;
height: 207px;
}
.main_wrapper {
#candy_wrapper {
position: relative;
}
.show_candy #hide_candy {
position: absolute;
color: #d3d3d3;
right: 0;
top: 0;
display: block;
}
#hide_candy {
display: none;
}
.show_roster .main_wrapper {
padding-right: 200px;
}
#roster_wrapper {
padding-bottom: 30px;
}
#show_candy_wrapper {
background: #444;
height: 30px;
display: block;
}
.show_candy #show_candy_wrapper {
display: none;
}
#show_candy {
color: #d3d3d3;
float: right;
}
.main {
height: 100%;
overflow-y: auto;
}
#roster_aside {
margin-left: -200px;
float: right;
width: 200px;
width: 0;
height: 100%;
/*border: 1px solid #dddddd;*/
float: right;
margin-left: -200px;
border-right: none;
padding-bottom: 64px;
display: none;
}
.show_roster #roster_aside {
width: 200px;
display: block;
}
.show_candy #roster_aside {
padding-bottom: 34px;
}
body {
......@@ -47,12 +89,24 @@ h5,
h6,
iframe,
.bootstrap-switch,
.main {
.main,
#user_info,
#user_info * {
-webkit-app-region: no-drag;
}
#user_info {
position: relative;
}
#avatar {
max-height: 34px;
margin: -7px 8px -7px 0;
position: absolute;
right: 20px;
top: 8px;
}
#notification {
position: absolute;
right: 15px;
top: 4px;
}
#username {
margin: 0 5px 0 5px;
......@@ -107,19 +161,13 @@ iframe,
.achievement.locked {
-webkit-filter: grayscale(100%);
}
#candy {
height: 207px;
width: 100%;
border: none;
display: block;
}
#roster_aside {
float: right;
width: 200px;
height: 100%;
/*border: 1px solid #dddddd;*/
border-right: none;
padding-bottom: 34px;
padding-bottom: 64px;
}
#roster_aside ul {
background: #fff;
......
app/css/app.styl
View file @ 19072876
//布局
html, body, .wrapper, .sidebar, #right_wrapper, #right_top_wrapper
height 100%
#right_top_wrapper
padding-bottom 207px
//聊天室
#candy
height: 0;
width: 100%;
border: none;
display: block;
.show_candy #wrapper
padding-bottom 207px
.show_candy #candy
margin-top -207px
.main_wrapper
height: 207px
#candy_wrapper
position relative
.show_candy #hide_candy
position: absolute
color: lightgray;
right: 0;
top: 0;
display block
#hide_candy
display none
.show_roster .main_wrapper
padding-right 200px
#roster_wrapper
padding-bottom: 30px;
#show_candy_wrapper
background: #444;
height: 30px;
display block
.show_candy #show_candy_wrapper
display none
#show_candy
color: lightgrey
float: right;
.main
height 100%
overflow-y auto
#roster_aside
margin-left -200px
float: right;
width: 200px;
width: 0
height: 100%;
/*border: 1px solid #dddddd;*/
float: right;
margin-left -200px
border-right: none;
padding-bottom: 64px;
display none
.show_roster #roster_aside
width: 200px;
display block
.show_candy #roster_aside
padding-bottom: 34px;
body
......@@ -26,13 +59,23 @@ body
//拖动
body
-webkit-app-region drag
a, button, input, span, p, li, td, th, h1, h2, h3, h4, h5, h6, iframe, .bootstrap-switch, .main
a, button, input, span, p, li, td, th, h1, h2, h3, h4, h5, h6, iframe, .bootstrap-switch, .main, #user_info, #user_info *
-webkit-app-region no-drag
//导航栏
#user_info
position relative
#avatar
max-height 34px
margin: -7px 8px -7px 0
position: absolute;
right: 20px;
top: 8px;
#notification
position: absolute;
right: 15px;
top: 4px;
#username
margin 0 5px 0 5px
......@@ -89,13 +132,7 @@ a, button, input, span, p, li, td, th, h1, h2, h3, h4, h5, h6, iframe, .bootstra
.achievement.locked
-webkit-filter:grayscale(100%)
//聊天室
#candy {
height: 207px;
width: 100%;
border: none;
display: block;
}
//好友列表
#roster_aside {
......@@ -104,7 +141,7 @@ a, button, input, span, p, li, td, th, h1, h2, h3, h4, h5, h6, iframe, .bootstra
height: 100%;
/*border: 1px solid #dddddd;*/
border-right: none;
padding-bottom: 34px;
padding-bottom: 64px;
}
#roster_aside ul {
......
app/index.html
View file @ 19072876
......@@ -20,7 +20,7 @@
<link href="css/app.css" rel="stylesheet">
</head>
<body>
<body class="show_candy show_roster">
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
......@@ -45,17 +45,10 @@
<li class="active"><a href="javascript:;">登录</a></li>
<li><a href="https://moeid.my-card.in/users/sign_up?app=moeid" target="_blank">注册</a></li>
</ul>
<ul class="nav navbar-nav navbar-right" ng-if="current_user">
<li class="dropdown">
<a id="username" href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
<img id="avatar" src="https://lh6.googleusercontent.com/-eRxRGjDvkvY/AAAAAAAAAAI/AAAAAAAAeGg/HetZCuangp8/s46-c-k-no/photo.jpg">
{{current_user.name}} <b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="javascript:;" ng-click="sign_out()" ng-controller="UserController">退出登录</a></li>
</ul>
</li>
</ul>
<div id="user_info" class="nav navbar-nav navbar-right" ng-if="current_user">
<img id="avatar" src="https://lh6.googleusercontent.com/-eRxRGjDvkvY/AAAAAAAAAAI/AAAAAAAAeGg/HetZCuangp8/s46-c-k-no/photo.jpg">
<!--<span id="notification" class="label label-danger">9</span>-->
</div>
<div class="navbar-form navbar-right" ng-if="!current_user">
<a href="https://moeid.my-card.in/users/sign_up?app=moeid" target="_blank" type="button" class="btn btn-success">注册</a>
</div>
......@@ -80,7 +73,7 @@
</li>
</ul>
</div>
<div id="right_wrapper" class="col-md-10" ng-controller="UserController">
<div id="right_wrapper" class="col-md-10">
<div id="right_top_wrapper" class="row">
<div class="main_wrapper">
<div class="main" ng-view></div>
......@@ -100,13 +93,24 @@
</div>
<ul id="roster" class="list-unstyled"></ul>
<ul id="roster_search_result" class="list-unstyled" hidden></ul>
<div id="show_candy_wrapper">
<button type="button" class="btn btn-link btn-sm" id="show_candy">
<span class="glyphicon glyphicon-chevron-up"></span>
</button>
</div>
</div>
</div>
<div class="row">
<iframe id="candy" ng-src="{{candy_url()}}" nwdisable></iframe>
</div>
</div>
</div>
<div id="candy_wrapper">
<!--font-size: 12px;
line-height: 1.5;-->
<button type="button" class="btn btn-link btn-sm" id="hide_candy">
<span class="glyphicon glyphicon-chevron-down"></span>
</button>
<iframe id="candy" ng-src="{{candy_url()}}" nwdisable ng-controller="UserController"></iframe>
</div>
<div class="wrapper" id="signin" ng-show="!current_user" ng-controller="UserController">
<div class="container">
......
app/js/controllers.coffee
View file @ 19072876
......@@ -247,6 +247,7 @@ angular.module('maotama.controllers', [])
alert '登录失败'
$scope.sign_out = ()->
$rootScope.current_user = null
$scope.$apply()
db.user.remove {}, (err)->
throw err if err
......
app/js/controllers.js
View file @ 19072876
......@@ -378,6 +378,7 @@
};
$scope.sign_out = function() {
$rootScope.current_user = null;
$scope.$apply();
return db.user.remove({}, function(err) {
if (err) {
throw err;
......
app/js/controllers.map
View file @ 19072876
This diff is collapsed.
app/js/maotama.coffee
View file @ 19072876
......@@ -6,6 +6,22 @@ gui = require 'nw.gui'
win = gui.Window.get();
win.showDevTools() if "--dev" in gui.App.argv
menu = new gui.Menu();
menu.append new gui.MenuItem
label: '更换用户'
click: ()->
angular.element("#signin").scope().sign_out()
menu.append new gui.MenuItem
label: '退出'
click: ()->
win.close()
window.tray = new gui.Tray
title: '毛玉'
tooltip: "test"
icon: 'app/img/logo.jpg'
menu: menu
$('#window_control_minimize').click ->
win.minimize()
$('#window_control_maximize').click ->
......@@ -24,6 +40,15 @@ win.on 'unmaximize', ->
$('.switch').bootstrapSwitch();
$('#cloud_popover').popover()
$('#hide_candy').click ->
$('body').removeClass('show_candy')
$('#show_candy').click ->
$('body').addClass('show_candy')
$('body').on 'click', '#user_info', ->
$('body').toggleClass('show_roster')
$('.main_wrapper').on 'click', '#cloud_address', ->
$('#cloud_address').select();
$('.main_wrapper').on 'click','#app_add', ->
......@@ -38,6 +63,9 @@ $('.main_wrapper').on 'click','#app_add', ->
win.on 'new-win-policy', (frame, url, policy)->
gui.Shell.openExternal( url );
policy.ignore()
#用户
pre_load_photo = (jid, name, domain)->
switch domain
......
app/js/maotama.js
View file @ 19072876
// Generated by CoffeeScript 1.7.1
(function() {
var crypto, gui, path, pre_load_photo, win,
var crypto, gui, menu, path, pre_load_photo, win,
__indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
path = require('path');
......@@ -15,6 +15,29 @@
win.showDevTools();
}
menu = new gui.Menu();
menu.append(new gui.MenuItem({
label: '更换用户',
click: function() {
return angular.element("#signin").scope().sign_out();
}
}));
menu.append(new gui.MenuItem({
label: '退出',
click: function() {
return win.close();
}
}));
window.tray = new gui.Tray({
title: '毛玉',
tooltip: "test",
icon: 'app/img/logo.jpg',
menu: menu
});
$('#window_control_minimize').click(function() {
return win.minimize();
});
......@@ -45,6 +68,18 @@
$('#cloud_popover').popover();
$('#hide_candy').click(function() {
return $('body').removeClass('show_candy');
});
$('#show_candy').click(function() {
return $('body').addClass('show_candy');
});
$('body').on('click', '#user_info', function() {
return $('body').toggleClass('show_roster');
});
$('.main_wrapper').on('click', '#cloud_address', function() {
return $('#cloud_address').select();
});
......
app/js/maotama.map
View file @ 19072876
This diff is collapsed.
使用说明.txt
View file @ 19072876
★不要安装到中文目录、带特殊字符的目录
正确的示例： E:\maotama\
错误的示例： E:\【平台】【不要解压到中文路径！】【内测】毛玉 v0.0.1\
内测公车号： 毛玉测试 123456
用公车号的会因为聊天室互相挤而经常显示聊天断开，那个无所谓不影响游戏
也可以去注册一个，验证码是给我的另一个游戏王的坑写的，不认识的话鼠标指一下，只有正确的会变成手型
现在还在早期开发阶段，里面绝大部分功能都是不能用的，仅仅能拿来联FXTZ/楼了就发出来了
不要看什么功能都乱点，只进行下面的操作：
★不要安装到中文目录、带特殊字符的目录
正确的示例： E:\maotama\
错误的示例： E:\【平台】【不要解压到中文路径！】【内测】毛玉 v0.0.1\
从左边游戏列表里 选择 东方非想天则 或 东方心绮楼
点【添加】按钮，选择则/楼的主程序
点【开始】按钮 (或者从其他地方手动开启则/楼也可以，不一定非得从平台打开)，在10800端口建立主机
点【反重力场】按钮，之后会得到一个IP地址和端口，把那个发送给你的对手 (★对手不需要有平台)
现在还在早期开发阶段，里面绝大部分功能都是不能用的，仅仅能拿来联FXTZ/楼了就发出来了
不要看什么功能都乱点，只进行下面的操作： (★尤其是不要点卸载把游戏删了然后来找我吐槽)
★通过反重力场建立的游戏无视电信/联通，不用特意找同一个网络运营商的连
加速原理跟放学对战平台一样，服务器也都是用的阿里云杭州，所以用那个效果不好的这个同样也会不好。
(而且这个聊天功能也不还能用简直弱爆了啊哈哈哈)
从左边游戏列表里 选择 东方非想天则 或 东方心绮楼
点【添加】按钮，选择则/楼的主程序
点【开始】按钮 (或者从其他地方手动开启则/楼也可以，不一定非得从平台打开)，在10800端口建立主机
点【反重力场】按钮，之后会得到一个IP地址和端口，把那个发送给你的对手 (★对手不需要有平台)
★ 另外，现在这个版本只是早期技术测试，可能随时会停止服务
如果延迟较大，可以尝试更换服务器，选择离双方位置较近的
★ 发现任何问题或建议请联系 zh99998@gmail.com
\ No newline at end of file
★通过反重力场建立的游戏无视电信/联通，不用特意找同一个网络运营商的连
★ 另外，现在这个版本只是早期技术测试，可能随时会停止服务
★ 发现任何问题或建议请联系 zh99998@gmail.com
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment