gaoxin
|
528cd49109
|
Merge branch 'master_local_test' into master_develop
|
2020-07-25 16:21:30 +08:00 |
jiaoyangna
|
064b819f4a
|
修改星星提交
|
2020-07-24 20:03:06 +08:00 |
gaoxin
|
95cbec95e0
|
添加包名获取,添加账号创建打点。
|
2020-07-23 20:04:25 +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
|
b099f0e251
|
数据打点静态数据添加
|
2020-07-17 17:50:05 +08:00 |
jiaoyangna
|
e15bf9a7b2
|
轩辕宝镜资源提交
|
2020-07-15 16:27:58 +08:00 |
ZhangBiao
|
eddaa95312
|
宝囊
|
2020-07-14 11:05:47 +08:00 |
jiaoyangna
|
3953a76280
|
【宝物】一键装备替下来的,不在背包显示
|
2020-07-13 15:00:07 +08:00 |
jiaoyangna
|
106a7f7763
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
|
2020-07-11 16:25:30 +08:00 |
jiaoyangna
|
0fb81547d3
|
分解提交
|
2020-07-11 16:21:15 +08:00 |
ZhangBiao
|
310802e967
|
language导出
|
2020-07-10 19:13:29 +08:00 |
ZhangBiao
|
7279a7edd1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-10 19:03:03 +08:00 |
ZhangBiao
|
3ab971eaea
|
宝囊红点
|
2020-07-10 19:02:54 +08:00 |
jiaoyangna
|
3a85c6e339
|
分解,限时召唤提交
|
2020-07-10 18:29:38 +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 |
2han9B1a0
|
9d8deac0e1
|
背包界面报错修改
|
2020-07-07 17:27:48 +08:00 |
jiaoyangna
|
c6bfa772e5
|
装备提交
|
2020-07-07 16:35:57 +08:00 |
zhangqiang
|
bff7df21e4
|
装备出售界面添加
|
2020-07-07 15:20:43 +08:00 |
jiaoyangna
|
7f54e3c88a
|
装备提交
|
2020-07-06 20:35:39 +08:00 |
JieLing
|
c4751eed0a
|
svn逻辑同步
|
2020-07-01 10:54:39 +08:00 |
JieLing
|
d08552ca2f
|
外网0.16.13 内网0.15.24
|
2020-06-30 18:59:44 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +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
|
59db757cf9
|
六月三号开发提交
|
2020-06-03 19:09:01 +08:00 |
JieLing
|
063868ce73
|
外网包 0.16.1
|
2020-05-25 19:16:23 +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 |