ZhangBiao
|
bae7d6550e
|
竞技场界面修改
|
2020-10-16 19:36:21 +08:00 |
ZhangBiao
|
0dbf805ef8
|
限时召唤 更换主Up神将
(cherry picked from commit 90a5c3f28d )
|
2020-10-23 17:38:45 +08:00 |
jiaoyangna
|
aa9878a1f2
|
势不可挡 提交
|
2020-10-10 16:14:18 +08:00 |
zhangqiang
|
f2d3f045aa
|
森罗幻境提交1
|
2020-10-12 14:46:05 +08:00 |
jiaoyangna
|
8ff0382e41
|
丹心碧血主界面icon 修改提交
|
2020-10-15 14:06:16 +08:00 |
jiaoyangna
|
d249eb412f
|
丹心碧血提交
|
2020-10-15 14:05:56 +08:00 |
jiaoyangna
|
7c38428100
|
丹心碧血图片提交
|
2020-10-15 14:04:45 +08:00 |
jiaoyangna
|
054ea80a3c
|
活动icon 提交
|
2020-09-29 10:30:19 +08:00 |
liujiaqi
|
783c61eed8
|
修复新玩家登陆卡在登陆100%
|
2020-09-27 20:40:20 +08:00 |
JieLing
|
907d092c04
|
遗漏同步提交
|
2020-09-27 18:27:20 +08:00 |
ZhangBiao
|
c4706208ef
|
三界除魔功能添加
|
2020-09-27 16:43:33 +08:00 |
zhangqiang
|
bd6fdce461
|
遴选 线上活动 : 三周活动 寻宝达人 四周 天宫达人
|
2020-09-27 16:12:21 +08:00 |
gaoxin
|
7b7def3f8f
|
勇冠三军,叱咤风云活动添加
|
2020-09-27 16:09:55 +08:00 |
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 |
ZhangBiao
|
44497f73bd
|
神将置换页面制作1
|
2020-08-06 10:43:11 +08:00 |
zhangqiang
|
4533695a3d
|
法宝归元界面提交
|
2020-08-07 12:22:10 +08:00 |
ZhangBiao
|
ee19d26bd3
|
神将置换界面创建
|
2020-08-05 15:36:22 +08:00 |
jiaoyangna
|
8b3bcecb59
|
activity commit
|
2020-08-03 10:18:04 +08:00 |
ZhangBiao
|
ab8889ae8c
|
破阵诛仙活动界面
|
2020-07-31 16:18:14 +08:00 |
jiaoyangna
|
c328d4683c
|
特效添加提交
|
2020-07-30 10:08:58 +08:00 |
jiaoyangna
|
8a2a443168
|
星星提交
|
2020-07-28 19:18:45 +08:00 |
jiaoyangna
|
bf77931b88
|
边框修改提交
|
2020-07-28 18:38:19 +08:00 |
zhangqiang
|
acba506782
|
寻宝添加6星显示
|
2020-07-31 18:40:22 +08:00 |
ZhangBiao
|
cec1f145b6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 09:48:26 +08:00 |
ZhangBiao
|
48ac527f1a
|
限时召唤 乾坤宝盒 页面整合
|
2020-07-28 09:48:02 +08:00 |
jiaoyangna
|
54b3aad5e9
|
【副本优化】副本入口处增加文字提示
|
2020-07-27 19:48:05 +08:00 |
jiaoyangna
|
e71f82795a
|
编队界面修改提交
|
2020-07-27 14:13:31 +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
|
6807c6c1a6
|
meta文件提交
|
2020-07-25 15:15:16 +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 |
ZhangBiao
|
1f5440c2e6
|
bug修复
|
2020-07-24 12:11:00 +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
|
6a855cf7a2
|
巅峰赛问题修改
|
2020-07-23 20:39:21 +08:00 |
ZhangBiao
|
c268538c0e
|
共鸣资源替换
|
2020-07-23 19:46:54 +08:00 |
jiaoyangna
|
2fd0311c3c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Audio/Skill/skill/Audio_c_xy_0012_skeff_tapsk_healeff.mp3.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2020-07-23 16:02:06 +08:00 |
jiaoyangna
|
b424927bbb
|
tupian tijiao
|
2020-07-23 16:01:26 +08:00 |
ZhangBiao
|
7fb5ac778f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 15:44:51 +08:00 |
ZhangBiao
|
9b290c1ed5
|
图片资源替换
|
2020-07-23 15:44:40 +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
|
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 |
zhangqiang
|
c471a9ccd5
|
竞技场替换宝箱效果图替换
|
2020-07-20 11:28:19 +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 |
jiaoyangna
|
1838823c37
|
幸运探宝提交
|
2020-07-16 20:24:28 +08:00 |
JieLing
|
2be4cc20e6
|
Merge branch 'master_develop' into master_test
# Conflicts:
# .gitignore
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# data_execl/base_data/CombatControl.xlsx
# data_execl/base_data/GuideConfig.xlsx
|
2020-07-16 20:08:11 +08:00 |
ZhangBiao
|
e36a85bcb2
|
充点小钱资源替换
|
2020-07-16 18:17:27 +08:00 |
zhangqiang
|
864e3b739d
|
首冲
|
2020-07-16 16:57:36 +08:00 |
zhangqiang
|
85663ecfb4
|
首冲
|
2020-07-16 15:02:38 +08:00 |
jiaoyangna
|
e15bf9a7b2
|
轩辕宝镜资源提交
|
2020-07-15 16:27:58 +08:00 |
gaoxin
|
7605156317
|
sdk结构修改
|
2020-07-15 13:44:37 +08:00 |
zhangqiang
|
b682f97e66
|
首充第一版修改
|
2020-07-15 10:36:57 +08:00 |
gaoxin
|
48fc5c61fb
|
取消背景音乐加速
|
2020-07-13 18:01:58 +08:00 |
liujiaqi
|
11add2dd81
|
乾坤魂印兑换图标资源
|
2020-07-13 16:52:16 +08:00 |
JieLing
|
9b97aef3d7
|
内网 0.15.15
|
2020-07-10 18:20:58 +08:00 |
ZhangBiao
|
b89c0582c0
|
宝囊
|
2020-07-10 17:55:11 +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 |
2han9B1a0
|
7c7684a714
|
冲突提交
|
2020-07-08 21:19:34 +08:00 |
zhangqiang
|
b3dc6d0688
|
巅峰赛
|
2020-07-08 15:02:16 +08:00 |
2han9B1a0
|
272cfdc71a
|
乾坤包囊
|
2020-07-08 09:41:56 +08:00 |
2han9B1a0
|
4aed395ed3
|
乾坤包囊
|
2020-07-08 09:40:36 +08:00 |
jiaoyangna
|
c15b84b096
|
Merge branch 'master_develop' into equip
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
|
2020-07-07 18:13:34 +08:00 |
jiaoyangna
|
7f54e3c88a
|
装备提交
|
2020-07-06 20:35:39 +08:00 |
2han9B1a0
|
e3c9fb459e
|
寻宝文字提示修改,特权界面资源替换
|
2020-07-06 17:01:50 +08:00 |
zhangqiang
|
4b8bae38b3
|
宝物分解界面提交
|
2020-07-06 16:27:27 +08:00 |
zhangqiang
|
70bbb3cee2
|
竞技场修改
|
2020-07-07 13:29:40 +08:00 |
2han9B1a0
|
73c6cc9582
|
删除meta文件
|
2020-07-02 17:58:34 +08:00 |
JieLing
|
461c64b04a
|
svn逻辑同步
|
2020-07-02 14:53:44 +08:00 |
gaoxin
|
52f8a9922f
|
无用meta文件删除
|
2020-07-01 17:43:55 +08:00 |
JieLing
|
d08552ca2f
|
外网0.16.13 内网0.15.24
|
2020-06-30 18:59:44 +08:00 |
JieLing
|
8c61581548
|
外网 0.16.10 内网 0.15.23
|
2020-06-28 17:48:49 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |
JieLing
|
75a3f83194
|
内网0.15.16 外网 0.16.7
|
2020-06-19 20:19:35 +08:00 |
JieLing
|
7a410e1b60
|
内网测试 0.15.5
|
2020-06-19 16:18:05 +08:00 |
JieLing
|
e189462ac9
|
内网测试 0.15.14
|
2020-06-18 20:39:29 +08:00 |
JieLing
|
cf5f3e9952
|
内网测试 0.15.12
|
2020-06-13 11:47:13 +08:00 |
JieLing
|
b499b77bbe
|
外网0.16.4版本热更
|
2020-06-08 13:57:30 +08:00 |
JieLing
|
ab3dbad074
|
测试服热更0.15.6提交
|
2020-06-05 16:16:22 +08:00 |
JieLing
|
59db757cf9
|
六月三号开发提交
|
2020-06-03 19:09:01 +08:00 |
JieLing
|
063868ce73
|
外网包 0.16.1
|
2020-05-25 19:16:23 +08:00 |
JieLing
|
6b3a4b5fb9
|
切换为android平台
|
2020-05-15 17:46:08 +08:00 |
JieLing
|
266b9065d8
|
测试版本 带热更 0.15.1
|
2020-05-15 16:52:35 +08:00 |
JieLing
|
4c8d2cf8de
|
提交
|
2020-05-09 13:31:21 +08:00 |