zhangqiang
|
939e9b3c77
|
shi pei
|
2020-09-02 15:54:28 +08:00 |
gaoxin
|
1f3ba7abf7
|
充值,首充,幸运探宝界面适配修改
|
2020-09-02 14:44:07 +08:00 |
gaoxin
|
8c8697d31d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-02 14:19:20 +08:00 |
gaoxin
|
7563aad66f
|
活动界面适配调整
|
2020-09-02 14:19:10 +08:00 |
zhangqiang
|
aeb70ab707
|
dainfengsai
|
2020-09-02 14:16:06 +08:00 |
zhangqiang
|
1908ce2ee8
|
破阵诛仙
|
2020-09-02 14:07:57 +08:00 |
zhangqiang
|
9d757ba068
|
适配
|
2020-09-02 13:45:14 +08:00 |
ZhangBiao
|
39e9728561
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
|
2020-09-02 13:36:17 +08:00 |
jiaoyangna
|
8b60b15dd6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-09 10:31:07 +08:00 |
jiaoyangna
|
8d11549d86
|
大闹天宫红点修改
|
2020-09-09 10:30:39 +08:00 |
jiaoyangna
|
730c2719a5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-09 10:11:52 +08:00 |
jiaoyangna
|
8d19f5c583
|
prefab commit
|
2020-09-09 10:11:47 +08:00 |
ZhangBiao
|
e3e95e2379
|
森罗 无尽 流程优化和界面调整
|
2020-09-02 13:35:29 +08:00 |
gaoxin
|
13ab0dc54f
|
小弹窗界面屏幕适配修改
|
2020-09-02 10:29:55 +08:00 |
zhangqiang
|
e845bc5fe1
|
车迟 十绝阵 英雄详情 适配
|
2020-09-02 09:49:17 +08:00 |
zhangqiang
|
e5dd48c072
|
shipei
|
2020-09-01 19:53:59 +08:00 |
jiaoyangna
|
933aadbf65
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 18:36:18 +08:00 |
jiaoyangna
|
00b75cc097
|
prefab commit
|
2020-09-01 18:36:14 +08:00 |
zhangqiang
|
f68a1b868a
|
四元阵 抽卡 兽潮主
|
2020-09-01 17:35:10 +08:00 |
gaoxin
|
68f9b89773
|
loadingpanel界面适配调整
|
2020-09-01 17:13:30 +08:00 |
gaoxin
|
97eaf77009
|
主界面底部界面经验条显示调整
|
2020-09-01 17:12:00 +08:00 |
gaoxin
|
eeecbca77a
|
部分界面适配调整
|
2020-09-01 16:56:45 +08:00 |
zhangqiang
|
c4bc262356
|
图鉴 编队 开服
|
2020-09-01 16:54:07 +08:00 |
gaoxin
|
ad887c2b7f
|
添加全屏显示的ui父节点,并将所有弹窗都放入该节点
|
2020-09-01 16:10:36 +08:00 |
ZhangBiao
|
4dbbdbd54b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 14:53:42 +08:00 |
ZhangBiao
|
822f4a2294
|
森罗界面适配
|
2020-09-01 14:53:12 +08:00 |
gaoxin
|
c6bdebeffb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
|
2020-09-01 14:38:29 +08:00 |
gaoxin
|
ae349123df
|
部分界面屏幕适配调整
|
2020-09-01 14:38:02 +08:00 |
zhangqiang
|
aabef68ccb
|
气泡提交
|
2020-09-01 11:50:24 +08:00 |
ZhangBiao
|
e74c120d01
|
大闹天宫重置红点、无尽副本界面红点
|
2020-09-01 11:25:38 +08:00 |
zhangqiang
|
a6fa4453e6
|
需求主城或关卡停留过长添加聊天气泡
|
2020-08-31 20:52:50 +08:00 |
zhangqiang
|
70a17dc502
|
法宝添加红点提示
|
2020-08-31 19:47:57 +08:00 |
zhangqiang
|
40610b0c19
|
献祭修改
|
2020-08-31 18:19:38 +08:00 |
ZhangBiao
|
50dd63cd06
|
小游戏18按钮大小调整,前往下一层文字大小修改、
|
2020-08-31 16:06:57 +08:00 |
ZhangBiao
|
b5ac787e16
|
数独小游戏15 1:2屏幕适配错误修复
购买回春散数量不增加修改
|
2020-08-31 15:45:16 +08:00 |
jiaoyangna
|
9fd56a684d
|
去除宝箱黑色框
|
2020-08-31 10:40:23 +08:00 |
gaoxin
|
fc9a5341f0
|
屏幕适配方式改为按高度适配,修复点击特效位置错误的问题
|
2020-08-29 17:22:46 +08:00 |
jiaoyangna
|
628039ab92
|
prefab commit
|
2020-08-29 16:35:20 +08:00 |
jiaoyangna
|
638022dbad
|
【五星成长礼】拍脸图中间“战”字有阴影
|
2020-08-29 15:17:48 +08:00 |
jiaoyangna
|
dd1493ee90
|
【碎片显示】确认购买和碎片合成时,不显示碎片道具的属性和碎片边框
|
2020-08-29 15:14:09 +08:00 |
ZhangBiao
|
01fc7cae51
|
森罗幻境奖励红点
|
2020-08-28 13:48:09 +08:00 |
gaoxin
|
c933276cea
|
试炼增益添加滑动效果
|
2020-08-28 00:24:06 +08:00 |
gaoxin
|
82606d8fbe
|
每日周月礼包根据后端数据判断显隐
|
2020-08-27 18:35:32 +08:00 |
ZhangBiao
|
82ec03a605
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 18:16:02 +08:00 |
ZhangBiao
|
021a7dc5a7
|
森罗换层卡死问题修复
|
2020-08-27 18:15:53 +08:00 |
gaoxin
|
1ce0e4b15c
|
战斗怒气文字修改
|
2020-08-27 17:26:55 +08:00 |
jiaoyangna
|
09f27f8d3d
|
des update
|
2020-08-27 16:16:08 +08:00 |
jiaoyangna
|
104311a51a
|
prefab commit
|
2020-08-27 16:07:03 +08:00 |
jiaoyangna
|
ca618e9f33
|
add xuanyuan des
|
2020-08-27 16:05:46 +08:00 |
jiaoyangna
|
19465ac1b2
|
【宝物】共鸣界面等级上限显示不正确
|
2020-08-27 12:01:01 +08:00 |
zhangqiang
|
c315cf768d
|
竞技场排行
|
2020-08-27 10:52:35 +08:00 |
zhangqiang
|
012a01ec20
|
移动主界面虚化坛位置
|
2020-08-26 21:27:58 +08:00 |
zhangqiang
|
812450c032
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 20:56:48 +08:00 |
zhangqiang
|
6dec0b0307
|
修改公会技能升级 更新英雄战力
|
2020-08-26 20:56:28 +08:00 |
gaoxin
|
4b41b5def9
|
副本界面显示优化
|
2020-08-26 20:20:40 +08:00 |
ZhangBiao
|
134b70ce33
|
成长礼包美元符号位置
|
2020-08-26 19:08:21 +08:00 |
gaoxin
|
093c6d1f41
|
竞技场按钮功能未开启不再显示
|
2020-08-26 18:18:12 +08:00 |
gaoxin
|
46403f1431
|
创建角色界面显示优化
|
2020-08-26 18:17:43 +08:00 |
gaoxin
|
80e2f16169
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 17:58:51 +08:00 |
gaoxin
|
bab4148db6
|
主界面十绝阵,巅峰赛按钮添加
|
2020-08-26 17:58:23 +08:00 |
ZhangBiao
|
8dd4feeead
|
乾坤宝囊特效增加
|
2020-08-26 17:56:59 +08:00 |
zhangqiang
|
1b8f1631b7
|
巅峰战八强替换资源
|
2020-08-26 16:43:07 +08:00 |
jiaoyangna
|
22fa2b0d4c
|
qinglong commit
|
2020-08-26 15:57:06 +08:00 |
gaoxin
|
9ff8dbf943
|
我要变强界面匹配当前版本修改
|
2020-08-26 15:16:17 +08:00 |
JieLing
|
ad7bd17a38
|
修复八日登陆扫光错误的问题
|
2020-08-26 13:53:39 +08:00 |
JieLing
|
c23947edcd
|
艺术字体优化
|
2020-08-26 13:35:33 +08:00 |
gaoxin
|
b0222ccd61
|
艺术字体替换,美元显示优化
|
2020-08-26 12:26:19 +08:00 |
ZhangBiao
|
a86e5b6d4c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 11:19:58 +08:00 |
ZhangBiao
|
cc9c498c7d
|
云梦祈福刷新按钮、乾坤商店白片
|
2020-08-26 11:19:37 +08:00 |
jiaoyangna
|
59204790d2
|
xuanyuan commit
|
2020-08-26 10:58:41 +08:00 |
JieLing
|
b1774c3853
|
累充界面金额转换为美元显示
|
2020-08-25 21:21:34 +08:00 |
JieLing
|
7c786a4573
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 19:26:58 +08:00 |
JieLing
|
b28309e14e
|
资源位置移动
|
2020-08-25 19:26:51 +08:00 |
ZhangBiao
|
d37af43f37
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 18:35:19 +08:00 |
ZhangBiao
|
617cb53270
|
森罗回春散星星、升级礼包调整
|
2020-08-25 18:35:04 +08:00 |
altair
|
ae760879c5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 18:33:38 +08:00 |
altair
|
a8352e16e0
|
修改特效预设
|
2020-08-25 18:33:29 +08:00 |
zhangqiang
|
f223c0c3e1
|
副本修改
|
2020-08-25 18:24:17 +08:00 |
JieLing
|
223234f582
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 18:00:42 +08:00 |
JieLing
|
2eeb381608
|
登陆界面资源替换
|
2020-08-25 17:56:55 +08:00 |
ZhangBiao
|
e6946944b0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 17:31:16 +08:00 |
ZhangBiao
|
58aa9c2dce
|
每日豪礼 显示升级礼包 资源修改
|
2020-08-25 17:29:03 +08:00 |
JieLing
|
8e9e944279
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2020-08-25 16:18:27 +08:00 |
ZhangBiao
|
c6293a0566
|
月卡资源替换
|
2020-08-25 16:09:59 +08:00 |
jiaoyangna
|
9aceba1aa2
|
轩辕宝镜预设提交
|
2020-08-25 16:59:57 +08:00 |
JieLing
|
f4292f1f08
|
无极青莲技能效果添加
|
2020-08-25 15:57:19 +08:00 |
JieLing
|
2ef85759a1
|
无敌盾,眩晕效果添加
|
2020-08-25 15:49:52 +08:00 |
zhangqiang
|
1efd100e31
|
奖励弹窗路径修改 公会副本选择框修改
|
2020-08-25 15:39:57 +08:00 |
zhangqiang
|
0ba113ddbc
|
首冲修改提交
|
2020-08-25 15:25:27 +08:00 |
zhangqiang
|
f0c1ad1b71
|
首冲
|
2020-08-25 15:09:53 +08:00 |
zhangqiang
|
fe44f28958
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab
|
2020-08-25 14:49:13 +08:00 |
zhangqiang
|
77706e50cc
|
首冲有礼加特效
|
2020-08-25 14:46:57 +08:00 |
JieLing
|
4a7917b6ef
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 11:53:57 +08:00 |
JieLing
|
6c1452fa51
|
创建角色界面资源修改,修复打包后引导消失的问题
|
2020-08-25 11:53:25 +08:00 |
jiaoyangna
|
62a0d2f41a
|
帮助位置修改
|
2020-08-25 11:52:27 +08:00 |
ZhangBiao
|
e9fefa1ea1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 11:25:54 +08:00 |
ZhangBiao
|
51672e6e9a
|
八日登陆资源替换
|
2020-08-25 11:25:41 +08:00 |
JieLing
|
593530d5d5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 11:23:10 +08:00 |
zhangqiang
|
1ec1329fdf
|
公会副本入口提交
|
2020-08-25 11:18:20 +08:00 |
JieLing
|
661e5ba157
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 11:10:11 +08:00 |
zhangqiang
|
714545c75d
|
魂印效果图替换 修改公会副本
|
2020-08-25 10:40:13 +08:00 |
JieLing
|
6a2ce4b305
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 09:44:23 +08:00 |
JieLing
|
c14f7c4526
|
美元资源替换,艺术字体添加,
|
2020-08-24 23:58:33 +08:00 |
gaoxin
|
f373453cd2
|
修复主界面显示有缝隙的问题
|
2020-08-24 22:06:42 +08:00 |
zhangqiang
|
a5c401bd34
|
提交
|
2020-08-24 20:55:03 +08:00 |
jiaoyangna
|
ccb38eb3a7
|
qinglong commit
|
2020-08-24 20:10:52 +08:00 |
ZhangBiao
|
b463deccca
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 18:51:29 +08:00 |
ZhangBiao
|
76f5a343eb
|
云梦祈福入口时间、青龙秘宝时间显示
|
2020-08-24 18:51:05 +08:00 |
zhangqiang
|
8f5d7c7783
|
副本修改
|
2020-08-24 18:41:14 +08:00 |
ZhangBiao
|
52195c17ea
|
天宫秘宝标题修改
|
2020-08-24 18:24:42 +08:00 |
jiaoyangna
|
0a416d68d0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua
|
2020-08-24 17:46:31 +08:00 |
gaoxin
|
d4530f6ccf
|
修复新人物资源导致的报错
|
2020-08-24 17:43:28 +08:00 |
jiaoyangna
|
f484789ac5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 17:36:22 +08:00 |
jiaoyangna
|
a162238af0
|
commit spine
|
2020-08-24 17:35:41 +08:00 |
gaoxin
|
b1f7318f11
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 17:18:36 +08:00 |
gaoxin
|
02c213aca8
|
挂机地图新增
|
2020-08-24 17:17:21 +08:00 |
ZhangBiao
|
ec6cf58003
|
天尊降世入口资源替换
|
2020-08-24 17:04:45 +08:00 |
jiaoyangna
|
68e88e0f0d
|
commit spine
|
2020-08-24 16:49:20 +08:00 |
jiaoyangna
|
d1e4f04b21
|
spine commit
|
2020-08-24 16:43:48 +08:00 |
jiaoyangna
|
ecd7717cf1
|
commit spine
|
2020-08-24 16:26:05 +08:00 |
ZhangBiao
|
4b59561b3d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/BG/UI/MainScene/xuanwo_002.png.meta
|
2020-08-24 16:08:01 +08:00 |
ZhangBiao
|
6013365ad1
|
剑影仙踪特效更新
|
2020-08-24 16:07:08 +08:00 |
gaoxin
|
d7c34ec63d
|
创建角色界面立绘位置调整
|
2020-08-24 16:03:21 +08:00 |
gaoxin
|
395c41ef79
|
Merge branch 'temp' into master_develop
|
2020-08-24 14:36:54 +08:00 |
gaoxin
|
74951cedd8
|
修复登录界面错误,修复战斗背景音乐缺失的问题
|
2020-08-24 14:35:45 +08:00 |
jiaoyangna
|
ada573a8d0
|
00042 commit
|
2020-08-24 11:29:13 +08:00 |
jiaoyangna
|
78c3a0fcbd
|
spine commit
|
2020-08-24 11:23:52 +08:00 |
jiaoyangna
|
7419c97899
|
限时折扣刷新update
|
2020-08-24 10:22:27 +08:00 |
jiaoyangna
|
0f90bbe3fb
|
副本预设修改
|
2020-08-24 10:07:16 +08:00 |
zhangqiang
|
35899a49a4
|
公会副本调整 红点判断
|
2020-08-22 21:43:58 +08:00 |
jiaoyangna
|
4604d95f9d
|
qinglong commit
|
2020-08-22 21:20:12 +08:00 |
jiaoyangna
|
887329a458
|
hondian
|
2020-08-22 20:57:19 +08:00 |
gaoxin
|
4f8026425d
|
sdk添加上传新手数据的接口
|
2020-08-22 19:14:58 +08:00 |
zhangqiang
|
44a2538eb3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
|
2020-08-22 18:06:08 +08:00 |
zhangqiang
|
8f72af20cc
|
公会副本提交 达人排行修改
|
2020-08-22 18:03:43 +08:00 |
jiaoyangna
|
04bf990060
|
qinglong tijiao
|
2020-08-22 17:36:57 +08:00 |
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +08:00 |
zhangqiang
|
e1b223e83f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# data_execl/base_data/ItemConfig.xlsx
# data_execl/base_data/MonsterConfig.xlsx
# data_execl/base_data/PrivilegeTypeConfig.xlsx
# data_execl/base_data/RewardGroup.xlsx
# data_execl/base_data/RewardItemConfig.xlsx
# data_execl/base_data/SpecialConfig.xlsx
# data_execl/base_data/StoreConfig.xlsx
# data_execl/base_data/UIConfig.xlsx
|
2020-08-22 13:59:35 +08:00 |
jiaoyangna
|
98e9b9757e
|
huodong commit
|
2020-08-29 13:46:08 +08:00 |
zhangqiang
|
b279baaa41
|
公会副本提交
|
2020-08-22 13:49:47 +08:00 |
ZhangBiao
|
7f0d404e5d
|
添加一键购买、礼包界面计时器销毁
|
2020-08-22 10:09:30 +08:00 |
ZhangBiao
|
1a826a3f3e
|
累计充值
|
2020-08-21 20:11:24 +08:00 |
ZhangBiao
|
52dda5ff47
|
青龙入口 破阵长度
|
2020-08-21 19:03:41 +08:00 |
jiaoyangna
|
cbd8b9c084
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 18:33:09 +08:00 |
jiaoyangna
|
2646f9418a
|
|
2020-08-28 18:32:59 +08:00 |
jiaoyangna
|
66556e506a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 11:33:24 +08:00 |
jiaoyangna
|
22de98dc18
|
commit
|
2020-08-28 11:31:38 +08:00 |
jiaoyangna
|
e4a9c5c614
|
qinglong update
|
2020-08-28 11:05:31 +08:00 |
ZhangBiao
|
7058d73193
|
破阵诛仙 提交
|
2020-08-21 18:30:44 +08:00 |
zhangqiang
|
0759809be9
|
公会副本提交
|
2020-08-21 18:22:53 +08:00 |
zhangqiang
|
b725617a8d
|
公会副本提交
|
2020-08-21 15:52:49 +08:00 |
ZhangBiao
|
7ae97fdff0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-21 11:24:02 +08:00 |
ZhangBiao
|
b8a8a3980c
|
限时商市 珍奇宝阁
|
2020-08-21 11:23:46 +08:00 |
zhangqiang
|
c08c537b16
|
公会副本提交
|
2020-08-20 20:05:38 +08:00 |
jiaoyangna
|
948f47398c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-20 17:36:31 +08:00 |
jiaoyangna
|
6b0af3d7fb
|
pozhenzhuxian commit
|
2020-08-20 17:36:19 +08:00 |
ZhangBiao
|
b650ba81e8
|
界面顺序调整
(cherry picked from commit d47708cc41ecf75dd8aba813449c9e20e492b5e5)
|
2020-08-20 16:48:30 +08:00 |
ZhangBiao
|
b01a3f31f9
|
Merge branch '0副本/副本原版留存' into master_develop
# Conflicts:
# data_execl/base_data/MonsterConfig.xlsx
# data_execl/base_data/MonsterGroup.xlsx
|
2020-08-20 15:00:23 +08:00 |
jiaoyangna
|
d1a4bff97e
|
chengjiu update
|
2020-08-19 20:10:48 +08:00 |
jiaoyangna
|
785590bd4f
|
五星成长礼提交
|
2020-08-19 22:11:48 +08:00 |
jiaoyangna
|
fa1f5a7c35
|
五星成长礼提交
|
2020-08-19 22:03:47 +08:00 |
ZhangBiao
|
f9ffc1aa39
|
无尽细节修改
|
2020-08-19 19:37:59 +08:00 |
zhangqiang
|
869481a2cd
|
公会副本部分提交
|
2020-08-19 17:28:17 +08:00 |
jiaoyangna
|
4e1236de8c
|
qinglongserecttreasure commit
|
2020-08-19 10:05:01 +08:00 |
ZhangBiao
|
7e4b73dc27
|
两个副本,基本成型了
|
2020-08-18 21:03:55 +08:00 |
zhangqiang
|
c6b0acb7d8
|
Merge branch 'master_develop' into 0功能/公会副本
# Conflicts:
# data_execl/base_data/MonsterConfig.xlsx
|
2020-08-18 19:36:17 +08:00 |
zhangqiang
|
00f1060be7
|
公会副本提交初始界面
|
2020-08-18 19:33:31 +08:00 |
jiaoyangna
|
e2b2517ad0
|
live2d commit
|
2020-08-18 15:42:21 +08:00 |
jiaoyangna
|
95593175ec
|
dailycarbonpanel update
|
2020-08-18 14:00:03 +08:00 |
zhangqiang
|
c67951f5fb
|
公会副本资源提交
|
2020-08-17 16:19:25 +08:00 |
zhangqiang
|
cdf78a9dcf
|
剑影仙踪资源提交
|
2020-08-17 15:59:33 +08:00 |
jiaoyangna
|
17524007d7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-17 15:18:03 +08:00 |
jiaoyangna
|
0210dc3109
|
conflict commit
|
2020-08-17 15:17:58 +08:00 |
zhangqiang
|
6df142b067
|
修改bug 分解吞宝器 宝器穿的不显示属性 婚姻副本跳转 宝器合成背景隐藏
|
2020-08-17 11:39:41 +08:00 |
ZhangBiao
|
2063690199
|
|
2020-08-14 23:34:23 +08:00 |
jiaoyangna
|
d97203bf0b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 21:05:30 +08:00 |
jiaoyangna
|
740eb7253d
|
xuanyuan commit
|
2020-08-14 20:41:07 +08:00 |
JieLing
|
66687a1ce4
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 17:49:33 +08:00 |
jiaoyangna
|
84f82d488d
|
live2d commit
|
2020-08-14 17:43:24 +08:00 |
JieLing
|
7453825d63
|
Merge branch 'master_develop' into 0功能/资源加密方式二
# Conflicts:
# Assets/ManagedResources/Icons/c_dhdj_00042_t1.png.meta
# Assets/ManagedResources/Icons/c_dhdj_00042_t3.png.meta
# Assets/ManagedResources/Icons/c_ttjz_00048_t1.png.meta
# Assets/ManagedResources/Icons/c_ttjz_00048_t3.png.meta
# Assets/ManagedResources/Spine/c_dhdj_00042/c_dhdj_00042.png.meta
|
2020-08-14 17:41:21 +08:00 |
JieLing
|
ad3ee94a75
|
资源压缩方式修改,苹果资源压缩方式添加,
|
2020-08-14 17:29:06 +08:00 |
jiaoyangna
|
40b9550c54
|
修改轩辕副本立绘提交
|
2020-08-14 14:35:48 +08:00 |
jiaoyangna
|
d27b4b165f
|
资源名重复修改提交
|
2020-08-14 14:29:06 +08:00 |
jiaoyangna
|
1f7b161087
|
五星成长礼修改提交
|
2020-08-14 13:32:55 +08:00 |
jiaoyangna
|
905d77b0c6
|
Merge branches 'master_develop' and 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 13:01:17 +08:00 |
jiaoyangna
|
4c8d556b31
|
动态立绘提交
|
2020-08-14 12:59:19 +08:00 |
jiaoyangna
|
b4acffd954
|
动态立绘提交
|
2020-08-14 12:20:29 +08:00 |
ZhangBiao
|
416d6eb16c
|
每日签到
|
2020-08-13 22:30:09 +08:00 |
wangzhenxing
|
9dce11a6eb
|
测试战斗修改提交
|
2020-08-13 17:36:20 +09:00 |
wangzhenxing
|
442877d3e0
|
珍奇宝阁预设代码提交
|
2020-08-13 16:38:20 +09:00 |
jiaoyangna
|
fbf7c3b41d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-13 14:44:53 +08:00 |
jiaoyangna
|
b2f5dbc2ca
|
xuanyuan update
|
2020-08-13 14:43:44 +08:00 |
ZhangBiao
|
dd3c814c2a
|
四元阵中 添加 置换入口
|
2020-08-13 14:43:10 +08:00 |
ZhangBiao
|
d1ec3fa196
|
每周 每月礼包阴影问题修复
|
2020-08-13 13:33:48 +08:00 |
ZhangBiao
|
2fe27c64ec
|
|
2020-08-13 12:33:21 +08:00 |
jiaoyangna
|
937d46ff75
|
xuanyuan commit
|
2020-08-12 21:10:47 +08:00 |
jiaoyangna
|
39fb3d113c
|
xuyuan commit
|
2020-08-12 21:10:27 +08:00 |
zhangqiang
|
783583404e
|
神将合成修改提交
|
2020-08-12 20:59:20 +08:00 |
ZhangBiao
|
5304368d56
|
神将置换 上阵英雄不可以置换调整
(cherry picked from commit 0b5a3539ab6fe191b7e1497f32e2e6d3285e21ef)
|
2020-08-12 17:03:39 +08:00 |
gaoxin
|
809e10df79
|
Merge branch 'master_develop2' into master_develop
|
2020-08-12 14:45:01 +08:00 |