ZhangBiao
|
f7f0d4099f
|
【降妖夺宝】结束
|
2020-12-23 10:34:47 +08:00 |
guowei
|
4e0da5c05d
|
【鸿蒙阵遗漏内容】
|
2020-12-22 19:56:37 +08:00 |
ZhangBiao
|
8d245aab44
|
【降妖夺宝】开坑
|
2020-12-21 17:13:05 +08:00 |
gaoxin
|
03e3d77bb6
|
【优化】橙色改为金色
|
2020-12-21 16:15:17 +08:00 |
ZhangBiao
|
12760d7cb1
|
【升星有礼】完成
|
2020-12-21 15:41:31 +08:00 |
guowei
|
f744e609a1
|
【鸿蒙阵剩余图片】
|
2020-12-18 16:31:28 +08:00 |
guowei
|
4f4542d53a
|
【鸿蒙阵】
|
2020-12-18 13:39:35 +08:00 |
guowei
|
52d493ebc7
|
【鸿蒙阵】二次提交
|
2020-12-17 10:41:00 +08:00 |
guowei
|
861b02f0c8
|
【鸿蒙阵初版】
|
2020-12-15 11:03:34 +08:00 |
zhangqiang
|
03e0e73665
|
【装备套装】 套装属性向下兼容
|
2020-12-11 17:31:11 +08:00 |
ZhangBiao
|
b3e374e336
|
【神将来袭】基本完事儿
|
2020-12-03 18:36:01 +08:00 |
ZhangBiao
|
86d190572a
|
【神将来袭】加战斗了
|
2020-12-02 17:14:52 +08:00 |
ZhangBiao
|
ecb948a613
|
【神将来袭】真·差战斗 和为小游戏转盘增加log
|
2020-12-02 15:42:38 +08:00 |
ZhangBiao
|
2f07beaa08
|
【新将来袭】差战斗了
|
2020-12-02 09:51:17 +08:00 |
ZhangBiao
|
2d51e11e10
|
【神将来袭】代码完善
|
2020-12-01 15:52:34 +08:00 |
ZhangBiao
|
1222f1df0c
|
【新将来袭】开坑
|
2020-12-01 13:51:13 +08:00 |
DESKTOP-98AVA47\Administrator
|
15eebe4584
|
【鸿蒙阵】 初版提交
|
2020-11-27 17:59:25 +08:00 |
ZhangBiao
|
8a5d51e2a3
|
【灵兽抽卡】增加可选灵兽
(cherry picked from commit 8185be7c27)
|
2020-11-13 12:12:44 +08:00 |
zhangqiang
|
e9d984b329
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-11-12 19:34:29 +08:00 |
ZhangBiao
|
2563c6bdd6
|
【灵兽宝阁】货币显示修复
|
2020-11-12 18:17:56 +08:00 |
ZhangBiao
|
2c143deea9
|
Merge branch '0活动开发聚集地/灵兽抽卡' into master_xma_local
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
|
2020-11-12 17:21:42 +08:00 |
ZhangBiao
|
a5c36cf58a
|
【灵兽宝阁】未开启更换灵兽版本
|
2020-11-12 17:11:18 +08:00 |
jiaoyangna
|
a6483b3181
|
[灵兽特惠] 提交
|
2020-11-12 11:31:33 +08:00 |
ZhangBiao
|
1ba753044f
|
【灵兽宝阁】抽卡逻辑完善了
|
2020-11-11 16:53:04 +08:00 |
zhangqiang
|
629eb98f1b
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
|
2020-11-11 11:37:26 +08:00 |
zhangqiang
|
48e6d33b7b
|
【神将觉醒】 效果图 资源 提交
|
2020-11-10 17:29:38 +08:00 |
gaoxin
|
8ef89acdde
|
【bug】修复部分界面文字显示错误的问题
|
2020-11-10 10:37:53 +08:00 |
zhangqiang
|
6a1693939c
|
【觉醒】 觉醒添加图鉴
|
2020-11-09 20:05:51 +08:00 |
gaoxin
|
bd6e61d92a
|
【语言工具】添加代码语言还原工具
|
2020-11-07 15:42:11 +08:00 |
jiaoyangna
|
22038419b7
|
神医天降提交
|
2020-11-06 19:54:00 +08:00 |
ZhangBiao
|
5e130a7585
|
Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
# Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
# Assets/ManagedResources/Effects/Model/Materials.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-11-06 16:17:12 +08:00 |
ZhangBiao
|
b516a8c202
|
【易经宝库】没有QA 无法购买
|
2020-11-06 13:36:48 +08:00 |
jiaoyangna
|
e2fae0cc52
|
皮肤提交
|
2020-11-06 09:37:27 +08:00 |
ZhangBiao
|
6f75850ae4
|
【易经宝库】提交
|
2020-11-05 19:10:20 +08:00 |
ZhangBiao
|
476057bd1c
|
【易经宝库】主界面奖励显示 通用奖励界面创建
|
2020-11-04 19:51:58 +08:00 |
jiaoyangna
|
509357e333
|
Merge branch 'master_xma_local' into 0功能/皮肤
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2020-11-04 10:54:54 +08:00 |
ZhangBiao
|
5d40b102dc
|
【易经宝库】添加type 拼数据
|
2020-11-03 19:01:47 +08:00 |
jiaoyangna
|
e92e63444b
|
皮肤提交
|
2020-11-03 17:27:32 +08:00 |
ZhangBiao
|
f79499faea
|
【易经宝库】开始获取活动数据
|
2020-11-03 09:58:37 +08:00 |
gaoxin
|
d00d3e803c
|
【商店】删除商店的动画显示
|
2020-11-03 01:00:58 +08:00 |
gaoxin
|
34b4b5db51
|
【商店】修复灵兽山跳转灵兽商店会显示其他商店的数据的问题
|
2020-11-02 22:55:24 +08:00 |
ZhangBiao
|
8640018b87
|
【易经宝库】开坑 搭界面 和做动画
|
2020-11-02 18:05:24 +08:00 |
zhangqiang
|
3bbaab27be
|
【灵兽系统】 添加驱灵币跳转按钮 and 特权礼包排序
|
2020-11-02 14:36:21 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
JieLing
|
0752b7694e
|
【排行榜】 排行榜显示
|
2020-10-27 16:23:35 +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
|
43a370f5a8
|
报错提交
|
2020-10-26 10:56:46 +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
|
a2a870f421
|
【社稷大典】提交4
|
2020-10-24 18:41:21 +08:00 |
ZhangBiao
|
0349671074
|
【社稷大典】提交2
|
2020-10-24 18:23:50 +08:00 |
jiaoyangna
|
589e535e73
|
generalpopup commit
|
2020-10-19 23:18:54 +08:00 |
gaoxin
|
f53a566ce8
|
【逍遥游】功能入口随功能开启添加
|
2020-10-19 22:57:02 +08:00 |
yuanshuai
|
131d1aab1b
|
【逍遥游】红点和帮助弹窗提交
|
2020-10-19 21:39:48 +08:00 |
gaoxin
|
364c9c99fc
|
【逍遥游】功能合并到local分支
|
2020-10-19 20:37:53 +08:00 |
ZhangBiao
|
f0e9063c97
|
关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改
|
2020-10-16 17:56:39 +08:00 |
zhangqiang
|
d2792bdb8b
|
线上活动 森罗幻境达人前端修改2
|
2020-10-12 14:47:02 +08:00 |
zhangqiang
|
f2d3f045aa
|
森罗幻境提交1
|
2020-10-12 14:46:05 +08:00 |
zhangqiang
|
a697e38584
|
修改为正式服
|
2020-09-30 11:15:56 +08:00 |
JieLing
|
bd5d9da3bf
|
部分功能通过判断提审服和正式服进行开启和关闭
|
2020-09-30 11:14:43 +08:00 |
gaoxin
|
75a8cade8b
|
默认头像修改
|
2020-09-28 17:35:34 +08:00 |
liujiaqi
|
783c61eed8
|
修复新玩家登陆卡在登陆100%
|
2020-09-27 20:40:20 +08:00 |
gaoxin
|
673070438b
|
头像默认显示复原
|
2020-09-27 19:05:09 +08:00 |
JieLing
|
907d092c04
|
遗漏同步提交
|
2020-09-27 18:27:20 +08:00 |
gaoxin
|
b3d15c1945
|
头像特效添加
|
2020-09-27 16:58:10 +08:00 |
ZhangBiao
|
97f9b8f671
|
遴选三界除魔
|
2020-09-27 16:44:31 +08:00 |
ZhangBiao
|
d601794a17
|
三界降魔
|
2020-09-27 16:43:49 +08:00 |
ZhangBiao
|
e9b994126e
|
三界降魔
|
2020-09-27 16:43:42 +08:00 |
ZhangBiao
|
c4706208ef
|
三界除魔功能添加
|
2020-09-27 16:43:33 +08:00 |
JieLing
|
c6391090f2
|
三界除魔界面添加
|
2020-09-27 16:38:44 +08:00 |
zhangqiang
|
96ab48c22f
|
遴选 线上活动: 三周活动 寻宝达人 四周 天宫达人2 有中文表
|
2020-09-27 16:14:42 +08:00 |
zhangqiang
|
bd6fdce461
|
遴选 线上活动 : 三周活动 寻宝达人 四周 天宫达人
|
2020-09-27 16:12:21 +08:00 |
JieLing
|
3d594a7d8e
|
文字表修改
|
2020-09-10 14:51:20 +08:00 |
gaoxin
|
4ca09780a0
|
引导添加检测类型
|
2020-09-05 17:24:46 +08:00 |
gaoxin
|
fb6a6c9da5
|
添加cmdbuffer的使用,优化RenderTexture渲染消耗,未开启使用,为以后优化做准备
|
2020-09-05 12:30:00 +08:00 |
gaoxin
|
92a8b93b50
|
修改屏幕的适配方式,修改计算屏幕位置的方法
|
2020-09-05 12:15:58 +08:00 |
ZhangBiao
|
8232879006
|
车迟排名界面调整、日常本底部适配、万象境“新”字bug修复
|
2020-09-04 14:30:39 +08:00 |
ZhangBiao
|
ca036d6d0a
|
天宫商店、无尽商店货币加号增加、无尽副本战斗胜利不显示经验
|
2020-09-03 18:16:20 +08:00 |
ZhangBiao
|
d39a324917
|
森罗文字提示修改
|
2020-09-03 15:59:13 +08:00 |
ZhangBiao
|
04b18aa4ad
|
竞技场有免费次数 时提示红点
|
2020-09-03 14:42:31 +08:00 |
ZhangBiao
|
c3b0f590d2
|
好友增加一键领取红点
|
2020-09-03 10:50:25 +08:00 |
zhangqiang
|
939e9b3c77
|
shi pei
|
2020-09-02 15:54:28 +08:00 |
ZhangBiao
|
e74c120d01
|
大闹天宫重置红点、无尽副本界面红点
|
2020-09-01 11:25:38 +08:00 |
zhangqiang
|
a6fa4453e6
|
需求主城或关卡停留过长添加聊天气泡
|
2020-08-31 20:52:50 +08:00 |
zhangqiang
|
40610b0c19
|
献祭修改
|
2020-08-31 18:19:38 +08:00 |
ZhangBiao
|
a2c8352e29
|
装备文字过长、仙缘宝箱优化、充值妖晶提示问题
|
2020-08-28 18:37:16 +08:00 |
ZhangBiao
|
01fc7cae51
|
森罗幻境奖励红点
|
2020-08-28 13:48:09 +08:00 |
gaoxin
|
259e0a1209
|
祈福文字修改
|
2020-08-28 03:12:54 +08:00 |
ZhangBiao
|
1243629056
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 13:59:21 +08:00 |
ZhangBiao
|
811418e222
|
森罗 无尽红点
|
2020-08-27 13:59:14 +08:00 |
jiaoyangna
|
19465ac1b2
|
【宝物】共鸣界面等级上限显示不正确
|
2020-08-27 12:01:01 +08:00 |
ZhangBiao
|
1f35f84243
|
四元阵赠送20置换玉提示
|
2020-08-26 16:59:19 +08:00 |
zhangqiang
|
64802afd2b
|
巅峰战编队提示bug提交
|
2020-08-26 15:47:01 +08:00 |
zhangqiang
|
63ce11cda4
|
替换底图
|
2020-08-26 15:18:44 +08:00 |
jiaoyangna
|
7f9c8122c4
|
跳转修改提交
|
2020-08-26 14:51:10 +08:00 |
zhangqiang
|
f223c0c3e1
|
副本修改
|
2020-08-25 18:24:17 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +08:00 |
jiaoyangna
|
62a0d2f41a
|
帮助位置修改
|
2020-08-25 11:52:27 +08:00 |
jiaoyangna
|
5c62cc19a7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 11:38:31 +08:00 |
jiaoyangna
|
f3aca22b37
|
commit help_type
|
2020-08-25 11:38:23 +08:00 |
JieLing
|
c14f7c4526
|
美元资源替换,艺术字体添加,
|
2020-08-24 23:58:33 +08:00 |
zhangqiang
|
3a209ba629
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 16:31:34 +08:00 |
zhangqiang
|
b36ebe510c
|
修改宝物分解
|
2020-08-24 16:29:27 +08:00 |
gaoxin
|
e806410e8a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2020-08-24 15:25:23 +08:00 |
ZhangBiao
|
939fa0227a
|
无尽入口例会、化虚进入修复、剪影仙踪
|
2020-08-24 15:20:00 +08:00 |
gaoxin
|
395c41ef79
|
Merge branch 'temp' into master_develop
|
2020-08-24 14:36:54 +08:00 |
jiaoyangna
|
aebf37e150
|
云梦祈福提交
|
2020-08-22 20:26:11 +08:00 |
gaoxin
|
4f8026425d
|
sdk添加上传新手数据的接口
|
2020-08-22 19:14:58 +08:00 |
zhangqiang
|
8f72af20cc
|
公会副本提交 达人排行修改
|
2020-08-22 18:03:43 +08:00 |
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +08:00 |
zhangqiang
|
9aec7d16e8
|
公会副本提交
|
2020-08-22 15:34:02 +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 |
zhangqiang
|
b279baaa41
|
公会副本提交
|
2020-08-22 13:49:47 +08:00 |
ZhangBiao
|
bbe2c8c1f3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-21 18:30:50 +08:00 |
jiaoyangna
|
8c17479fd6
|
破阵诛仙活动 调整
|
2020-08-28 17:46:07 +08:00 |
jiaoyangna
|
3bb8e284d9
|
破阵诛仙
|
2020-08-28 16:36:08 +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 |
ZhangBiao
|
7058d73193
|
破阵诛仙 提交
|
2020-08-21 18:30:44 +08:00 |
ZhangBiao
|
b8a8a3980c
|
限时商市 珍奇宝阁
|
2020-08-21 11:23:46 +08:00 |
zhangqiang
|
c08c537b16
|
公会副本提交
|
2020-08-20 20:05:38 +08:00 |
ZhangBiao
|
aa551923b1
|
破阵诛仙 珍奇宝阁
|
2020-08-20 18:32:14 +08:00 |
jiaoyangna
|
6b0af3d7fb
|
pozhenzhuxian commit
|
2020-08-20 17:36:19 +08:00 |
jiaoyangna
|
6c52db4ec6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-20 16:08:18 +08:00 |
jiaoyangna
|
2eaa10cdbc
|
添加红点
|
2020-08-20 16:08:12 +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 |
zhangqiang
|
869481a2cd
|
公会副本部分提交
|
2020-08-19 17:28:17 +08:00 |
jiaoyangna
|
f439a78b34
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-19 10:05:09 +08:00 |
jiaoyangna
|
4e1236de8c
|
qinglongserecttreasure commit
|
2020-08-19 10:05:01 +08:00 |
ZhangBiao
|
f18973cea9
|
极速达人修改
|
2020-08-18 19:17:20 +08:00 |
ZhangBiao
|
c9cb029494
|
无尽副本基本功能
(cherry picked from commit 21f43fa1a132a469c1d674d12838148699998794)
|
2020-08-18 10:49:21 +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 |
ZhangBiao
|
77b3386efb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-17 11:57:01 +08:00 |
ZhangBiao
|
c2fdcb06bd
|
极速达人
|
2020-08-17 11:56:38 +08:00 |
zhangqiang
|
6df142b067
|
修改bug 分解吞宝器 宝器穿的不显示属性 婚姻副本跳转 宝器合成背景隐藏
|
2020-08-17 11:39:41 +08:00 |
ZhangBiao
|
2063690199
|
|
2020-08-14 23:34:23 +08:00 |
ZhangBiao
|
416d6eb16c
|
每日签到
|
2020-08-13 22:30:09 +08:00 |
ZhangBiao
|
e655562a71
|
|
2020-08-13 17:07:05 +08: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 |
jiaoyangna
|
39fb3d113c
|
xuyuan commit
|
2020-08-12 21:10:27 +08:00 |
zhangqiang
|
783583404e
|
神将合成修改提交
|
2020-08-12 20:59:20 +08:00 |
zhangqiang
|
058b18bc6f
|
最新表 协议数据
|
2020-08-12 18:29:11 +08:00 |
jiaoyangna
|
95dff6f0e9
|
Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2020-08-12 14:20:45 +08:00 |
ZhangBiao
|
06bc9c1f1d
|
Merge branch '0功能/法宝归元和神将置换' into master_develop2
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2020-08-12 14:15:27 +08:00 |
ZhangBiao
|
ed319be87e
|
神将置换
|
2020-08-12 14:13:16 +08:00 |
shihongyi
|
e797e9f48d
|
合并develop &2 进程中,暂时不要更新
|
2020-08-12 11:37:26 +08:00 |
jiaoyangna
|
f7fe1d9513
|
Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# data_execl/base_data/GlobalActivity.xlsx
# data_execl/base_data/GlobalSystemConfig.xlsx
# data_execl/base_data/ItemConfig.xlsx
# data_execl/base_data/RechargeCommodityConfig.xlsx
# data_execl/base_data/SpecialConfig.xlsx
|
2020-08-11 14:07:10 +08:00 |
jiaoyangna
|
3d2f288934
|
轩辕宝镜提交
|
2020-08-11 09:48:21 +08:00 |
zhangqiang
|
93e1d880c8
|
英雄合成界面拼接
|
2020-08-06 18:34:04 +08:00 |
jiaoyangna
|
16d4b6477d
|
no message
|
2020-08-06 17:37:07 +08:00 |
jiaoyangna
|
22b02b5cca
|
encoding convert
|
2020-08-06 17:35:07 +08:00 |
jiaoyangna
|
e0359bb37a
|
encoding upate
|
2020-08-06 17:52:32 +08:00 |
jiaoyangna
|
5c13a25bb5
|
encoding convert
|
2020-08-06 17:37:42 +08:00 |
ZhangBiao
|
ed373d1851
|
Merge branch '0功能/法宝归元和神将置换' of http://60.1.1.230/gaoxin/JL_Client into 0功能/法宝归元和神将置换
|
2020-08-06 10:43:28 +08:00 |
ZhangBiao
|
44497f73bd
|
神将置换页面制作1
|
2020-08-06 10:43:11 +08:00 |
zhangqiang
|
3bb0906865
|
法宝归元中文表
|
2020-08-06 10:38:55 +08:00 |
zhangqiang
|
4533695a3d
|
法宝归元界面提交
|
2020-08-07 12:22:10 +08:00 |
ZhangBiao
|
ee19d26bd3
|
神将置换界面创建
|
2020-08-05 15:36:22 +08:00 |
zhangqiang
|
ed53f7e760
|
Merge branch 'master_develop' into master_develop2
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# data_execl/base_data/BeStronger.xlsx
# data_execl/base_data/EquipTalismana.xlsx
# data_execl/base_data/GlobalActivity.xlsx
|
2020-08-07 06:54:04 +08:00 |
ZhangBiao
|
989703a0e4
|
乾坤宝盒单抽bug修复、四元阵赠送“元神玉”
|
2020-08-04 20:30:26 +08:00 |
zhangqiang
|
7b73f4ae77
|
升星成功界面加天赋解锁显示
|
2020-08-04 17:24:15 +08:00 |
zhangqiang
|
0a8bdc5765
|
援助 十绝阵 合成 提示性bug
|
2020-08-04 14:02:28 +08:00 |
ZhangBiao
|
0cd5ffca9d
|
魂印特效关闭
|
2020-08-03 16:11:04 +08:00 |
skuld
|
3f5fdf3ec1
|
修改大闹天宫BOSS名字
|
2020-07-31 16:42:35 +08:00 |
ZhangBiao
|
ab8889ae8c
|
破阵诛仙活动界面
|
2020-07-31 16:18:14 +08:00 |
jiaoyangna
|
242896fede
|
add soulprint effect commit
|
2020-08-02 09:16:45 +08:00 |
ZhangBiao
|
dd06fc4652
|
充值入口恢复,加 充值switch
|
2020-07-31 13:35:15 +08:00 |
jiaoyangna
|
b9084626eb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-29 17:51:40 +08:00 |
jiaoyangna
|
b2af34a2b3
|
副本红点提交
|
2020-07-29 17:50:15 +08:00 |
zhangqiang
|
b2a54634d2
|
适配调整 巅峰赛入口
|
2020-08-15 00:08:25 +08:00 |
gaoxin
|
f058668af6
|
修复红点id重复,导致聊天红点显示错误的问题
|
2020-07-29 11:39:52 +08:00 |
ZhangBiao
|
2731d973fb
|
删除跳过按钮的首充提示
|
2020-07-29 02:32:07 +08:00 |
ZhangBiao
|
4f14ee8599
|
商店金币位数调整
|
2020-07-28 23:25:43 +08:00 |
jiaoyangna
|
bf77931b88
|
边框修改提交
|
2020-07-28 18:38:19 +08:00 |
jiaoyangna
|
25d535fa4c
|
关闭特效
|
2020-07-28 16:57:12 +08:00 |
ZhangBiao
|
e2a8af9028
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 16:45:38 +08:00 |
zhangqiang
|
2a87d43fd0
|
bug
|
2020-07-31 17:36:06 +08:00 |
ZhangBiao
|
ddfbb25e2e
|
森罗bug修复
|
2020-07-28 16:45:28 +08:00 |
ZhangBiao
|
1868a14b08
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 15:24:21 +08:00 |
ZhangBiao
|
52c34aa2a3
|
花费妖晶抽卡提示优化
|
2020-07-28 15:24:11 +08:00 |
jiaoyangna
|
d5b15a17ee
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Common/functions.lua
|
2020-07-28 15:08:24 +08:00 |
zhangqiang
|
565d0392fc
|
背景颜色根据星级变化
|
2020-07-31 15:40:43 +08:00 |
jiaoyangna
|
99f9e7169e
|
添加特效
|
2020-07-28 15:06:47 +08:00 |
ZhangBiao
|
48ac527f1a
|
限时召唤 乾坤宝盒 页面整合
|
2020-07-28 09:48:02 +08:00 |
gaoxin
|
48715b151a
|
sdk修改
|
2020-07-27 14:42:25 +08:00 |
jiaoyangna
|
48c209b4aa
|
formation commit
|
2020-07-25 22:58:55 +08:00 |
jiaoyangna
|
b1bf2876cb
|
10 star update
|
2020-07-25 21:57:46 +08:00 |
gaoxin
|
b0002cf781
|
语言文字替换
|
2020-07-25 20:42:11 +08:00 |
skuld
|
fcc1424cd5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 22:37:33 +08:00 |
skuld
|
7731aa45b8
|
修改猎妖之路为大闹天宫
|
2020-07-28 22:36:17 +08:00 |
jiaoyangna
|
0ec835f540
|
获取头像框通用方法修改
|
2020-07-25 20:04:02 +08:00 |
jiaoyangna
|
48ff5b8b28
|
头像框通用方法修改
|
2020-07-25 20:02:24 +08:00 |
jiaoyangna
|
d8fa2b9459
|
头像背景修改
|
2020-07-25 19:59:43 +08:00 |
jiaoyangna
|
7c92ddc60a
|
副本置灰修改提交
|
2020-07-25 18:35:05 +08:00 |
gaoxin
|
65756cbe59
|
Merge branch 'master_local_test' into master_develop
# Conflicts:
# Assets/Effect.meta
# Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_02.prefab.meta
# Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_03.prefab.meta
# Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ddtz_00049_001_01.prefab.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua.meta
# Assets/ManagedResources/~Lua/Modules/MapChoose.meta
|
2020-07-25 16:24:48 +08:00 |
JieLing
|
543a4ca080
|
修复提交数据报错,内网测试0.16.2
|
2020-07-25 16:23:04 +08:00 |
jiaoyangna
|
6742056a93
|
冲突解决提交
|
2020-07-25 15:18:07 +08:00 |
jiaoyangna
|
a688050060
|
修改星星提交
|
2020-07-25 14:21:33 +08:00 |
jiaoyangna
|
0c2239bd11
|
编队修改提交
|
2020-07-25 13:21:30 +08:00 |
jiaoyangna
|
caadda04e1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab
|
2020-07-24 20:04:44 +08:00 |
jiaoyangna
|
064b819f4a
|
修改星星提交
|
2020-07-24 20:03:06 +08:00 |
zhangqiang
|
abfde3e8a9
|
巅峰战bug and 使用按钮需求
|
2020-08-24 21:46:19 +08:00 |
zhangqiang
|
4d0b53adf9
|
巅峰赛货币显示
|
2020-08-05 21:03:36 +08:00 |
jiaoyangna
|
667b3e0bf5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-24 10:32:45 +08:00 |
jiaoyangna
|
15976637f4
|
log提交
|
2020-07-24 10:32:27 +08:00 |
zhangqiang
|
3588a17c00
|
Merge branch 'master_develop' into master_arena
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
# data_execl/base_data/UIConfig.xlsx
|
2020-07-23 21:24:00 +08:00 |
zhangqiang
|
3b3dbec6a7
|
添加巅峰赛编队
|
2020-07-23 14:36:28 +08:00 |
zhangqiang
|
b53907dda2
|
Merge branch 'master_develop' into master_arena
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2020-07-23 11:10:19 +08:00 |
zhangqiang
|
f844305e0e
|
Merge branch 'master_develop' into master_arena
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Language.lua
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
|
2020-07-22 21:55:01 +08:00 |
jiaoyangna
|
cafa630185
|
Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2020-07-22 20:19:57 +08:00 |
jiaoyangna
|
69f61467a2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-22 15:57:01 +08:00 |
jiaoyangna
|
ba8b5a3c93
|
【宝物合成】一键合成预览处显示错误
|
2020-07-22 15:50:18 +08:00 |
ZhangBiao
|
2d79cc70e5
|
【战斗】解锁倍速提示,VIP改成特权
|
2020-07-22 10:33:31 +08:00 |
jiaoyangna
|
03107d240a
|
轩辕宝镜提交
|
2020-07-21 10:42:20 +08:00 |
jiaoyangna
|
9b7e47aaef
|
Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
# data_execl/base_data/RaceTowerConfig.xlsx
|
2020-07-20 20:00:31 +08:00 |
gaoxin
|
02b37b2d67
|
Merge branch 'master_develop' into master_test
|
2020-07-20 19:58:43 +08:00 |
jiaoyangna
|
04e9a24db0
|
xuanyuanmirror tijiao
|
2020-07-20 19:46:08 +08:00 |
zhangqiang
|
f234c1a174
|
竞技场中文字修改
|
2020-07-20 16:07:30 +08:00 |
zhangqiang
|
a325bfb781
|
竞技场排名
|
2020-07-20 15:34:30 +08:00 |
ZhangBiao
|
97bfdd53b6
|
十绝阵开启阶段加入公会不可挑战十绝阵
|
2020-07-20 11:21:16 +08:00 |
jiaoyangna
|
b11c108e5d
|
Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
|
2020-07-20 09:47:28 +08:00 |
gaoxin
|
5c962f330a
|
Merge branch '接入SDK' into master_test
# Conflicts:
# Assets/Effect.meta
# BuildABs/Android/files.unity3d
# BuildABs/Android/lzma/luabytes.unity3d
# BuildABs/Android/lzma/resconfigs.unity3d
# ProjectSettings/ProjectSettings.asset
|
2020-07-18 19:55:02 +08:00 |
gaoxin
|
a1acdd13fb
|
支付接口接入,打点数据完善
|
2020-07-18 19:24:19 +08:00 |
zhangqiang
|
480e810478
|
添加文字
|
2020-07-17 20:06:48 +08:00 |
zhangqiang
|
25896729ff
|
商店去掉刷新红点
|
2020-07-17 11:32:20 +08:00 |
zhangqiang
|
ebca764861
|
首冲
|
2020-07-17 11:27:03 +08:00 |
jiaoyangna
|
1838823c37
|
幸运探宝提交
|
2020-07-16 20:24:28 +08:00 |
zhangqiang
|
8f96d9f067
|
探宝红点
|
2020-07-16 18:01:03 +08:00 |
gaoxin
|
5b7b28f1f9
|
sdk接入结构修改
|
2020-07-16 17:00:24 +08:00 |
ZhangBiao
|
afa02aae2e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-16 13:45:50 +08:00 |
ZhangBiao
|
9d47ce9767
|
小游戏bug修复
|
2020-07-16 13:45:07 +08:00 |
jiaoyangna
|
adc3b71e40
|
分解修改提交
|
2020-07-16 10:49:01 +08:00 |
ZhangBiao
|
de9290e4a0
|
物品掉落特效+跳过按钮
|
2020-07-15 16:35:51 +08:00 |
gaoxin
|
7605156317
|
sdk结构修改
|
2020-07-15 13:44:37 +08:00 |
ZhangBiao
|
2ab6d17841
|
森罗小游戏修改
|
2020-07-14 21:03:44 +08:00 |
ZhangBiao
|
eddaa95312
|
宝囊
|
2020-07-14 11:05:47 +08:00 |
ZhangBiao
|
4c6369e51d
|
乾坤宝囊修改
|
2020-07-13 20:07:06 +08:00 |
gaoxin
|
bd83a45de2
|
Merge branch 'master_test' into 接入SDK
# Conflicts:
# .gitignore
# Assets/ManagedResources/Audio/Skill/actor_voc.meta
# Assets/ManagedResources/PublicArtRes/Models/Materials.meta
# Assets/ManagedResources/~Lua/Config/Data.meta
|
2020-07-13 12:55:15 +08:00 |
gaoxin
|
3f54c121b1
|
sdk=接口完善
|
2020-07-13 12:25:55 +08:00 |
ZhangBiao
|
310802e967
|
language导出
|
2020-07-10 19:13:29 +08:00 |
ZhangBiao
|
b89c0582c0
|
宝囊
|
2020-07-10 17:55:11 +08:00 |
2han9B1a0
|
ce1d7014f3
|
|
2020-07-09 19:59:23 +08:00 |
2han9B1a0
|
12b0fa9f73
|
特权修改,宝囊商店
|
2020-07-09 18:20:53 +08:00 |
2han9B1a0
|
10a2181305
|
小游戏18bugxiugai
|
2020-07-09 16:14:44 +08:00 |
2han9B1a0
|
47b34f9d6e
|
宝囊
|
2020-07-09 11:52:40 +08:00 |