jiaoyangna
|
b97569c645
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-02 17:22:22 +08:00 |
jiaoyangna
|
d2e94cfdea
|
hero compound and replace
|
2020-09-02 17:21:54 +08:00 |
gaoxin
|
e415076e53
|
主界面适配资源替换
|
2020-09-02 17:04:44 +08:00 |
gaoxin
|
56b7486287
|
主界面上下适配资源添加
|
2020-09-01 17:16:28 +08:00 |
gaoxin
|
1ce0e4b15c
|
战斗怒气文字修改
|
2020-08-27 17:26:55 +08:00 |
ZhangBiao
|
87891b2798
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 18:29:10 +08:00 |
ZhangBiao
|
42b0ffe95d
|
月基金价格修改
|
2020-08-26 18:29:02 +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 |
zhangqiang
|
1b8f1631b7
|
巅峰战八强替换资源
|
2020-08-26 16:43:07 +08:00 |
jiaoyangna
|
22fa2b0d4c
|
qinglong commit
|
2020-08-26 15:57:06 +08:00 |
ZhangBiao
|
d644b64450
|
删除限时活动中的五行成长礼,试炼副本治疗神将不能一键上阵
|
2020-08-26 15:14:27 +08:00 |
JieLing
|
b28309e14e
|
资源位置移动
|
2020-08-25 19:26:51 +08:00 |
ZhangBiao
|
58aa9c2dce
|
每日豪礼 显示升级礼包 资源修改
|
2020-08-25 17:29:03 +08:00 |
ZhangBiao
|
c6293a0566
|
月卡资源替换
|
2020-08-25 16:09:59 +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 |
ZhangBiao
|
1496c5e29a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 13:57:35 +08:00 |
ZhangBiao
|
6f6758bf14
|
元—>$的替换
|
2020-08-25 13:57:21 +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 |
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
|
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
|
c14f7c4526
|
美元资源替换,艺术字体添加,
|
2020-08-24 23:58:33 +08:00 |
ZhangBiao
|
52195c17ea
|
天宫秘宝标题修改
|
2020-08-24 18:24:42 +08:00 |
ZhangBiao
|
ec6cf58003
|
天尊降世入口资源替换
|
2020-08-24 17:04:45 +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
|
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 |
ZhangBiao
|
52dda5ff47
|
青龙入口 破阵长度
|
2020-08-21 19:03:41 +08:00 |
ZhangBiao
|
b8a8a3980c
|
限时商市 珍奇宝阁
|
2020-08-21 11:23:46 +08:00 |
jiaoyangna
|
fa1f5a7c35
|
五星成长礼提交
|
2020-08-19 22:03:47 +08:00 |
jiaoyangna
|
4e1236de8c
|
qinglongserecttreasure commit
|
2020-08-19 10:05:01 +08:00 |
zhangqiang
|
c67951f5fb
|
公会副本资源提交
|
2020-08-17 16:19:25 +08:00 |
zhangqiang
|
cdf78a9dcf
|
剑影仙踪资源提交
|
2020-08-17 15:59:33 +08:00 |
ZhangBiao
|
2063690199
|
|
2020-08-14 23:34:23 +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
|
5e9448dd24
|
资源提交,
|
2020-08-14 17:35:18 +08:00 |
JieLing
|
ad3ee94a75
|
资源压缩方式修改,苹果资源压缩方式添加,
|
2020-08-14 17:29:06 +08:00 |
jiaoyangna
|
3834e1960e
|
图片导入
|
2020-08-14 14:17:38 +08:00 |
JieLing
|
be59c59230
|
部分大图资源整理
|
2020-08-14 10:02:24 +08:00 |
ZhangBiao
|
416d6eb16c
|
每日签到
|
2020-08-13 22:30:09 +08:00 |
JieLing
|
acf9a73068
|
重复引用资源修改
|
2020-08-13 19:40:50 +08:00 |
ZhangBiao
|
dd3c814c2a
|
四元阵中 添加 置换入口
|
2020-08-13 14:43:10 +08:00 |
ZhangBiao
|
c1c013a007
|
神将置换 基本功能完成
|
2020-08-11 20:55:05 +08:00 |
zhangqiang
|
93e1d880c8
|
英雄合成界面拼接
|
2020-08-06 18:34:04 +08:00 |