Commit Graph

2590 Commits (df8f8d6dd0fea0507809105f5dc05bf79b24c94f)
 

Author SHA1 Message Date
ZhangBiao 6149e88620 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 17:04:28 +08:00
ZhangBiao c2612e2ca8 【社稷大典】捐献后 左上角 按钮状态切换修复 2020-10-26 17:04:07 +08:00
JieLing 0b8abaeabf Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 16:51:53 +08:00
jiaoyangna d8f5a48811 【累计充值】提示修改 2020-10-26 16:51:47 +08:00
ZhangBiao a9e8cad755 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 16:50:03 +08:00
ZhangBiao 5a20d41b77 【社稷大典】左上公会排行空白修改 2020-10-26 16:49:47 +08:00
JieLing a33ac4576f 添加一个特效打包路径 2020-10-26 16:45:43 +08:00
ZhangBiao 0340b7d468 【社稷大典】打开社稷大典界面 时被提出公会 检测 2020-10-26 16:37:56 +08:00
ZhangBiao b2c841e572 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 16:11:11 +08:00
ZhangBiao 709dc1a5bd 【社稷大典】时间弹跳修复,物品边框颜色修改 2020-10-26 16:10:58 +08:00
liujiaqi e80c0f8e0d 【社稷大典】商店标题资源替换 2020-10-26 16:06:55 +08:00
JieLing 21f0e6abfb 【逍遥游】动画资源引用错误 2020-10-26 15:46:24 +08:00
JieLing 0b2a309b60 【逍遥游】删除旧骰子资源 2020-10-26 15:39:49 +08:00
gaoxin 76dadc8077 【逍遥游】合并后资源缺失 2020-10-26 15:30:24 +08:00
yuanshuai 0fee60ea37 【逍遥游】骰子动画修改 2020-10-26 15:19:33 +08:00
gaoxin 71dc347456 【逍遥游】删除旧骰子动画,修复新动画缺失的问题 2020-10-26 15:18:32 +08:00
gaoxin c2db80b5bf 【逍遥游】骰子资源提交 2020-10-26 15:15:56 +08:00
jiaoyangna 942849cdcf Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 15:06:24 +08:00
jiaoyangna ce5db82250 乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改 2020-10-26 15:05:59 +08:00
zhangqiang 0a5816a4ec 线上问题工会技能战力修改 2020-10-26 14:47:14 +08:00
zhangqiang b6f48c4910 线上战力 属性取整问题 2020-10-26 14:46:43 +08:00
jiaoyangna 0ba1161933 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-08-25 13:34:25 +08:00
ZhangBiao d30209f844 【社稷大典】捐献品价值修改 2020-10-26 12:35:29 +08:00
ZhangBiao 0d0b849435 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 12:28:08 +08:00
ZhangBiao 469235ff74 【社稷大典】捐献品3 点击加号跳转 2020-10-26 12:27:56 +08:00
ZhangBiao e6610518ce 【社稷大典】长按贡献数量不够无法捐赠bug修复 2020-10-26 12:23:04 +08:00
ZhangBiao 6407abc8c9 【社稷大典】提交8 漏题补 2020-10-26 11:53:53 +08:00
gaoxin c12c63bdaf 【language表】修复战斗中会出现错误文字 “抢夺成功,获得%s积分!” 的问题 2020-10-26 11:21:40 +08:00
JieLing ab0c5a4867 报错提交 2020-10-26 11:19:10 +08:00
jiaoyangna ebb2748b5c Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-29 11:04:20 +08:00
jiaoyangna 9e7cd31376 逍遥游云游宝玉修改提交 2020-10-29 11:03:13 +08:00
jiaoyangna 68af385814 冲突提交 2020-10-29 10:29:14 +08:00
jiaoyangna 6d79dcab9a 活动修改提交 2020-10-29 09:50:47 +08:00
JieLing 43a370f5a8 报错提交 2020-10-26 10:56:46 +08:00
jiaoyangna 9763762e88 回滚提交 2020-10-24 19:31:41 +08:00
jiaoyangna 565ed0cc34 累计充值修改提交 2020-10-24 19:26:43 +08:00
jiaoyangna 0f5faff70f 累计充值修改提交 2020-10-24 19:26:37 +08:00
jiaoyangna 37ae683bf1 主题活动修改 2020-10-24 19:26:30 +08:00
jiaoyangna 2d7197298e 累计充值修改 2020-10-24 19:26:23 +08:00
jiaoyangna 43702ee6ca 累计充值修改 2020-10-24 19:25:52 +08:00
jiaoyangna 8db39458ca [累计充值修改提交] 2020-10-24 19:25:08 +08:00
jiaoyangna 0901d837be 限时召唤修改提交 2020-10-24 19:23:16 +08:00
jiaoyangna 9e8d773040 无效的红点检测 2020-10-24 19:22:29 +08:00
jiaoyangna c134dabe49 [累计充值]提交 2020-10-24 19:19:03 +08:00
jiaoyangna a9634c226f yongwangzhiqian commit 2020-10-24 19:12:28 +08:00
ZhangBiao 966e6ccdd1 【异妖】屏蔽 2020-10-24 19:08:02 +08:00
ZhangBiao 2a0d59849c 【设计大典】提交7 2020-10-24 19:02:06 +08:00
ZhangBiao 0bf6e05add 【社稷大典】提交6 2020-10-24 18:58:07 +08:00
ZhangBiao 01cbb3fba0 【社稷大典】提交5 2020-10-24 18:49:32 +08:00
ZhangBiao a2a870f421 【社稷大典】提交4 2020-10-24 18:41:21 +08:00